You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2019/12/15 14:53:47 UTC
svn commit: r1871591 [3/3] - in /poi/trunk/src:
java/org/apache/poi/ss/format/ ooxml/testcases/org/apache/poi/openxml4j/opc/
ooxml/testcases/org/apache/poi/xdgf/usermodel/section/
ooxml/testcases/org/apache/poi/xslf/usermodel/ ooxml/testcases/org/apach...
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java Sun Dec 15 14:53:46 2019
@@ -86,7 +86,7 @@ public final class TestDirectoryNode ext
assertEquals(property2.getName(), node.getName());
// verify behavior of isDocumentEntry
- assertTrue(!node.isDocumentEntry());
+ assertFalse(node.isDocumentEntry());
// verify behavior of getParent
assertEquals(parent, node.getParent());
@@ -117,7 +117,7 @@ public final class TestDirectoryNode ext
assertEquals(2, count);
// verify behavior of isEmpty
- assertTrue(!node.isEmpty());
+ assertFalse(node.isEmpty());
// verify behavior of getEntryCount
assertEquals(2, node.getEntryCount());
@@ -145,7 +145,7 @@ public final class TestDirectoryNode ext
assertEquals(property1.getName(), node.getName());
// verify behavior of isDocumentEntry
- assertTrue(!node.isDocumentEntry());
+ assertFalse(node.isDocumentEntry());
// verify behavior of getParent
assertNull(node.getParent());
@@ -202,14 +202,14 @@ public final class TestDirectoryNode ext
DirectoryEntry root = fs.getRoot();
// verify cannot rename the root directory
- assertTrue(!root.renameTo("foo"));
+ assertFalse(root.renameTo("foo"));
DirectoryEntry dir = fs.createDirectory("myDir");
assertTrue(dir.renameTo("foo"));
assertEquals("foo", dir.getName());
DirectoryEntry dir2 = fs.createDirectory("myDir");
- assertTrue(!dir2.renameTo("foo"));
+ assertFalse(dir2.renameTo("foo"));
assertEquals("myDir", dir2.getName());
assertTrue(dir.renameTo("FirstDir"));
assertTrue(dir2.renameTo("foo"));
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java Sun Dec 15 14:53:46 2019
@@ -60,8 +60,7 @@ public final class TestDocumentDescripto
}
else
{
- assertTrue("" + j + "," + k + "," + m + "," + n,
- !d1.equals(d2));
+ assertFalse(d1.equals(d2));
}
}
}
@@ -126,8 +125,7 @@ public final class TestDocumentDescripto
}
else
{
- assertTrue("" + j + "," + k + "," + m + "," + n,
- !(d1.equals(d2)));
+ assertFalse(d1.equals(d2));
}
}
}
@@ -165,8 +163,7 @@ public final class TestDocumentDescripto
new DocumentDescriptor(builtUpPaths[ k ],
names[ n ]);
- assertTrue("" + j + "," + k + "," + m + "," + n,
- !(d1.equals(d2)));
+ assertFalse(d1.equals(d2));
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java Sun Dec 15 14:53:46 2019
@@ -59,20 +59,20 @@ public final class TestFilteringDirector
assertEquals(3, d.getEntryCount());
assertEquals(dirA.getName(), d.getEntry(dirA.getName()).getName());
- assertEquals(true, d.getEntry(dirA.getName()).isDirectoryEntry());
- assertEquals(false, d.getEntry(dirA.getName()).isDocumentEntry());
+ assertTrue(d.getEntry(dirA.getName()).isDirectoryEntry());
+ assertFalse(d.getEntry(dirA.getName()).isDocumentEntry());
- assertEquals(true, d.getEntry(dirB.getName()).isDirectoryEntry());
- assertEquals(false, d.getEntry(dirB.getName()).isDocumentEntry());
+ assertTrue(d.getEntry(dirB.getName()).isDirectoryEntry());
+ assertFalse(d.getEntry(dirB.getName()).isDocumentEntry());
- assertEquals(false, d.getEntry(eRoot.getName()).isDirectoryEntry());
- assertEquals(true, d.getEntry(eRoot.getName()).isDocumentEntry());
+ assertFalse(d.getEntry(eRoot.getName()).isDirectoryEntry());
+ assertTrue(d.getEntry(eRoot.getName()).isDocumentEntry());
Iterator<Entry> i = d.getEntries();
assertEquals(dirA, i.next());
assertEquals(dirB, i.next());
assertEquals(eRoot, i.next());
- assertEquals(null, i.next());
+ assertNull(i.next());
}
@Test
@@ -81,9 +81,9 @@ public final class TestFilteringDirector
FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), excl);
assertEquals(2, d.getEntryCount());
- assertEquals(true, d.hasEntry(dirA.getName()));
- assertEquals(true, d.hasEntry(dirB.getName()));
- assertEquals(false, d.hasEntry(eRoot.getName()));
+ assertTrue(d.hasEntry(dirA.getName()));
+ assertTrue(d.hasEntry(dirB.getName()));
+ assertFalse(d.hasEntry(eRoot.getName()));
assertEquals(dirA, d.getEntry(dirA.getName()));
assertEquals(dirB, d.getEntry(dirB.getName()));
@@ -96,7 +96,7 @@ public final class TestFilteringDirector
Iterator<Entry> i = d.getEntries();
assertEquals(dirA, i.next());
assertEquals(dirB, i.next());
- assertEquals(null, i.next());
+ assertNull(i.next());
// Filter more
@@ -104,9 +104,9 @@ public final class TestFilteringDirector
d = new FilteringDirectoryNode(fs.getRoot(), excl);
assertEquals(1, d.getEntryCount());
- assertEquals(false, d.hasEntry(dirA.getName()));
- assertEquals(true, d.hasEntry(dirB.getName()));
- assertEquals(false, d.hasEntry(eRoot.getName()));
+ assertFalse(d.hasEntry(dirA.getName()));
+ assertTrue(d.hasEntry(dirB.getName()));
+ assertFalse(d.hasEntry(eRoot.getName()));
try {
d.getEntry(dirA.getName());
@@ -122,7 +122,7 @@ public final class TestFilteringDirector
i = d.getEntries();
assertEquals(dirB, i.next());
- assertEquals(null, i.next());
+ assertNull(i.next());
// Filter everything
@@ -130,9 +130,9 @@ public final class TestFilteringDirector
d = new FilteringDirectoryNode(fs.getRoot(), excl);
assertEquals(0, d.getEntryCount());
- assertEquals(false, d.hasEntry(dirA.getName()));
- assertEquals(false, d.hasEntry(dirB.getName()));
- assertEquals(false, d.hasEntry(eRoot.getName()));
+ assertFalse(d.hasEntry(dirA.getName()));
+ assertFalse(d.hasEntry(dirB.getName()));
+ assertFalse(d.hasEntry(eRoot.getName()));
try {
d.getEntry(dirA.getName());
@@ -151,7 +151,7 @@ public final class TestFilteringDirector
}
i = d.getEntries();
- assertEquals(null, i.next());
+ assertNull(i.next());
}
@Test
@@ -166,20 +166,20 @@ public final class TestFilteringDirector
// Check main
assertEquals(2, d.getEntryCount());
- assertEquals(true, d.hasEntry(dirA.getName()));
- assertEquals(true, d.hasEntry(dirB.getName()));
- assertEquals(false, d.hasEntry(eRoot.getName()));
+ assertTrue(d.hasEntry(dirA.getName()));
+ assertTrue(d.hasEntry(dirB.getName()));
+ assertFalse(d.hasEntry(eRoot.getName()));
// Check filtering down
- assertEquals(true, d.getEntry(dirA.getName()) instanceof FilteringDirectoryNode);
- assertEquals(false, d.getEntry(dirB.getName()) instanceof FilteringDirectoryNode);
+ assertTrue(d.getEntry(dirA.getName()) instanceof FilteringDirectoryNode);
+ assertFalse(d.getEntry(dirB.getName()) instanceof FilteringDirectoryNode);
DirectoryEntry fdA = (DirectoryEntry) d.getEntry(dirA.getName());
- assertEquals(false, fdA.hasEntry(eA.getName()));
- assertEquals(true, fdA.hasEntry(dirAA.getName()));
+ assertFalse(fdA.hasEntry(eA.getName()));
+ assertTrue(fdA.hasEntry(dirAA.getName()));
DirectoryEntry fdAA = (DirectoryEntry) fdA.getEntry(dirAA.getName());
- assertEquals(true, fdAA.hasEntry(eAA.getName()));
+ assertTrue(fdAA.hasEntry(eAA.getName()));
}
@Test(expected = IllegalArgumentException.class)
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java Sun Dec 15 14:53:46 2019
@@ -271,8 +271,7 @@ public final class TestPOIFSDocumentPath
}
else
{
- assertTrue(j + "<>" + k,
- !(fullPaths[ j ].equals(builtUpPaths[ k ])));
+ assertFalse(fullPaths[j].equals(builtUpPaths[k]));
}
}
}
@@ -297,8 +296,7 @@ public final class TestPOIFSDocumentPath
{
for (int j = 0; j < badPaths.length; j++)
{
- assertTrue(j + "<>" + k,
- !(fullPaths[ k ].equals(badPaths[ j ])));
+ assertFalse(fullPaths[k].equals(badPaths[j]));
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.poifs.property;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -129,8 +130,7 @@ public final class TestDirectoryProperty
if (index != -1)
{
- assertTrue("found index " + index + " twice",
- !found[ index - 1 ]);
+ assertFalse(found[index - 1]);
found[ index - 1 ] = true;
total_found++;
}
@@ -143,8 +143,7 @@ public final class TestDirectoryProperty
if (index != -1)
{
- assertTrue("found index " + index + " twice",
- !found[ index - 1 ]);
+ assertFalse(found[index - 1]);
found[ index - 1 ] = true;
total_found++;
}
@@ -246,7 +245,7 @@ public final class TestDirectoryProperty
// as expected
}
assertTrue(_property.deleteChild(p1));
- assertTrue(!_property.deleteChild(p1));
+ assertFalse(_property.deleteChild(p1));
_property.addChild(new LocalProperty(1));
}
@@ -259,12 +258,12 @@ public final class TestDirectoryProperty
_property.addChild(p1);
assertTrue(_property.changeName(p1, "foobar"));
assertEquals("foobar", p1.getName());
- assertTrue(!_property.changeName(p1, "foobar"));
+ assertFalse(_property.changeName(p1, "foobar"));
assertEquals("foobar", p1.getName());
Property p2 = new LocalProperty(1);
_property.addChild(p2);
- assertTrue(!_property.changeName(p1, originalName));
+ assertFalse(_property.changeName(p1, originalName));
assertTrue(_property.changeName(p2, "foo"));
assertTrue(_property.changeName(p1, originalName));
}
@@ -299,6 +298,6 @@ public final class TestDirectoryProperty
}
assertEquals(index, property.getIndex());
assertEquals(name, property.getName());
- assertTrue(!property.getChildren().hasNext());
+ assertFalse(property.getChildren().hasNext());
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java Sun Dec 15 14:53:46 2019
@@ -100,7 +100,7 @@ public final class TestDocumentProperty
if (size >= 4096)
{
- assertTrue(!property.shouldUseSmallBlocks());
+ assertFalse(property.shouldUseSmallBlocks());
}
else
{
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.poifs.property;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
@@ -131,7 +132,7 @@ public final class TestRootProperty {
}
assertEquals(index, property.getIndex());
assertEquals(name, property.getName());
- assertTrue(!property.getChildren().hasNext());
+ assertFalse(property.getChildren().hasNext());
assertEquals(property.getStorageClsid().toString(), sClsId);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java Sun Dec 15 14:53:46 2019
@@ -20,6 +20,7 @@ package org.apache.poi.sl.draw.geom;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.awt.geom.Path2D;
@@ -52,7 +53,7 @@ public class TestPresetGeometries {
}
// we get the same instance on further calls
- assertTrue(shapes == PresetGeometries.getInstance());
+ assertSame(shapes, PresetGeometries.getInstance());
}
// helper methods to adjust list of presets for other tests
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java Sun Dec 15 14:53:46 2019
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -150,12 +151,12 @@ public abstract class BaseTestExternalFu
Cell cell2 = sh.getRow(2).getCell(1);
assertEquals("ISODD(2)", cell2.getCellFormula());
- assertEquals(false, evaluator.evaluate(cell2).getBooleanValue());
+ assertFalse(evaluator.evaluate(cell2).getBooleanValue());
assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCell(cell2));
Cell cell3 = sh.getRow(3).getCell(1);
assertEquals("ISEVEN(2)", cell3.getCellFormula());
- assertEquals(true, evaluator.evaluate(cell3).getBooleanValue());
+ assertTrue(evaluator.evaluate(cell3).getBooleanValue());
assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCell(cell3));
wb.close();
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java Sun Dec 15 14:53:46 2019
@@ -45,7 +45,7 @@ public class TestPlainCellCache extends
Loc sameLoc = new Loc(bookIndex, sheetIndex, rowIndex, columnIndex);
assertEquals(loc.hashCode(), sameLoc.hashCode());
- assertTrue(loc.equals(sameLoc));
+ assertEquals(loc, sameLoc);
assertNull(cache.get(loc));
PlainValueCellCacheEntry entry = new PlainValueCellCacheEntry(new NumberEval(0));
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@ package org.apache.poi.ss.formula.eval;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -66,7 +67,7 @@ public abstract class BaseTestCircularRe
* Makes sure that the specified evaluated cell value represents a circular reference error.
*/
private static void confirmCycleErrorCode(CellValue cellValue) {
- assertTrue(cellValue.getCellType() == CellType.ERROR);
+ assertSame(cellValue.getCellType(), CellType.ERROR);
assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cellValue.getErrorValue());
}
@@ -96,7 +97,7 @@ public abstract class BaseTestCircularRe
CellValue cellValue = evaluateWithCycles(wb, testCell);
- assertTrue(cellValue.getCellType() == CellType.NUMERIC);
+ assertSame(cellValue.getCellType(), CellType.NUMERIC);
assertEquals(2, cellValue.getNumberValue(), 0);
wb.close();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java Sun Dec 15 14:53:46 2019
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -111,7 +112,7 @@ public final class TestFormulaBugs {
cv = fe.evaluate(row.getCell(1));
assertEquals(CellType.BOOLEAN, cv.getCellType());
- assertEquals(true, cv.getBooleanValue());
+ assertTrue(cv.getBooleanValue());
wb.close();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.ss.formula.functions;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
@@ -51,12 +52,12 @@ public final class TestIsBlank {
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
CellValue result = fe.evaluate(cell);
assertEquals(CellType.BOOLEAN, result.getCellType());
- assertEquals(true, result.getBooleanValue());
+ assertTrue(result.getBooleanValue());
cell.setCellFormula("isblank(D7:D7)");
result = fe.evaluate(cell);
assertEquals(CellType.BOOLEAN, result.getCellType());
- assertEquals(true, result.getBooleanValue());
+ assertTrue(result.getBooleanValue());
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java Sun Dec 15 14:53:46 2019
@@ -76,7 +76,7 @@ public final class TestTFunc {
private static void confirmError(ValueEval arg) {
ValueEval eval = invokeT(arg);
- assertSame(arg, eval);
+ assertSame(arg, eval);
}
@Test
@@ -119,7 +119,7 @@ public final class TestTFunc {
confirmString(eval, "");
eval = invokeTWithReference(ErrorEval.NAME_INVALID);
- assertSame(eval, ErrorEval.NAME_INVALID);
+ assertSame(eval, ErrorEval.NAME_INVALID);
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java Sun Dec 15 14:53:46 2019
@@ -169,8 +169,7 @@ public abstract class BaseTestCellCommen
assertNotNull("Cells in the second column have comments", sheet.getCellComment(new CellAddress(rownum, 1)));
assertEquals("Yegor Kozlov", comment.getAuthor());
- assertTrue("cells in the second column should have non-empty notes",
- !comment.getString().getString().isEmpty());
+ assertFalse(comment.getString().getString().isEmpty());
assertEquals(rownum, comment.getRow());
assertEquals(cell.getColumnIndex(), comment.getColumn());
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java Sun Dec 15 14:53:46 2019
@@ -23,6 +23,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.poi.ss.usermodel.helpers.ColumnShifter;
@@ -77,7 +78,7 @@ public abstract class BaseTestColumnShif
public void testShiftLeft() {
try {
columnShifter.shiftColumns(1, 2, -3);
- assertTrue("Shift to negative indices should throw exception", false);
+ fail("Shift to negative indices should throw exception");
}
catch(IllegalStateException e){
assertTrue(true);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java Sun Dec 15 14:53:46 2019
@@ -610,7 +610,7 @@ public abstract class BaseTestConditiona
assertEquals(ConditionType.CELL_VALUE_IS, cr.getConditionType());
assertEquals(ComparisonOperator.GT, cr.getComparisonOperation());
assertEquals("0", cr.getFormula1());
- assertEquals(null, cr.getFormula2());
+ assertNull(cr.getFormula2());
// When it matches:
// Sets the font colour to dark green
// Sets the background colour to lighter green
@@ -791,13 +791,13 @@ public abstract class BaseTestConditiona
private void assertDataBar(ConditionalFormattingRule cr, String color) {
assertEquals(ConditionType.DATA_BAR, cr.getConditionType());
assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
- assertEquals(null, cr.getFormula1());
- assertEquals(null, cr.getFormula2());
+ assertNull(cr.getFormula1());
+ assertNull(cr.getFormula2());
DataBarFormatting databar = cr.getDataBarFormatting();
assertNotNull(databar);
- assertEquals(false, databar.isIconOnly());
- assertEquals(true, databar.isLeftToRight());
+ assertFalse(databar.isIconOnly());
+ assertTrue(databar.isLeftToRight());
assertEquals(0, databar.getWidthMin());
assertEquals(100, databar.getWidthMax());
@@ -806,12 +806,12 @@ public abstract class BaseTestConditiona
ConditionalFormattingThreshold th;
th = databar.getMinThreshold();
assertEquals(RangeType.MIN, th.getRangeType());
- assertEquals(null, th.getValue());
- assertEquals(null, th.getFormula());
+ assertNull(th.getValue());
+ assertNull(th.getFormula());
th = databar.getMaxThreshold();
assertEquals(RangeType.MAX, th.getRangeType());
- assertEquals(null, th.getValue());
- assertEquals(null, th.getFormula());
+ assertNull(th.getValue());
+ assertNull(th.getFormula());
}
private void assertIconSetPercentages(ConditionalFormatting cf, IconSet iconset, Double...vals) {
@@ -822,14 +822,14 @@ public abstract class BaseTestConditiona
private void assertIconSetPercentages(ConditionalFormattingRule cr, IconSet iconset, Double...vals) {
assertEquals(ConditionType.ICON_SET, cr.getConditionType());
assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
- assertEquals(null, cr.getFormula1());
- assertEquals(null, cr.getFormula2());
+ assertNull(cr.getFormula1());
+ assertNull(cr.getFormula2());
IconMultiStateFormatting icon = cr.getMultiStateFormatting();
assertNotNull(icon);
assertEquals(iconset, icon.getIconSet());
- assertEquals(false, icon.isIconOnly());
- assertEquals(false, icon.isReversed());
+ assertFalse(icon.isIconOnly());
+ assertFalse(icon.isReversed());
assertNotNull(icon.getThresholds());
assertEquals(vals.length, icon.getThresholds().length);
@@ -838,7 +838,7 @@ public abstract class BaseTestConditiona
ConditionalFormattingThreshold th = icon.getThresholds()[i];
assertEquals(RangeType.PERCENT, th.getRangeType());
assertEquals(v, th.getValue());
- assertEquals(null, th.getFormula());
+ assertNull(th.getFormula());
}
}
@@ -850,8 +850,8 @@ public abstract class BaseTestConditiona
private void assertColorScale(ConditionalFormattingRule cr, String... colors) {
assertEquals(ConditionType.COLOR_SCALE, cr.getConditionType());
assertEquals(ComparisonOperator.NO_COMPARISON, cr.getComparisonOperation());
- assertEquals(null, cr.getFormula1());
- assertEquals(null, cr.getFormula2());
+ assertNull(cr.getFormula1());
+ assertNull(cr.getFormula2());
ColorScaleFormatting color = cr.getColorScaleFormatting();
assertNotNull(color);
@@ -873,7 +873,7 @@ public abstract class BaseTestConditiona
assertEquals(RangeType.PERCENTILE, th.getRangeType());
assertEquals(steps*i, th.getValue().intValue());
}
- assertEquals(null, th.getFormula());
+ assertNull(th.getFormula());
}
// Colors should match
@@ -1107,8 +1107,8 @@ public abstract class BaseTestConditiona
assertEquals(IconSet.GYRB_4_TRAFFIC_LIGHTS, iconFmt.getIconSet());
assertEquals(4, iconFmt.getThresholds().length);
- assertEquals(false, iconFmt.isIconOnly());
- assertEquals(false, iconFmt.isReversed());
+ assertFalse(iconFmt.isIconOnly());
+ assertFalse(iconFmt.isReversed());
iconFmt.setIconOnly(true);
iconFmt.getThresholds()[0].setRangeType(RangeType.MIN);
@@ -1136,17 +1136,17 @@ public abstract class BaseTestConditiona
assertEquals(IconSet.GYRB_4_TRAFFIC_LIGHTS, iconFmt.getIconSet());
assertEquals(4, iconFmt.getThresholds().length);
- assertEquals(true, iconFmt.isIconOnly());
- assertEquals(false, iconFmt.isReversed());
+ assertTrue(iconFmt.isIconOnly());
+ assertFalse(iconFmt.isReversed());
assertEquals(RangeType.MIN, iconFmt.getThresholds()[0].getRangeType());
assertEquals(RangeType.NUMBER, iconFmt.getThresholds()[1].getRangeType());
assertEquals(RangeType.PERCENT,iconFmt.getThresholds()[2].getRangeType());
assertEquals(RangeType.MAX, iconFmt.getThresholds()[3].getRangeType());
- assertEquals(null, iconFmt.getThresholds()[0].getValue());
+ assertNull(iconFmt.getThresholds()[0].getValue());
assertEquals(10d, iconFmt.getThresholds()[1].getValue(), 0);
assertEquals(75d, iconFmt.getThresholds()[2].getValue(), 0);
- assertEquals(null, iconFmt.getThresholds()[3].getValue());
+ assertNull(iconFmt.getThresholds()[3].getValue());
wb2.close();
}
@@ -1193,9 +1193,9 @@ public abstract class BaseTestConditiona
assertEquals(RangeType.MIN, clrFmt.getThresholds()[0].getRangeType());
assertEquals(RangeType.NUMBER, clrFmt.getThresholds()[1].getRangeType());
assertEquals(RangeType.MAX, clrFmt.getThresholds()[2].getRangeType());
- assertEquals(null, clrFmt.getThresholds()[0].getValue());
+ assertNull(clrFmt.getThresholds()[0].getValue());
assertEquals(10d, clrFmt.getThresholds()[1].getValue(), 0);
- assertEquals(null, clrFmt.getThresholds()[2].getValue());
+ assertNull(clrFmt.getThresholds()[2].getValue());
wb2.close();
}
@@ -1212,9 +1212,9 @@ public abstract class BaseTestConditiona
ConditionalFormattingRule rule1 =
sheetCF.createConditionalFormattingRule(color);
DataBarFormatting dbFmt = rule1.getDataBarFormatting();
-
- assertEquals(false, dbFmt.isIconOnly());
- assertEquals(true, dbFmt.isLeftToRight());
+
+ assertFalse(dbFmt.isIconOnly());
+ assertTrue(dbFmt.isLeftToRight());
assertEquals(0, dbFmt.getWidthMin());
assertEquals(100, dbFmt.getWidthMax());
assertColour(colorHex, dbFmt.getColor());
@@ -1237,17 +1237,17 @@ public abstract class BaseTestConditiona
rule1 = cf.getRule(0);
dbFmt = rule1.getDataBarFormatting();
assertEquals(ConditionType.DATA_BAR, rule1.getConditionType());
-
- assertEquals(false, dbFmt.isIconOnly());
- assertEquals(true, dbFmt.isLeftToRight());
+
+ assertFalse(dbFmt.isIconOnly());
+ assertTrue(dbFmt.isLeftToRight());
assertEquals(0, dbFmt.getWidthMin());
assertEquals(100, dbFmt.getWidthMax());
assertColour(colorHex, dbFmt.getColor());
assertEquals(RangeType.MIN, dbFmt.getMinThreshold().getRangeType());
assertEquals(RangeType.MAX, dbFmt.getMaxThreshold().getRangeType());
- assertEquals(null, dbFmt.getMinThreshold().getValue());
- assertEquals(null, dbFmt.getMaxThreshold().getValue());
+ assertNull(dbFmt.getMinThreshold().getValue());
+ assertNull(dbFmt.getMaxThreshold().getValue());
wb2.close();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java Sun Dec 15 14:53:46 2019
@@ -140,7 +140,7 @@ public abstract class BaseTestFont {
assertNotNull(wb3.getFontAt(font2Idx));
assertEquals(15, wb3.getFontAt(font2Idx).getFontHeightInPoints());
- assertEquals(true, wb3.getFontAt(font2Idx).getItalic());
+ assertTrue(wb3.getFontAt(font2Idx).getItalic());
wb3.close();
}
@@ -195,7 +195,7 @@ public abstract class BaseTestFont {
assertEquals(nf, wb.getFontAt(nfIdx));
assertEquals(wb.getFontAt(nfIdx), wb.getFontAt(nfIdx));
- assertTrue(wb.getFontAt(0) != wb.getFontAt(nfIdx));
+ assertNotSame(wb.getFontAt(0), wb.getFontAt(nfIdx));
// Find it now
assertNotNull(
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java Sun Dec 15 14:53:46 2019
@@ -19,6 +19,7 @@ package org.apache.poi.ss.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import org.apache.poi.ss.util.NumberComparisonExamples.ComparisonExample;
@@ -74,7 +75,7 @@ public final class TestNumberComparer {
double a = 0.06-0.01;
double b = 0.05;
//noinspection ConstantConditions
- assertFalse(a == b);
+ assertNotEquals(a, b, 0.0);
assertEquals(0, NumberComparer.compare(a, b));
}
@@ -86,7 +87,7 @@ public final class TestNumberComparer {
double a = 1+1.0028-0.9973;
double b = 1.0055;
//noinspection ConstantConditions
- assertFalse(a == b);
+ assertNotEquals(a, b, 0.0);
assertEquals(0, NumberComparer.compare(a, b));
}
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java Sun Dec 15 14:53:46 2019
@@ -60,22 +60,22 @@ public final class TestBitField extends
}
public void testIsSet() {
- assertTrue(!bf_multi.isSet(0));
+ assertFalse(bf_multi.isSet(0));
for (int j = 0x80; j <= 0x3F80; j += 0x80)
{
assertTrue(bf_multi.isSet(j));
}
- assertTrue(!bf_single.isSet(0));
+ assertFalse(bf_single.isSet(0));
assertTrue(bf_single.isSet(0x4000));
}
public void testIsAllSet() {
for (int j = 0; j < 0x3F80; j += 0x80)
{
- assertTrue(!bf_multi.isAllSet(j));
+ assertFalse(bf_multi.isAllSet(j));
}
assertTrue(bf_multi.isAllSet(0x3F80));
- assertTrue(!bf_single.isAllSet(0));
+ assertFalse(bf_single.isAllSet(0));
assertTrue(bf_single.isAllSet(0x4000));
}
@@ -148,7 +148,7 @@ public final class TestBitField extends
byte clearedBit = BitFieldFactory.getInstance(0x40).setByteBoolean(( byte ) -63,
false);
- assertEquals(false, BitFieldFactory.getInstance(0x40).isSet(clearedBit));
+ assertFalse(BitFieldFactory.getInstance(0x40).isSet(clearedBit));
}
public void testClear() {
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java Sun Dec 15 14:53:46 2019
@@ -21,6 +21,8 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -279,7 +281,7 @@ public final class TestIntList {
assertEquals(list, list);
//noinspection ObjectEqualsNull
- assertFalse(list.equals(null));
+ assertNotEquals(null, list);
IntList list2 = new IntList(200);
assertEquals(list, list2);
@@ -289,15 +291,15 @@ public final class TestIntList {
list.add(1);
list2.add(1);
list2.add(0);
- assertFalse(list.equals(list2));
+ assertNotEquals(list, list2);
list2.removeValue(1);
list2.add(1);
assertEquals(list, list2);
assertEquals(list2, list);
assertEquals(list.hashCode(), list2.hashCode());
list2.add(2);
- assertFalse(list.equals(list2));
- assertFalse(list2.equals(list));
+ assertNotEquals(list, list2);
+ assertNotEquals(list2, list);
}
@Test
@@ -604,8 +606,8 @@ public final class TestIntList {
int[] a4 = list.toArray(aShort);
int[] a5 = list.toArray(aLong);
- assertTrue(a4 != aShort);
- assertTrue(a5 != aLong);
+ assertNotSame(a4, aShort);
+ assertNotSame(a5, aLong);
assertEquals(a4.length, list.size());
for (int j = 0; j < 1000; j++)
{
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java Sun Dec 15 14:53:46 2019
@@ -17,7 +17,7 @@
package org.apache.poi.util;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -140,7 +140,7 @@ public class TestTempFile {
// Should be able to create two tempfiles with same prefix and suffix
File file1 = TempFile.createTempFile("TestTempFile", ".tst");
File file2 = TempFile.createTempFile("TestTempFile", ".tst");
- assertFalse(file1.equals(file2));
+ assertNotEquals(file1, file2);
assertNotNull(file2);
assertTrue(file2.delete());
assertNotNull(file1);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org