issue with junit upgrade

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903053 13f79535-47bb-0310-9956-ffa450edef68

poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java

@@ -67,8 +67,7 @@ public abstract class BaseTestFunctionsFromSpreadsheet {
     }
 
 
-
-    protected static Stream<Arguments> data(Class<? extends BaseTestFunctionsFromSpreadsheet> clazz, String filename) throws Exception {
+    protected static Stream<Arguments> dataFromClass(Class<? extends BaseTestFunctionsFromSpreadsheet> clazz, String filename) throws Exception {
         HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename);
         confirmReadMeSheet(workbook, clazz);
 

poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestBooleanFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestBooleanFunctionsFromSpreadsheet.class, "BooleanFunctionsTestCaseData.xls");
+        return dataFromClass(TestBooleanFunctionsFromSpreadsheet.class, "BooleanFunctionsTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestCodeFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls");
+        return dataFromClass(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestComplexFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls");
+        return dataFromClass(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java

@@ -25,6 +25,6 @@ import org.junit.jupiter.params.provider.Arguments;
 */
 class TestDGetFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls");
+        return dataFromClass(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java

@@ -25,6 +25,6 @@ import org.junit.jupiter.params.provider.Arguments;
 */
 class TestDStarFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls");
+        return dataFromClass(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java

@@ -23,6 +23,6 @@ import org.junit.jupiter.params.provider.Arguments;
 
 class TestDateTimeToNumberFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestDateTimeToNumberFromSpreadsheet.class, "DateTimeToNumberTestCases.xls");
+        return dataFromClass(TestDateTimeToNumberFromSpreadsheet.class, "DateTimeToNumberTestCases.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java

@@ -25,6 +25,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestDeltaFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls");
+        return dataFromClass(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestFactDoubleFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls");
+        return dataFromClass(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestFixedFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls");
+        return dataFromClass(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestIFFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestIFFunctionFromSpreadsheet.class, "IfFunctionTestCaseData.xls");
+        return dataFromClass(TestIFFunctionFromSpreadsheet.class, "IfFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestIfnaFromSpreadsheet.java

@@ -27,6 +27,6 @@ import org.junit.jupiter.params.provider.Arguments;
 class TestIfnaFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
 
     public static Stream<Arguments> data() throws Exception {
-        return data(TestIfnaFromSpreadsheet.class, "IfNaTestCaseData.xls");
+        return dataFromClass(TestIfnaFromSpreadsheet.class, "IfNaTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestImRealFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls");
+        return dataFromClass(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestImaginaryFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls");
+        return dataFromClass(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 final class TestIndexFunctionFromSpreadsheet  extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls");
+        return dataFromClass(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java

@@ -30,6 +30,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 final class TestIndirectFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls");
+        return dataFromClass(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestLogicalFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestLogicalFunctionsFromSpreadsheet.class, "LogicalFunctionsTestCaseData.xls");
+        return dataFromClass(TestLogicalFunctionsFromSpreadsheet.class, "LogicalFunctionsTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java

@@ -32,6 +32,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 final class TestLookupFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls");
+        return dataFromClass(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java

@@ -30,6 +30,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 final class TestMatchFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls");
+        return dataFromClass(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestQuotientFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls");
+        return dataFromClass(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestReptFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls");
+        return dataFromClass(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestRomanFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls");
+        return dataFromClass(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java

@@ -25,6 +25,6 @@ import org.junit.jupiter.params.provider.Arguments;
 */
 class TestTrendFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestTrendFunctionsFromSpreadsheet.class, "Trend.xls");
+        return dataFromClass(TestTrendFunctionsFromSpreadsheet.class, "Trend.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java

@@ -27,6 +27,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestTwoOperandNumericFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestTwoOperandNumericFunctionsFromSpreadsheet.class, "TwoOperandNumericFunctionTestCaseData.xls");
+        return dataFromClass(TestTwoOperandNumericFunctionsFromSpreadsheet.class, "TwoOperandNumericFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java

@@ -26,6 +26,6 @@ import org.junit.jupiter.params.provider.Arguments;
  */
 class TestWeekNumFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
-        return data(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls");
+        return dataFromClass(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls");
     }
 }

poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java

@@ -27,6 +27,6 @@ import org.junit.jupiter.params.provider.Arguments;
 class TestWeekNumFunctionsFromSpreadsheet2013 extends BaseTestFunctionsFromSpreadsheet {
     public static Stream<Arguments> data() throws Exception {
         //Only open this file with Excel 2013 to keep binary specific to that version
-        return data(TestWeekNumFunctionsFromSpreadsheet2013.class, "WeekNumFunctionTestCaseData2013.xls");
+        return dataFromClass(TestWeekNumFunctionsFromSpreadsheet2013.class, "WeekNumFunctionTestCaseData2013.xls");
     }
 }