moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed bug in CellCacheEntry (support for caching blank evaluation results) 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@700916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2008-10-01 20:56:21 +00:00
parent 2df9929020
commit 125d197e1b
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ package org.apache.poi.ss.formula;
import java.util.HashSet;
import java.util.Set;
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;
@ -60,6 +61,9 @@ final class CellCacheEntry {
// value type is changing
return false;
}
if (a == BlankEval.INSTANCE) {
return b == a;
}
if (cls == NumberEval.class) {
return ((NumberEval)a).getNumberValue() == ((NumberEval)b).getNumberValue();
}

11
src/testcases/org/apache/poi/ss/formula/AllSSFormulaTests.java
View File

@ -26,9 +26,10 @@ import junit.framework.TestSuite;
*/
public final class AllSSFormulaTests {
public static Test suite() {
TestSuite result = new TestSuite(AllSSFormulaTests.class.getName());
result.addTestSuite(TestEvaluationCache.class);
result.addTestSuite(TestWorkbookEvaluator.class);
return result;
}
TestSuite result = new TestSuite(AllSSFormulaTests.class.getName());
result.addTestSuite(TestCellCacheEntry.class);
result.addTestSuite(TestEvaluationCache.class);
result.addTestSuite(TestWorkbookEvaluator.class);
return result;
}
}

53
src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java Normal file
View File

@ -0,0 +1,53 @@
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
package org.apache.poi.ss.formula;
import org.apache.poi.hssf.record.formula.eval.BlankEval;
import org.apache.poi.hssf.record.formula.eval.NumberEval;
import org.apache.poi.hssf.record.formula.eval.ValueEval;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
/**
* Tests {@link CellCacheEntry}.
*
* @author Josh Micich
*/
public class TestCellCacheEntry extends TestCase {
public void testBasic() {
CellCacheEntry cce = new CellCacheEntry();
cce.updatePlainValue(new NumberEval(42.0));
ValueEval ve = cce.getValue();
assertEquals(42, ((NumberEval)ve).getNumberValue(), 0.0);
cce.setFormulaResult(new NumberEval(10.0), new CellLocation[] { });
}
public void testBlank() {
CellCacheEntry cce = new CellCacheEntry();
cce.updatePlainValue(BlankEval.INSTANCE);
try {
cce.updatePlainValue(BlankEval.INSTANCE);
} catch (IllegalStateException e) {
// bug was visible around svn r700356
throw new AssertionFailedError("cache entry does not handle blank values properly");
}
}
}