From 0ff40e8fb7ba898e29c81ed542ee9f78f535afbc Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 27 Jul 2022 09:30:01 +0000 Subject: [PATCH] issue with junit upgrade git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903053 13f79535-47bb-0310-9956-ffa450edef68 --- .../ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java | 3 +-- .../formula/functions/TestBooleanFunctionsFromSpreadsheet.java | 2 +- .../ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestComplexFunctionsFromSpreadsheet.java | 2 +- .../ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestDStarFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestDateTimeToNumberFromSpreadsheet.java | 2 +- .../formula/functions/TestDeltaFunctionsFromSpreadsheet.java | 2 +- .../functions/TestFactDoubleFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestFixedFunctionsFromSpreadsheet.java | 2 +- .../ss/formula/functions/TestIFFunctionFromSpreadsheet.java | 2 +- .../poi/ss/formula/functions/TestIfnaFromSpreadsheet.java | 2 +- .../formula/functions/TestImRealFunctionsFromSpreadsheet.java | 2 +- .../functions/TestImaginaryFunctionsFromSpreadsheet.java | 2 +- .../ss/formula/functions/TestIndexFunctionFromSpreadsheet.java | 2 +- .../formula/functions/TestIndirectFunctionFromSpreadsheet.java | 2 +- .../formula/functions/TestLogicalFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestLookupFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestMatchFunctionsFromSpreadsheet.java | 2 +- .../functions/TestQuotientFunctionsFromSpreadsheet.java | 2 +- .../ss/formula/functions/TestReptFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestRomanFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestTrendFunctionsFromSpreadsheet.java | 2 +- .../TestTwoOperandNumericFunctionsFromSpreadsheet.java | 2 +- .../formula/functions/TestWeekNumFunctionsFromSpreadsheet.java | 2 +- .../functions/TestWeekNumFunctionsFromSpreadsheet2013.java | 2 +- 26 files changed, 26 insertions(+), 27 deletions(-) diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java index a39599c526..0176e3d869 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java @@ -67,8 +67,7 @@ public abstract class BaseTestFunctionsFromSpreadsheet { } - - protected static Stream data(Class clazz, String filename) throws Exception { + protected static Stream dataFromClass(Class clazz, String filename) throws Exception { HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename); confirmReadMeSheet(workbook, clazz); diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java index bb9a238eaa..36446dd189 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestBooleanFunctionsFromSpreadsheet.class, "BooleanFunctionsTestCaseData.xls"); + return dataFromClass(TestBooleanFunctionsFromSpreadsheet.class, "BooleanFunctionsTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java index 213aeca067..d3cf7d8da4 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls"); + return dataFromClass(TestCodeFunctionsFromSpreadsheet.class, "CodeFunctionTestCaseData.xls"); } } \ No newline at end of file diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java index 3318832fc1..a442e0d052 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls"); + return dataFromClass(TestComplexFunctionsFromSpreadsheet.class, "ComplexFunctionTestCaseData.xls"); } } \ No newline at end of file diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java index 393334c5da..13aa5624ee 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls"); + return dataFromClass(TestDGetFunctionsFromSpreadsheet.class, "DGet.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java index f7d20532c6..14cd812ce5 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls"); + return dataFromClass(TestDStarFunctionsFromSpreadsheet.class, "DStar.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java index 4f0e9ee7ba..1e0468c85d 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestDateTimeToNumberFromSpreadsheet.class, "DateTimeToNumberTestCases.xls"); + return dataFromClass(TestDateTimeToNumberFromSpreadsheet.class, "DateTimeToNumberTestCases.xls"); } } \ No newline at end of file diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java index aa1bf1f0c5..950250a60a 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls"); + return dataFromClass(TestDeltaFunctionsFromSpreadsheet.class, "DeltaFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java index 9e9394c791..92327e56b5 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls"); + return dataFromClass(TestFactDoubleFunctionsFromSpreadsheet.class, "FactDoubleFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java index 907ecf7cc1..d856f2c433 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls"); + return dataFromClass(TestFixedFunctionsFromSpreadsheet.class, "57003-FixedFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java index 3614200239..09b1263d3f 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestIFFunctionFromSpreadsheet.class, "IfFunctionTestCaseData.xls"); + return dataFromClass(TestIFFunctionFromSpreadsheet.class, "IfFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIfnaFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIfnaFromSpreadsheet.java index d17f9dc8cb..1f08d2bfcc 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIfnaFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestIfnaFromSpreadsheet.class, "IfNaTestCaseData.xls"); + return dataFromClass(TestIfnaFromSpreadsheet.class, "IfNaTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java index 4d226fa26a..6072ddc1fe 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls"); + return dataFromClass(TestImRealFunctionsFromSpreadsheet.class, "ImRealFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java index ea1fe44b1f..c003d3c6e6 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls"); + return dataFromClass(TestImaginaryFunctionsFromSpreadsheet.class, "ImaginaryFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java index 8bf6ffc1a9..665221fc36 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls"); + return dataFromClass(TestIndexFunctionFromSpreadsheet.class, "IndexFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java index 36b9dc2050..57e2d474cb 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls"); + return dataFromClass(TestIndirectFunctionFromSpreadsheet.class, "IndirectFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java index 84deb0fc7b..bf32aa930e 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestLogicalFunctionsFromSpreadsheet.class, "LogicalFunctionsTestCaseData.xls"); + return dataFromClass(TestLogicalFunctionsFromSpreadsheet.class, "LogicalFunctionsTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java index 57e7e0eb80..ccee8a8d05 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls"); + return dataFromClass(TestLookupFunctionsFromSpreadsheet.class, "LookupFunctionsTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java index d6e56d5dec..d3022be812 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls"); + return dataFromClass(TestMatchFunctionsFromSpreadsheet.class, "MatchFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java index bbbfba1882..0f7816ce24 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls"); + return dataFromClass(TestQuotientFunctionsFromSpreadsheet.class, "QuotientFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java index 2a7132e813..036d476aa1 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls"); + return dataFromClass(TestReptFunctionsFromSpreadsheet.class, "ReptFunctionTestCaseData.xls"); } } \ No newline at end of file diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java index ffe0c75c00..9934491491 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls"); + return dataFromClass(TestRomanFunctionsFromSpreadsheet.class, "RomanFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java index 55398d31cb..de0bb95ccc 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestTrendFunctionsFromSpreadsheet.class, "Trend.xls"); + return dataFromClass(TestTrendFunctionsFromSpreadsheet.class, "Trend.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java index 3cac14426d..a5fb9ef8c2 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestTwoOperandNumericFunctionsFromSpreadsheet.class, "TwoOperandNumericFunctionTestCaseData.xls"); + return dataFromClass(TestTwoOperandNumericFunctionsFromSpreadsheet.class, "TwoOperandNumericFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java index 3719d93b35..8bca36eccc 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java +++ b/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 data() throws Exception { - return data(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls"); + return dataFromClass(TestWeekNumFunctionsFromSpreadsheet.class, "WeekNumFunctionTestCaseData.xls"); } } diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java index b918d0490e..c73b26b27c 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java +++ b/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 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"); } } -- 2.39.5