Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Yegor Kozlov 2010-11-21 11:41:38 +00:00
parent 7b13897404
commit 6ef7d14026
73 changed files with 233 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testcases/org/apache/poi/hssf/model/TestSheet.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
View File

@ -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;

8
src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
View File

@ -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;

5
src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
View File

@ -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;

4
src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java
View File

@ -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}.

12
src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
View File

@ -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;

6
src/testcases/org/apache/poi/hssf/record/formula/TestFormulaShifter.java → src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
View File

@ -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}.

3
src/testcases/org/apache/poi/hssf/record/formula/TestSheetNameFormatter.java → src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
View File

@ -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}

10
src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/atp/TestRandBetween.java → src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculator.java → src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
View File

@ -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;
/**

4
src/testcases/org/apache/poi/hssf/record/formula/atp/TestYearFracCalculatorFromSpreadsheet.java → src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java → src/testcases/org/apache/poi/ss/formula/eval/AllFormulaEvalTests.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/eval/EvalInstances.java → src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java
View File

@ -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

4
src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
View File

@ -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 <tt>AreaEval</tt>

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestCircularReferences.java → src/testcases/org/apache/poi/ss/formula/eval/TestCircularReferences.java
View File

@ -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;

6
src/testcases/org/apache/poi/hssf/record/formula/eval/TestDivideEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java
View File

@ -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.

6
src/testcases/org/apache/poi/hssf/record/formula/eval/TestEqualEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java
View File

@ -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}

10
src/testcases/org/apache/poi/hssf/record/formula/eval/TestExternalFunction.java → src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulaBugs.java → src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/eval/TestFormulasFromSpreadsheet.java → src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/eval/TestMinusZeroResult.java → src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
View File

@ -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;
/**

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestMissingArgEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestOperandResolver.java → src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java
View File

@ -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;

6
src/testcases/org/apache/poi/hssf/record/formula/eval/TestPercentEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/eval/TestRangeEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
View File

@ -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;

6
src/testcases/org/apache/poi/hssf/record/formula/eval/TestUnaryPlusEval.java → src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
View File

@ -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.

2
src/testcases/org/apache/poi/ss/formula/eval/forked/TestForkedEvaluator.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/function/AllFormulaFunctionTests.java → src/testcases/org/apache/poi/ss/formula/function/AllFormulaFunctionTests.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/function/ExcelFileFormatDocFunctionExtractor.java → src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/function/TestFunctionMetadataRegistry.java → src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java → src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/function/TestReadMissingBuiltInFuncs.java → src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/functions/AbstractNumericTestCase.java → src/testcases/org/apache/poi/ss/formula/functions/AbstractNumericTestCase.java
View File

@ -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;

2
src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java → src/testcases/org/apache/poi/ss/formula/functions/AllIndividualFunctionEvaluationTests.java
View File

@ -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;

14
src/testcases/org/apache/poi/hssf/record/formula/functions/EvalFactory.java → src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
View File

@ -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;
/**

8
src/testcases/org/apache/poi/hssf/record/formula/functions/NumericFunctionInvoker.java → src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
View File

@ -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;
/**

12
src/testcases/org/apache/poi/hssf/record/formula/functions/TestAverage.java → src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
View File

@ -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()
*

22
src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java → src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
View File

@ -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

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestDate.java → src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
View File

@ -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;

8
src/testcases/org/apache/poi/hssf/record/formula/functions/TestDays360.java → src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
View File

@ -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;
/**

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestFinanceLib.java → src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
View File

@ -18,7 +18,7 @@
* Created on May 23, 2005
*
*/
package org.apache.poi.hssf.record.formula.functions;
package org.apache.poi.ss.formula.functions;
/**

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestFind.java → src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
View File

@ -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;

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java → src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java
View File

@ -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;

4
src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java → src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
View File

@ -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;

5
src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndirect.java → src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
View File

@ -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.</p>

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestIsBlank.java → src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
View File

@ -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;

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestLeftRight.java → src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java
View File

@ -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;

14
src/testcases/org/apache/poi/hssf/record/formula/functions/TestLen.java → src/testcases/org/apache/poi/ss/formula/functions/TestLen.java
View File

@ -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()
*

4
src/testcases/org/apache/poi/hssf/record/formula/functions/TestLookupFunctionsFromSpreadsheet.java → src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
View File

@ -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;

16
src/testcases/org/apache/poi/hssf/record/formula/functions/TestMatch.java → src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
View File

@ -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()

4
src/testcases/org/apache/poi/hssf/record/formula/functions/TestMathX.java → src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
View File

@ -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;
/**

18
src/testcases/org/apache/poi/hssf/record/formula/functions/TestMid.java → src/testcases/org/apache/poi/ss/formula/functions/TestMid.java
View File

@ -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()
*

6
src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java → src/testcases/org/apache/poi/ss/formula/functions/TestNper.java
View File

@ -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;

8
src/testcases/org/apache/poi/hssf/record/formula/functions/TestOffset.java → src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
View File

@ -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

8
src/testcases/org/apache/poi/hssf/record/formula/functions/TestPmt.java → src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
View File

@ -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;
/**

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestPoisson.java → src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
View File

@ -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)

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestRoundFuncs.java → src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
View File

@ -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()

4
src/testcases/org/apache/poi/hssf/record/formula/functions/TestRowCol.java → src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java
View File

@ -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()

6
src/testcases/org/apache/poi/hssf/record/formula/functions/TestStatsLib.java → src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
View File

@ -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;
/**

8
src/testcases/org/apache/poi/hssf/record/formula/functions/TestSubtotal.java → src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
View File

@ -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;

12
src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumif.java → src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java
View File

@ -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()

14
src/testcases/org/apache/poi/hssf/record/formula/functions/TestSumproduct.java → src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java
View File

@ -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()

16
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTFunc.java → src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
View File

@ -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()

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestText.java → src/testcases/org/apache/poi/ss/formula/functions/TestText.java
View File

@ -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()

2
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTime.java → src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
View File

@ -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;

14
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrim.java → src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java
View File

@ -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()
*

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestTrunc.java → src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java
View File

@ -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()

10
src/testcases/org/apache/poi/hssf/record/formula/functions/TestValue.java → src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
View File

@ -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}

8
src/testcases/org/apache/poi/hssf/record/formula/functions/TestXYNumericFunction.java → src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
View File

@ -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()
*

1
src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
View File

@ -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;
/**

3
src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
View File

@ -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
* </pre>
*
* 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