From 6ef7d140269b668dc4aa115c19854bb90b4fde2c Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Sun, 21 Nov 2010 11:41:38 +0000 Subject: [PATCH] moved common formula-related code to org.apache.poi.ss.formula, eliminated dependencies on HSSF, reduced the number of eclipse warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1037426 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hssf/model/TestSheet.java | 2 +- .../hssf/record/TestSharedFormulaRecord.java | 2 +- .../hssf/record/formula/AllFormulaTests.java | 8 ++++--- .../usermodel/TestFormulaEvaluatorBugs.java | 4 ++-- .../usermodel/TestHSSFFormulaEvaluator.java | 5 ++--- .../poi/ss/formula/TestCellCacheEntry.java | 4 ++-- .../poi/ss/formula/TestEvaluationCache.java | 12 +++++----- .../formula/TestFormulaShifter.java | 6 ++++- .../formula/TestSheetNameFormatter.java | 3 ++- .../poi/ss/formula/TestWorkbookEvaluator.java | 10 ++++----- .../formula/atp/TestRandBetween.java | 4 ++-- .../formula/atp/TestYearFracCalculator.java | 4 ++-- ...TestYearFracCalculatorFromSpreadsheet.java | 4 ++-- .../formula/eval/AllFormulaEvalTests.java | 2 +- .../formula/eval/EvalInstances.java | 4 ++-- .../formula/eval/TestAreaEval.java | 4 ++-- .../formula/eval/TestCircularReferences.java | 2 +- .../formula/eval/TestDivideEval.java | 6 ++--- .../formula/eval/TestEqualEval.java | 6 ++--- .../formula/eval/TestExternalFunction.java | 10 ++++----- .../formula/eval/TestFormulaBugs.java | 2 +- .../eval/TestFormulasFromSpreadsheet.java | 4 ++-- .../formula/eval/TestMinusZeroResult.java | 4 ++-- .../formula/eval/TestMissingArgEval.java | 2 +- .../formula/eval/TestOperandResolver.java | 2 +- .../formula/eval/TestPercentEval.java | 6 ++--- .../formula/eval/TestRangeEval.java | 2 +- .../formula/eval/TestUnaryPlusEval.java | 6 ++--- .../eval/forked/TestForkedEvaluator.java | 2 +- .../function/AllFormulaFunctionTests.java | 2 +- .../ExcelFileFormatDocFunctionExtractor.java | 2 +- .../TestFunctionMetadataRegistry.java | 2 +- .../TestParseMissingBuiltInFuncs.java | 2 +- .../function/TestReadMissingBuiltInFuncs.java | 2 +- .../functions/AbstractNumericTestCase.java | 2 +- .../AllIndividualFunctionEvaluationTests.java | 2 +- .../formula/functions/EvalFactory.java | 14 ++++++------ .../functions/NumericFunctionInvoker.java | 8 +++---- .../formula/functions/TestAverage.java | 12 +++++----- .../formula/functions/TestCountFuncs.java | 22 +++++++++---------- .../formula/functions/TestDate.java | 2 +- .../formula/functions/TestDays360.java | 8 +++---- .../formula/functions/TestFinanceLib.java | 2 +- .../formula/functions/TestFind.java | 2 +- .../formula/functions/TestIndex.java | 10 ++++----- .../TestIndexFunctionFromSpreadsheet.java | 4 ++-- .../formula/functions/TestIndirect.java | 5 ++--- .../formula/functions/TestIsBlank.java | 2 +- .../formula/functions/TestLeftRight.java | 10 ++++----- .../formula/functions/TestLen.java | 14 ++++++------ .../TestLookupFunctionsFromSpreadsheet.java | 4 ++-- .../formula/functions/TestMatch.java | 16 +++++++------- .../formula/functions/TestMathX.java | 4 ++-- .../formula/functions/TestMid.java | 18 +++++++-------- .../formula/functions/TestNper.java | 6 ++--- .../formula/functions/TestOffset.java | 8 +++---- .../formula/functions/TestPmt.java | 8 +++---- .../formula/functions/TestPoisson.java | 10 ++++----- .../formula/functions/TestRoundFuncs.java | 10 ++++----- .../formula/functions/TestRowCol.java | 4 ++-- .../formula/functions/TestStatsLib.java | 6 ++--- .../formula/functions/TestSubtotal.java | 8 +++---- .../formula/functions/TestSumif.java | 12 +++++----- .../formula/functions/TestSumproduct.java | 14 ++++++------ .../formula/functions/TestTFunc.java | 16 +++++++------- .../formula/functions/TestText.java | 10 ++++----- .../formula/functions/TestTime.java | 2 +- .../formula/functions/TestTrim.java | 14 ++++++------ .../formula/functions/TestTrunc.java | 10 ++++----- .../formula/functions/TestValue.java | 10 ++++----- .../functions/TestXYNumericFunction.java | 8 +++---- .../poi/ss/usermodel/BaseTestHyperlink.java | 1 - .../poi/ss/usermodel/BaseTestNamedRange.java | 3 +-- 73 files changed, 233 insertions(+), 230 deletions(-) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/TestFormulaShifter.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/TestSheetNameFormatter.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/atp/TestRandBetween.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/atp/TestYearFracCalculator.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/atp/TestYearFracCalculatorFromSpreadsheet.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/AllFormulaEvalTests.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/EvalInstances.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestAreaEval.java (94%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestCircularReferences.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestDivideEval.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestEqualEval.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestExternalFunction.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestFormulaBugs.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestFormulasFromSpreadsheet.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestMinusZeroResult.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestMissingArgEval.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestOperandResolver.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestPercentEval.java (93%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestRangeEval.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/eval/TestUnaryPlusEval.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/function/AllFormulaFunctionTests.java (96%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/function/ExcelFileFormatDocFunctionExtractor.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/function/TestFunctionMetadataRegistry.java (96%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/function/TestParseMissingBuiltInFuncs.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/function/TestReadMissingBuiltInFuncs.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/AbstractNumericTestCase.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/AllIndividualFunctionEvaluationTests.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/EvalFactory.java (94%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/NumericFunctionInvoker.java (94%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestAverage.java (88%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestCountFuncs.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestDate.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestDays360.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestFinanceLib.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestFind.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestIndex.java (95%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestIndexFunctionFromSpreadsheet.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestIndirect.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestIsBlank.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestLeftRight.java (88%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestLen.java (84%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestLookupFunctionsFromSpreadsheet.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestMatch.java (93%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestMathX.java (99%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestMid.java (89%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestNper.java (93%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestOffset.java (92%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestPmt.java (92%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestPoisson.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestRoundFuncs.java (85%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestRowCol.java (96%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestStatsLib.java (97%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestSubtotal.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestSumif.java (90%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestSumproduct.java (89%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestTFunc.java (88%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestText.java (93%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestTime.java (98%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestTrim.java (86%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestTrunc.java (88%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestValue.java (91%) rename src/testcases/org/apache/poi/{hssf/record => ss}/formula/functions/TestXYNumericFunction.java (95%) diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java index 7471f46699..5f9a31bd4f 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java +++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java @@ -46,7 +46,7 @@ import org.apache.poi.hssf.record.WindowTwoRecord; import org.apache.poi.hssf.record.aggregates.ConditionalFormattingTable; import org.apache.poi.hssf.record.aggregates.PageSettingsBlock; import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor; -import org.apache.poi.hssf.record.formula.FormulaShifter; +import org.apache.poi.ss.formula.FormulaShifter; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java index 1547f94565..cb99f53acd 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java +++ b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java @@ -24,7 +24,7 @@ import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.record.formula.Ptg; import org.apache.poi.hssf.record.formula.RefPtg; -import org.apache.poi.hssf.record.formula.SharedFormula; +import org.apache.poi.ss.formula.SharedFormula; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.formula.FormulaParser; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java b/src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java index 248f7ca59d..837afa41b8 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java +++ b/src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java @@ -17,9 +17,11 @@ package org.apache.poi.hssf.record.formula; -import org.apache.poi.hssf.record.formula.eval.AllFormulaEvalTests; -import org.apache.poi.hssf.record.formula.function.AllFormulaFunctionTests; -import org.apache.poi.hssf.record.formula.functions.AllIndividualFunctionEvaluationTests; +import org.apache.poi.ss.formula.TestFormulaShifter; +import org.apache.poi.ss.formula.TestSheetNameFormatter; +import org.apache.poi.ss.formula.eval.AllFormulaEvalTests; +import org.apache.poi.ss.formula.function.AllFormulaFunctionTests; +import org.apache.poi.ss.formula.functions.AllIndividualFunctionEvaluationTests; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java index 811eef0913..6de40073dc 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java @@ -31,8 +31,8 @@ import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate; import org.apache.poi.hssf.record.formula.AreaPtg; import org.apache.poi.hssf.record.formula.FuncVarPtg; import org.apache.poi.hssf.record.formula.Ptg; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.formula.EvaluationListener; import org.apache.poi.ss.formula.WorkbookEvaluator; diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java index 2d97c1be05..f28725669c 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java @@ -18,13 +18,12 @@ package org.apache.poi.hssf.usermodel; import junit.framework.AssertionFailedError; -import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFITestDataProvider; import org.apache.poi.hssf.record.NameRecord; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.formula.EvaluationListener; import org.apache.poi.ss.formula.WorkbookEvaluator; diff --git a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java b/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java index a9a259175b..128a767f56 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java +++ b/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java @@ -19,8 +19,8 @@ package org.apache.poi.ss.formula; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests {@link org.apache.poi.ss.formula.CellCacheEntry}. diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java index c1d9523e73..87788ef8e4 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java +++ b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java @@ -30,12 +30,12 @@ import junit.framework.TestCase; import org.apache.poi.hssf.model.HSSFFormulaParser; import org.apache.poi.hssf.record.formula.Ptg; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.hssf.usermodel.FormulaExtractor; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFEvaluationTestHelper; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/TestFormulaShifter.java b/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/TestFormulaShifter.java rename to src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java index 55f79e6dff..9f840e12a2 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/TestFormulaShifter.java +++ b/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java @@ -15,9 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula; +package org.apache.poi.ss.formula; import junit.framework.TestCase; +import org.apache.poi.hssf.record.formula.AreaErrPtg; +import org.apache.poi.hssf.record.formula.AreaPtg; +import org.apache.poi.hssf.record.formula.Ptg; +import org.apache.poi.ss.formula.FormulaShifter; /** * Tests for {@link FormulaShifter}. diff --git a/src/testcases/org/apache/poi/hssf/record/formula/TestSheetNameFormatter.java b/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/TestSheetNameFormatter.java rename to src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java index b7c1664eee..69b0c9b4ff 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/TestSheetNameFormatter.java +++ b/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java @@ -15,9 +15,10 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula; +package org.apache.poi.ss.formula; import junit.framework.TestCase; +import org.apache.poi.ss.formula.SheetNameFormatter; /** * Tests for {@link SheetNameFormatter} diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java index 5e59933cf6..8dac906ecb 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java +++ b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java @@ -28,11 +28,11 @@ import org.apache.poi.hssf.record.formula.DeletedRef3DPtg; import org.apache.poi.hssf.record.formula.IntPtg; import org.apache.poi.hssf.record.formula.Ptg; import org.apache.poi.hssf.record.formula.RefErrorPtg; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.MissingArgEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.MissingArgEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestRandBetween.java b/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/atp/TestRandBetween.java rename to src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java index 6be56bad64..6b8d50322e 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestRandBetween.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.atp; +package org.apache.poi.ss.formula.atp; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculator.java b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculator.java rename to src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java index bd580f06c6..22d3ba3492 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculator.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.atp; +package org.apache.poi.ss.formula.atp; import java.util.Calendar; import java.util.GregorianCalendar; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.EvaluationException; +import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.ss.usermodel.DateUtil; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculatorFromSpreadsheet.java rename to src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java index 37d1bb314b..d735fe8c2c 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculatorFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.atp; +package org.apache.poi.ss.formula.atp; import java.io.PrintStream; import java.util.Calendar; @@ -28,7 +28,7 @@ import junit.framework.ComparisonFailure; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.eval.EvaluationException; +import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java b/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java rename to src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java index 325e2e9197..80f1a1ad73 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/EvalInstances.java b/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/EvalInstances.java rename to src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java index b6076938b3..4a15444773 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/EvalInstances.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java @@ -15,9 +15,9 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; -import org.apache.poi.hssf.record.formula.functions.Function; +import org.apache.poi.ss.formula.functions.Function; /** * Collects eval instances for easy access by tests in this package diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java similarity index 94% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java index 65e4e7d411..3965766cd6 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.record.formula.AreaPtg; -import org.apache.poi.hssf.record.formula.functions.EvalFactory; +import org.apache.poi.ss.formula.functions.EvalFactory; /** * Tests for AreaEval diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java b/src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java index 878b7bdaec..ca3b7b56ae 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestDivideEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestDivideEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java index eedcbf9761..11c661d9fa 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestDivideEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java @@ -15,12 +15,12 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.functions.EvalFactory; -import org.apache.poi.hssf.record.formula.functions.NumericFunctionInvoker; +import org.apache.poi.ss.formula.functions.EvalFactory; +import org.apache.poi.ss.formula.functions.NumericFunctionInvoker; /** * Test for divide operator evaluator. diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestEqualEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestEqualEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java index 739b32cc7e..7eaa3e9132 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestEqualEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.functions.EvalFactory; -import org.apache.poi.hssf.record.formula.functions.Function; +import org.apache.poi.ss.formula.functions.EvalFactory; +import org.apache.poi.ss.formula.functions.Function; /** * Test for {@link EqualEval} diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java b/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java index 2cfbbfec41..30500b19a9 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java @@ -15,15 +15,15 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.functions.FreeRefFunction; -import org.apache.poi.hssf.record.formula.udf.DefaultUDFFinder; -import org.apache.poi.hssf.record.formula.udf.AggregatingUDFFinder; -import org.apache.poi.hssf.record.formula.udf.UDFFinder; +import org.apache.poi.ss.formula.functions.FreeRefFunction; +import org.apache.poi.ss.formula.udf.DefaultUDFFinder; +import org.apache.poi.ss.formula.udf.AggregatingUDFFinder; +import org.apache.poi.ss.formula.udf.UDFFinder; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java index 1b97905ed2..824c8aba5d 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import java.io.FileOutputStream; import java.io.IOException; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java index 2c7c7c8df4..fd0771fdc8 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import java.io.PrintStream; @@ -24,7 +24,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.functions.TestMathX; +import org.apache.poi.ss.formula.functions.TestMathX; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestMinusZeroResult.java b/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestMinusZeroResult.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java index d2f4cc748d..656c47dfd6 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestMinusZeroResult.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java @@ -15,12 +15,12 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.ComparisonFailure; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.functions.Function; +import org.apache.poi.ss.formula.functions.Function; import org.apache.poi.util.HexDump; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestMissingArgEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestMissingArgEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java index 2a830b080b..2bef73c810 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestMissingArgEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import java.util.EmptyStackException; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestOperandResolver.java b/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestOperandResolver.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java index 98ddadef66..4e24f84e70 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestOperandResolver.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java similarity index 93% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java index ae6524e882..faeee6af3e 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.functions.EvalFactory; -import org.apache.poi.hssf.record.formula.functions.NumericFunctionInvoker; +import org.apache.poi.ss.formula.functions.EvalFactory; +import org.apache.poi.ss.formula.functions.NumericFunctionInvoker; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestRangeEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestRangeEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java index 80af1b924b..439d642dc5 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestRangeEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.AssertionFailedError; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java rename to src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java index ffa42b3339..33022ad44b 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.eval; +package org.apache.poi.ss.formula.eval; import junit.framework.TestCase; import org.apache.poi.hssf.record.formula.AreaPtg; -import org.apache.poi.hssf.record.formula.functions.EvalFactory; -import org.apache.poi.hssf.record.formula.functions.NumericFunctionInvoker; +import org.apache.poi.ss.formula.functions.EvalFactory; +import org.apache.poi.ss.formula.functions.NumericFunctionInvoker; /** * Test for unary plus operator evaluator. diff --git a/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java b/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java index 1e48069828..505ea127b7 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java @@ -20,7 +20,7 @@ package org.apache.poi.ss.formula.eval.forked; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.NumberEval; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/function/AllFormulaFunctionTests.java b/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java similarity index 96% rename from src/testcases/org/apache/poi/hssf/record/formula/function/AllFormulaFunctionTests.java rename to src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java index 01f88bd069..5bbf8f0131 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/function/AllFormulaFunctionTests.java +++ b/src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.function; +package org.apache.poi.ss.formula.function; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/function/ExcelFileFormatDocFunctionExtractor.java b/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/function/ExcelFileFormatDocFunctionExtractor.java rename to src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java index c3a026c211..4d6877f0f9 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/function/ExcelFileFormatDocFunctionExtractor.java +++ b/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.function; +package org.apache.poi.ss.formula.function; import java.io.File; import java.io.FileInputStream; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/function/TestFunctionMetadataRegistry.java b/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java similarity index 96% rename from src/testcases/org/apache/poi/hssf/record/formula/function/TestFunctionMetadataRegistry.java rename to src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java index c175c473bf..b050401d99 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/function/TestFunctionMetadataRegistry.java +++ b/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.function; +package org.apache.poi.ss.formula.function; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java b/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java rename to src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java index 95ad2ef535..a6872e5f2c 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.function; +package org.apache.poi.ss.formula.function; import junit.framework.AssertionFailedError; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/function/TestReadMissingBuiltInFuncs.java b/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/function/TestReadMissingBuiltInFuncs.java rename to src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java index 5d8ccc7521..9de7e764e7 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/function/TestReadMissingBuiltInFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.function; +package org.apache.poi.ss.formula.function; import java.lang.reflect.InvocationTargetException; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java b/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java rename to src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java index ef5b3add07..c5453ea39a 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java @@ -18,7 +18,7 @@ * Created on May 29, 2005 * */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java b/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java rename to src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java index f4b28150d4..4e42389ec1 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java b/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java similarity index 94% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java rename to src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java index fb2091911a..7eee5627b8 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java @@ -15,18 +15,18 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import org.apache.poi.hssf.record.formula.AreaI; import org.apache.poi.hssf.record.formula.AreaPtg; import org.apache.poi.hssf.record.formula.Ref3DPtg; import org.apache.poi.hssf.record.formula.RefPtg; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.AreaEvalBase; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.RefEval; -import org.apache.poi.hssf.record.formula.eval.RefEvalBase; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.AreaEvalBase; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.RefEval; +import org.apache.poi.ss.formula.eval.RefEvalBase; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.TwoDEval; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java b/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java similarity index 94% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java rename to src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java index 1d43923b2e..f51e8a22f1 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumericValueEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumericValueEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.eval.NotImplementedException; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java b/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java similarity index 88% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java index 5a4d52bb9c..1dcba00c51 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java @@ -15,15 +15,15 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel function AVERAGE() * diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java index bb3cfabe1f..8897feb60e 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java @@ -15,21 +15,21 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.OperandResolver; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; -import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.OperandResolver; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; @@ -236,7 +236,7 @@ public final class TestCountFuncs extends TestCase { } /** - * the criteria arg is mostly handled by {@link OperandResolver#getSingleValue(org.apache.poi.hssf.record.formula.eval.ValueEval, int, int)}} + * the criteria arg is mostly handled by {@link OperandResolver#getSingleValue(org.apache.poi.ss.formula.eval.ValueEval, int, int)}} */ public void testCountifAreaCriteria() { int srcColIx = 2; // anything but column A diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestDate.java index eac8bfd113..64e1c45542 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDays360.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestDays360.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java index e517ac9b62..15dd1246b1 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestDays360.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.util.Calendar; import java.util.Date; @@ -24,9 +24,9 @@ import java.util.GregorianCalendar; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.hssf.usermodel.HSSFDateUtil; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java index 4dfe1fbb52..90300bf240 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java @@ -18,7 +18,7 @@ * Created on May 23, 2005 * */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFind.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestFind.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestFind.java index 8fb3b2ba95..a78e89ddeb 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestFind.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java index a6ae6efafa..ce0325285f 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java @@ -15,17 +15,17 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.util.Arrays; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.MissingArgEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.MissingArgEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.WorkbookEvaluator; import org.apache.poi.ss.util.CellRangeAddress; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java index ffd841f823..c2978435a1 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.io.PrintStream; @@ -24,7 +24,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndirect.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndirect.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java index 6be7b03309..3a35ed942d 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndirect.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java @@ -15,17 +15,16 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaEvaluator; -import org.apache.poi.ss.util.CellReference; /** * Tests for the INDIRECT() function.

diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java index 5168cd9224..6b40f9c173 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java b/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java similarity index 88% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java index 055e493680..58160bdfeb 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java @@ -15,12 +15,12 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java b/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java similarity index 84% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestLen.java index be9c55ac6d..a9a3d4cff2 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java @@ -15,16 +15,16 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel function LEN() * diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java index b0b6ece7f1..6054d08208 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.io.PrintStream; @@ -24,7 +24,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java similarity index 93% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java index a92dd1fbc1..f9fdab6a79 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java @@ -15,17 +15,17 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.NumericValueEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.NumericValueEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Test cases for MATCH() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java similarity index 99% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java index a88f011e7b..dd6974b35d 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java @@ -18,9 +18,9 @@ * Created on May 23, 2005 * */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; -import org.apache.poi.hssf.record.formula.functions.XYNumericFunction.Accumulator; +import org.apache.poi.ss.formula.functions.XYNumericFunction.Accumulator; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java similarity index 89% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestMid.java index 72b50daf5b..7c19d44a61 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java @@ -15,18 +15,18 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.RefEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.RefEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel function MID() * diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java b/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java similarity index 93% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestNper.java index 99fb4dea41..4754ec02af 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java @@ -15,12 +15,12 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFErrorConstants; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java b/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java similarity index 92% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java index 7002408f2e..24d347270a 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.EvaluationException; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.functions.Offset.LinearOffsetRange; +import org.apache.poi.ss.formula.eval.EvaluationException; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.functions.Offset.LinearOffsetRange; /** * Tests for OFFSET function implementation diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java b/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java similarity index 92% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java index cac4bde13f..77618805aa 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; import org.apache.poi.hssf.usermodel.HSSFErrorConstants; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPoisson.java b/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestPoisson.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java index f09a25fb38..e18d66ec6b 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestPoisson.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel function POISSON(x,mean,cumulative) diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java similarity index 85% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java index d3fa564391..10166eee0d 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; /** * Test cases for ROUND(), ROUNDUP(), ROUNDDOWN() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java b/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java similarity index 96% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java index 532e768eb1..a27a63ee92 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java @@ -15,11 +15,11 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for ROW(), ROWS(), COLUMN(), COLUMNS() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java b/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java similarity index 97% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java index 3562a67789..47ce2d5a91 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java @@ -18,12 +18,12 @@ * Created on May 30, 2005 * */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.EvaluationException; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.EvaluationException; /** diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSubtotal.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestSubtotal.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java index 974f897fbc..54cf5b774a 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSubtotal.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java @@ -15,11 +15,11 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; import junit.framework.TestCase; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumif.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java similarity index 90% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumif.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java index ff611ec31e..1ef090ea4f 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumif.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java @@ -15,16 +15,16 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.NumericValueEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.NumericValueEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Test cases for SUMPRODUCT() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java similarity index 89% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java index 63d1088e8c..a8ccf47898 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java @@ -15,16 +15,16 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.NumericValueEval; -import org.apache.poi.hssf.record.formula.eval.RefEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.NumericValueEval; +import org.apache.poi.ss.formula.eval.RefEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Test cases for SUMPRODUCT() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java b/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java similarity index 88% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java index 9d77b3dd1f..4e1209bfa6 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java @@ -15,17 +15,17 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.AreaEval; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.AreaEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Test cases for Excel function T() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestText.java b/src/testcases/org/apache/poi/ss/formula/functions/TestText.java similarity index 93% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestText.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestText.java index f56132cd54..8ff0bbfa92 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestText.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestText.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.text.DecimalFormatSymbols; import java.text.SimpleDateFormat; @@ -23,10 +23,10 @@ import java.util.GregorianCalendar; import java.util.Locale; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.StringEval; /** * Test case for TEXT() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTime.java b/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java similarity index 98% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestTime.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestTime.java index bfd1747393..a1f89ff79b 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTime.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import java.util.regex.Pattern; diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java b/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java similarity index 86% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java index 5fd7173729..bb5efa7280 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java @@ -15,16 +15,16 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.BlankEval; -import org.apache.poi.hssf.record.formula.eval.BoolEval; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.BlankEval; +import org.apache.poi.ss.formula.eval.BoolEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel function TRIM() * diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrunc.java b/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java similarity index 88% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrunc.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java index ef42d1ce0f..c3ed459745 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrunc.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java @@ -15,12 +15,12 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; /** * Test case for TRUNC() diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestValue.java b/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java similarity index 91% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestValue.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestValue.java index 19a6d68927..f85db0cfff 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestValue.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java @@ -15,14 +15,14 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.StringEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.StringEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for {@link Value} diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java b/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java similarity index 95% rename from src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java rename to src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java index 818409cae7..cc7f91a993 100644 --- a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java @@ -15,13 +15,13 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.hssf.record.formula.functions; +package org.apache.poi.ss.formula.functions; import junit.framework.TestCase; -import org.apache.poi.hssf.record.formula.eval.ErrorEval; -import org.apache.poi.hssf.record.formula.eval.NumberEval; -import org.apache.poi.hssf.record.formula.eval.ValueEval; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.formula.eval.NumberEval; +import org.apache.poi.ss.formula.eval.ValueEval; /** * Tests for Excel functions SUMX2MY2(), SUMX2PY2(), SUMXMY2() * diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java index 833e5aab9a..e0be21b0fd 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java @@ -19,7 +19,6 @@ package org.apache.poi.ss.usermodel; import junit.framework.TestCase; -import org.apache.poi.hssf.HSSFITestDataProvider; import org.apache.poi.ss.ITestDataProvider; /** diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java index d2518effb1..f9346a67af 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java @@ -20,7 +20,6 @@ package org.apache.poi.ss.usermodel; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.apache.poi.hssf.usermodel.HSSFName; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.util.AreaReference; import org.apache.poi.ss.util.CellReference; @@ -506,7 +505,7 @@ public abstract class BaseTestNamedRange extends TestCase { * 00000010 | 00 00 00 55 50 53 53 74 61 74 65 | ...UPSState * * - * This caused trouble for anything that requires {@link HSSFName#getRefersToFormula()} + * This caused trouble for anything that requires {@link Name#getRefersToFormula()} * It is easy enough to re-create the the same data (by not setting the formula). Excel * seems to gracefully remove this uninitialized name record. It would be nice if POI * could do the same, but that would involve adjusting subsequent name indexes across -- 2.39.5