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 [2/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/hssf/model/TestDrawingAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java Sun Dec 15 14:53:46 2019
@@ -20,6 +20,7 @@ import static org.apache.poi.poifs.stora
import static org.junit.Assert.assertArrayEquals;
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 static org.junit.Assert.fail;
@@ -149,8 +150,7 @@ public class TestDrawingAggregate {
byte[] dgBytes2 = agg.serialize();
assertEquals("different size of raw data ande aggregate.serialize()", dgBytes1.length, dgBytes2.length);
- assertTrue("raw drawing data ("+dgBytes1.length+" bytes) and aggregate.serialize() are different.",
- Arrays.equals(dgBytes1, dgBytes2));
+ assertArrayEquals("raw drawing data (" + dgBytes1.length + " bytes) and aggregate.serialize() are different.", dgBytes1, dgBytes2);
}
}
@@ -164,8 +164,7 @@ public class TestDrawingAggregate {
byte[] dgBytes1 = info1.getRawBytes();
byte[] dgBytes2 = info2.getRawBytes();
assertEquals("different size of drawing data before and after save", dgBytes1.length, dgBytes2.length);
- assertTrue("drawing data ("+dgBytes1.length+" bytes) before and after save is different.",
- Arrays.equals(dgBytes1, dgBytes2));
+ assertArrayEquals("drawing data (" + dgBytes1.length + " bytes) before and after save is different.", dgBytes1, dgBytes2);
}
}
wb2.close();
@@ -295,7 +294,7 @@ public class TestDrawingAggregate {
agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb2.close();
}
@@ -314,7 +313,7 @@ public class TestDrawingAggregate {
EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -338,7 +337,7 @@ public class TestDrawingAggregate {
System.out.println("pos = " + i);
}
}
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -401,7 +400,7 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -469,7 +468,7 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -490,7 +489,7 @@ public class TestDrawingAggregate {
for (int i = 0; i < records.size(); i++) {
RecordBase r1 = records.get(i);
RecordBase r2 = records2.get(i);
- assertTrue(r1.getClass() == r2.getClass());
+ assertSame(r1.getClass(), r2.getClass());
assertEquals(r1.getRecordSize(), r2.getRecordSize());
if (r1 instanceof Record) {
assertEquals(((Record) r1).getSid(), ((Record) r2).getSid());
@@ -555,7 +554,7 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -615,7 +614,7 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
wb.close();
}
@@ -768,7 +767,7 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
}
@Test
@@ -941,6 +940,6 @@ public class TestDrawingAggregate {
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data brefpore and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data brefpore and after save is different", dgBytes, dgBytesAfterSave);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java Sun Dec 15 14:53:46 2019
@@ -31,10 +31,11 @@ import org.apache.poi.hssf.usermodel.HSS
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
import java.util.Random;
+import static org.junit.Assert.assertArrayEquals;
+
/**
* @author Evgeniy Berlog
* @date 18.06.12
@@ -56,26 +57,26 @@ public class TestEscherRecordFactory ext
public void testDetectContainer() {
Random rnd = new Random();
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DG_CONTAINER));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SOLVER_CONTAINER));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SP_CONTAINER));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DGG_CONTAINER));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.BSTORE_CONTAINER));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SPGR_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DG_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SOLVER_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SP_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.DGG_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.BSTORE_CONTAINER));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x0, EscherContainerRecord.SPGR_CONTAINER));
for (Short i=EscherContainerRecord.DGG_CONTAINER; i<= EscherContainerRecord.SOLVER_CONTAINER; i++){
- assertEquals(true, DefaultEscherRecordFactory.isContainer(Integer.valueOf(rnd.nextInt(Short.MAX_VALUE)).shortValue(), i));
+ assertTrue(DefaultEscherRecordFactory.isContainer(Integer.valueOf(rnd.nextInt(Short.MAX_VALUE)).shortValue(), i));
}
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.SOLVER_CONTAINER+1).shortValue()));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x0, Integer.valueOf(EscherContainerRecord.SOLVER_CONTAINER + 1).shortValue()));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0x000F, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
- assertEquals(true, DefaultEscherRecordFactory.isContainer((short) 0xFFFF, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x000C, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0xCCCC, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER-1).shortValue()));
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0x000F, EscherTextboxRecord.RECORD_ID));
- assertEquals(false, DefaultEscherRecordFactory.isContainer((short) 0xCCCC, EscherTextboxRecord.RECORD_ID));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0x000F, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertTrue(DefaultEscherRecordFactory.isContainer((short) 0xFFFF, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x000C, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0xCCCC, Integer.valueOf(EscherContainerRecord.DGG_CONTAINER - 1).shortValue()));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0x000F, EscherTextboxRecord.RECORD_ID));
+ assertFalse(DefaultEscherRecordFactory.isContainer((short) 0xCCCC, EscherTextboxRecord.RECORD_ID));
}
public void testDgContainerMustBeRootOfHSSFSheetEscherRecords() throws IOException {
@@ -88,12 +89,12 @@ public class TestEscherRecordFactory ext
byte[] dgBytes = toByteArray(dgRecords);
sh.getDrawingPatriarch();
EscherAggregate agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
- assertEquals(true, agg.getEscherRecords().get(0) instanceof EscherContainerRecord);
+ assertTrue(agg.getEscherRecords().get(0) instanceof EscherContainerRecord);
assertEquals(EscherContainerRecord.DG_CONTAINER, agg.getEscherRecords().get(0).getRecordId());
assertEquals((short) 0x0, agg.getEscherRecords().get(0).getOptions());
agg = (EscherAggregate) ish.findFirstRecordBySid(EscherAggregate.sid);
byte[] dgBytesAfterSave = agg.serialize();
assertEquals("different size of drawing data before and after save", dgBytes.length, dgBytesAfterSave.length);
- assertTrue("drawing data before and after save is different", Arrays.equals(dgBytes, dgBytesAfterSave));
+ assertArrayEquals("drawing data before and after save is different", dgBytes, dgBytesAfterSave);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java Sun Dec 15 14:53:46 2019
@@ -132,7 +132,7 @@ public final class TestFormulaParser {
Ptg[] ptgs = parseFormula("TRUE");
assertEquals(1, ptgs.length);
BoolPtg flag = (BoolPtg) ptgs[0];
- assertEquals(true, flag.getValue());
+ assertTrue(flag.getValue());
}
@Test
@@ -300,18 +300,18 @@ public final class TestFormulaParser {
String value = " hi ";
Ptg[] ptgs = parseFormula("\"" + value + "\"");
confirmTokenClasses(ptgs, StringPtg.class);
- assertTrue("ptg0 contains exact value", ((StringPtg)ptgs[0]).getValue().equals(value));
+ assertEquals("ptg0 contains exact value", ((StringPtg) ptgs[0]).getValue(), value);
}
@Test
public void testLookupAndMatchFunctionArgs() {
Ptg[] ptgs = parseFormula("lookup(A1, A3:A52, B3:B52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, AreaPtg.class, FuncVarPtg.class);
- assertTrue("ptg0 has Value class", ptgs[0].getPtgClass() == Ptg.CLASS_VALUE);
+ assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(), Ptg.CLASS_VALUE);
ptgs = parseFormula("match(A1, A3:A52)");
confirmTokenClasses(ptgs, RefPtg.class, AreaPtg.class, FuncVarPtg.class);
- assertTrue("ptg0 has Value class", ptgs[0].getPtgClass() == Ptg.CLASS_VALUE);
+ assertEquals("ptg0 has Value class", ptgs[0].getPtgClass(), Ptg.CLASS_VALUE);
}
/** bug 33160*/
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java Sun Dec 15 14:53:46 2019
@@ -70,7 +70,7 @@ public final class TestFormulaParserEval
*/
private static void confirmParseFormula(HSSFWorkbook workbook) {
Ptg[] ptgs = HSSFFormulaParser.parse("SUM(testName)", workbook);
- assertTrue("two tokens expected, got "+ptgs.length,ptgs.length == 2);
+ assertEquals("two tokens expected, got " + ptgs.length, 2, ptgs.length);
assertEquals(NamePtg.class, ptgs[0].getClass());
assertEquals(AttrPtg.class, ptgs[1].getClass());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java Sun Dec 15 14:53:46 2019
@@ -198,7 +198,7 @@ public final class TestFormulaParserIf e
StringPtg n = (StringPtg) ptgs[4];
- assertEquals(true, flag.getValue());
+ assertTrue(flag.getValue());
assertEquals("Y", y.getValue());
assertEquals("N", n.getValue());
assertEquals("IF", funif.toFormulaString());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java Sun Dec 15 14:53:46 2019
@@ -18,15 +18,24 @@
package org.apache.poi.hssf.model;
import junit.framework.TestCase;
-import org.apache.poi.ddf.*;
+import org.apache.poi.ddf.EscherChildAnchorRecord;
+import org.apache.poi.ddf.EscherClientAnchorRecord;
+import org.apache.poi.ddf.EscherClientDataRecord;
+import org.apache.poi.ddf.EscherContainerRecord;
+import org.apache.poi.ddf.EscherOptRecord;
+import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.usermodel.HSSFAnchor;
+import org.apache.poi.hssf.usermodel.HSSFChildAnchor;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFPatriarch;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
+import org.apache.poi.hssf.usermodel.HSSFTestHelper;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
+import org.junit.Assert;
-/**
- * @author Evgeniy Berlog
- * @date 12.06.12
- */
public class TestHSSFAnchor extends TestCase {
public void testDefaultValues(){
@@ -100,6 +109,7 @@ public class TestHSSFAnchor extends Test
container.addChildRecord(escher);
HSSFClientAnchor anchor = (HSSFClientAnchor) HSSFAnchor.createAnchorFromEscher(container);
+ assertNotNull(anchor);
assertEquals(anchor.getCol1(), 11);
assertEquals(escher.getCol1(), 11);
assertEquals(anchor.getCol2(), 12);
@@ -128,6 +138,7 @@ public class TestHSSFAnchor extends Test
container.addChildRecord(escher);
HSSFChildAnchor anchor = (HSSFChildAnchor) HSSFAnchor.createAnchorFromEscher(container);
+ assertNotNull(anchor);
assertEquals(anchor.getDx1(), 15);
assertEquals(escher.getDx1(), 15);
assertEquals(anchor.getDx2(), 16);
@@ -153,7 +164,7 @@ public class TestHSSFAnchor extends Test
assertNotNull(HSSFTestHelper.getEscherAnchor(anchor));
assertNotNull(HSSFTestHelper.getEscherContainer(rectangle));
- assertTrue(HSSFTestHelper.getEscherAnchor(anchor).equals(HSSFTestHelper.getEscherContainer(rectangle).getChildById(EscherClientAnchorRecord.RECORD_ID)));
+ assertEquals(HSSFTestHelper.getEscherAnchor(anchor), HSSFTestHelper.getEscherContainer(rectangle).getChildById(EscherClientAnchorRecord.RECORD_ID));
}
public void testClientAnchorFromEscher(){
@@ -298,24 +309,24 @@ public class TestHSSFAnchor extends Test
public void testNullReferenceIsFalse() {
HSSFClientAnchor clientAnchor = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
- assertFalse("Passing null to equals should return false", clientAnchor.equals(null));
+ Assert.assertNotNull("Passing null to equals should return false", clientAnchor);
HSSFChildAnchor childAnchor = new HSSFChildAnchor(0, 1, 2, 3);
- assertFalse("Passing null to equals should return false", childAnchor.equals(null));
+ assertNotNull("Passing null to equals should return false", childAnchor);
}
public void testEqualsIsReflexiveIsSymmetric() {
HSSFClientAnchor clientAnchor1 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
HSSFClientAnchor clientAnchor2 = new HSSFClientAnchor(0, 1, 2, 3, (short)4, 5, (short)6, 7);
- assertTrue(clientAnchor1.equals(clientAnchor2));
- assertTrue(clientAnchor1.equals(clientAnchor2));
+ assertEquals(clientAnchor1, clientAnchor2);
+ assertEquals(clientAnchor1, clientAnchor2);
HSSFChildAnchor childAnchor1 = new HSSFChildAnchor(0, 1, 2, 3);
HSSFChildAnchor childAnchor2 = new HSSFChildAnchor(0, 1, 2, 3);
- assertTrue(childAnchor1.equals(childAnchor2));
- assertTrue(childAnchor2.equals(childAnchor1));
+ assertEquals(childAnchor1, childAnchor2);
+ assertEquals(childAnchor2, childAnchor1);
}
public void testEqualsValues(){
@@ -394,32 +405,32 @@ public class TestHSSFAnchor extends Test
public void testFlipped(){
HSSFChildAnchor child = new HSSFChildAnchor(2,2,1,1);
- assertEquals(child.isHorizontallyFlipped(), true);
- assertEquals(child.isVerticallyFlipped(), true);
+ assertTrue(child.isHorizontallyFlipped());
+ assertTrue(child.isVerticallyFlipped());
assertEquals(child.getDx1(), 1);
assertEquals(child.getDx2(), 2);
assertEquals(child.getDy1(), 1);
assertEquals(child.getDy2(), 2);
child = new HSSFChildAnchor(3,3,4,4);
- assertEquals(child.isHorizontallyFlipped(), false);
- assertEquals(child.isVerticallyFlipped(), false);
+ assertFalse(child.isHorizontallyFlipped());
+ assertFalse(child.isVerticallyFlipped());
assertEquals(child.getDx1(), 3);
assertEquals(child.getDx2(), 4);
assertEquals(child.getDy1(), 3);
assertEquals(child.getDy2(), 4);
HSSFClientAnchor client = new HSSFClientAnchor(1,1,1,1, (short)4,4,(short)3,3);
- assertEquals(client.isVerticallyFlipped(), true);
- assertEquals(client.isHorizontallyFlipped(), true);
+ assertTrue(client.isVerticallyFlipped());
+ assertTrue(client.isHorizontallyFlipped());
assertEquals(client.getCol1(), 3);
assertEquals(client.getCol2(), 4);
assertEquals(client.getRow1(), 3);
assertEquals(client.getRow2(), 4);
client = new HSSFClientAnchor(1,1,1,1, (short)5,5,(short)6,6);
- assertEquals(client.isVerticallyFlipped(), false);
- assertEquals(client.isHorizontallyFlipped(), false);
+ assertFalse(client.isVerticallyFlipped());
+ assertFalse(client.isHorizontallyFlipped());
assertEquals(client.getCol1(), 5);
assertEquals(client.getCol2(), 6);
assertEquals(client.getRow1(), 5);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java Sun Dec 15 14:53:46 2019
@@ -181,8 +181,8 @@ public final class TestLinkTable extends
assertNotNull(lt);
assertEquals(2, commentRecords.size());
- assertTrue(recs[1] == commentRecords.get("name1")); //== is intentionally not .equals()!
- assertTrue(recs[3] == commentRecords.get("name2")); //== is intentionally not .equals()!
+ assertSame(recs[1], commentRecords.get("name1")); //== is intentionally not .equals()!
+ assertSame(recs[3], commentRecords.get("name2")); //== is intentionally not .equals()!
assertEquals(2, lt.getNumNames());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java Sun Dec 15 14:53:46 2019
@@ -140,11 +140,11 @@ public final class TestSheet {
for (int n = 0; n < regionsToAdd; n++)
{
int index = sheet.addMergedRegion(0, (short) 0, 1, (short) 1);
- assertTrue("Merged region index expected to be " + n + " got " + index, index == n);
+ assertEquals("Merged region index expected to be " + n + " got " + index, index, n);
}
//test all the regions were indeed added
- assertTrue(sheet.getNumMergedRegions() == regionsToAdd);
+ assertEquals(sheet.getNumMergedRegions(), regionsToAdd);
//test that the regions were spread out over the appropriate number of records
MergedCellListener mcListener = new MergedCellListener();
@@ -153,8 +153,8 @@ public final class TestSheet {
int recordsExpected = regionsToAdd/1027;
if ((regionsToAdd % 1027) != 0)
recordsExpected++;
- assertTrue("The " + regionsToAdd + " merged regions should have been spread out over "
- + recordsExpected + " records, not " + recordsAdded, recordsAdded == recordsExpected);
+ assertEquals("The " + regionsToAdd + " merged regions should have been spread out over "
+ + recordsExpected + " records, not " + recordsAdded, recordsAdded, recordsExpected);
// Check we can't add one with invalid date
try {
sheet.addMergedRegion(10, (short)10, 9, (short)12);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java Sun Dec 15 14:53:46 2019
@@ -140,7 +140,7 @@ public final class TestWorkbook {
int countryPos = iwb.findFirstRecordLocBySid(CountryRecord.sid);
assertTrue(countryPos != -1);
// RecalcIdRecord is not present in new workbooks
- assertEquals(null, iwb.findFirstRecordBySid(RecalcIdRecord.sid));
+ assertNull(iwb.findFirstRecordBySid(RecalcIdRecord.sid));
RecalcIdRecord record = iwb.getRecalcId();
assertNotNull(record);
assertSame(record, iwb.getRecalcId());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java Sun Dec 15 14:53:46 2019
@@ -70,7 +70,7 @@ public final class TestBoolErrRecord ext
}
assertFalse(hasMore);
assertTrue(ber.isBoolean());
- assertEquals(true, ber.getBooleanValue());
+ assertTrue(ber.getBooleanValue());
// Check that the record re-serializes correctly
byte[] outData = ber.serialize();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java Sun Dec 15 14:53:46 2019
@@ -45,17 +45,17 @@ public final class TestCFHeaderRecord ex
assertEquals(65535, enclosingCellRange.getLastRow());
assertEquals(0, enclosingCellRange.getFirstColumn());
assertEquals(6, enclosingCellRange.getLastColumn());
-
- assertEquals(false, record.getNeedRecalculation());
+
+ assertFalse(record.getNeedRecalculation());
assertEquals(0, record.getID());
record.setNeedRecalculation(true);
- assertEquals(true, record.getNeedRecalculation());
+ assertTrue(record.getNeedRecalculation());
assertEquals(0, record.getID());
record.setID(7);
record.setNeedRecalculation(false);
- assertEquals(false, record.getNeedRecalculation());
+ assertFalse(record.getNeedRecalculation());
assertEquals(7, record.getID());
}
@@ -78,16 +78,16 @@ public final class TestCFHeaderRecord ex
assertEquals(0, enclosingCellRange.getFirstColumn());
assertEquals(6, enclosingCellRange.getLastColumn());
- assertEquals(false, record.getNeedRecalculation());
+ assertFalse(record.getNeedRecalculation());
assertEquals(0, record.getID());
record.setNeedRecalculation(true);
- assertEquals(true, record.getNeedRecalculation());
+ assertTrue(record.getNeedRecalculation());
assertEquals(0, record.getID());
record.setID(7);
record.setNeedRecalculation(false);
- assertEquals(false, record.getNeedRecalculation());
+ assertFalse(record.getNeedRecalculation());
assertEquals(7, record.getID());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java Sun Dec 15 14:53:46 2019
@@ -41,9 +41,9 @@ public final class TestColumnInfoRecord
assertEquals(155, cir.getLastColumn());
assertEquals(6599, cir.getColumnWidth());
assertEquals(15, cir.getXFIndex());
- assertEquals(true, cir.getHidden());
+ assertTrue(cir.getHidden());
assertEquals(3, cir.getOutlineLevel());
- assertEquals(true, cir.getCollapsed());
+ assertTrue(cir.getCollapsed());
assertArrayEquals(data, cir.serialize());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java Sun Dec 15 14:53:46 2019
@@ -42,10 +42,10 @@ public final class TestCommonObjectDataS
assertEquals( CommonObjectDataSubRecord.OBJECT_TYPE_LIST_BOX, record.getObjectType());
assertEquals((short) 1, record.getObjectId());
assertEquals((short) 1, record.getOption());
- assertEquals(true, record.isLocked());
- assertEquals(false, record.isPrintable());
- assertEquals(false, record.isAutofill());
- assertEquals(false, record.isAutoline());
+ assertTrue(record.isLocked());
+ assertFalse(record.isPrintable());
+ assertFalse(record.isAutofill());
+ assertFalse(record.isAutoline());
assertEquals(24593, record.getReserved1());
assertEquals(218103808, record.getReserved2());
assertEquals(294, record.getReserved3());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java Sun Dec 15 14:53:46 2019
@@ -25,6 +25,8 @@ import java.util.Arrays;
import junit.framework.TestCase;
import org.apache.poi.util.LittleEndianOutputStream;
+import static org.junit.Assert.assertArrayEquals;
+
/**
* Unit tests for DConRefRecord class.
*
@@ -184,7 +186,6 @@ public class TestDConRefRecord extends T
/**
* test read-constructor-then-serialize for a single-byte external reference strings of
* various flavours. This uses the RecordInputStream constructor.
- * @throws IOException
*/
public void testReadWriteSBExtRef() throws IOException
{
@@ -210,8 +211,6 @@ public class TestDConRefRecord extends T
/**
* test read-constructor-then-serialize for a double-byte external reference 'UNC-Volume' style
* string
- * <p>
- * @throws IOException
*/
public void testReadWriteDBExtRefUncVol() throws IOException
{
@@ -227,14 +226,11 @@ public class TestDConRefRecord extends T
d.serialize(o);
o.flush();
- assertTrue(message, Arrays.equals(data,
- bos.toByteArray()));
+ assertArrayEquals(message, data, bos.toByteArray());
}
/**
* test read-constructor-then-serialize for a double-byte self-reference style string
- * <p>
- * @throws IOException
*/
public void testReadWriteDBSelfRef() throws IOException
{
@@ -243,8 +239,6 @@ public class TestDConRefRecord extends T
/**
* test read-constructor-then-serialize for a single-byte self-reference style string
- * <p>
- * @throws IOException
*/
public void testReadWriteSBSelfRef() throws IOException
{
@@ -289,7 +283,7 @@ public class TestDConRefRecord extends T
DConRefRecord instance = new DConRefRecord(TestcaseRecordInputStream.create(81, data1));
byte[] expResult = Arrays.copyOfRange(data1, 9, data1.length);
byte[] result = instance.getPath();
- assertTrue("get path", Arrays.equals(expResult, result));
+ assertArrayEquals("get path", expResult, result);
}
/**
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java Sun Dec 15 14:53:46 2019
@@ -826,7 +826,7 @@ public final class TestExtSSTRecord exte
UnicodeString us1 = expected.getString(k);
UnicodeString us2 = actual.getString(k);
- assertTrue("String at idx=" + k, us1.equals(us2));
+ assertEquals("String at idx=" + k, us1, us2);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java Sun Dec 15 14:53:46 2019
@@ -187,7 +187,7 @@ public final class TestFormulaRecord ext
if (fr0.getCachedBooleanValue() && !fr1.getCachedBooleanValue()) {
throw new AssertionFailedError("Identified bug 46479c");
}
- assertEquals(false, fr0.getCachedBooleanValue());
- assertEquals(true, fr1.getCachedBooleanValue());
+ assertFalse(fr0.getCachedBooleanValue());
+ assertTrue(fr1.getCachedBooleanValue());
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java Sun Dec 15 14:53:46 2019
@@ -52,9 +52,9 @@ public final class TestMergeCellsRecord
assertEquals("New Clone Row From doesnt match", mergeRegion.getFirstRow(), cloneRegion.getFirstRow());
assertEquals("New Clone Row To doesnt match", mergeRegion.getLastRow(), cloneRegion.getLastRow());
assertEquals("New Clone Col From doesnt match", mergeRegion.getFirstColumn(), cloneRegion.getFirstColumn());
- assertEquals("New Clone Col To doesnt match", mergeRegion.getLastColumn(), cloneRegion.getLastColumn());
-
- assertFalse(merge.getAreaAt(0) == clone.getAreaAt(0));
+ assertEquals("New Clone Col To doesnt match", mergeRegion.getLastColumn(), cloneRegion.getLastColumn());
+
+ assertNotSame(merge.getAreaAt(0), clone.getAreaAt(0));
}
private static final RecordVisitor dummyRecordVisitor = new RecordVisitor() {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java Sun Dec 15 14:53:46 2019
@@ -19,6 +19,7 @@ package org.apache.poi.hssf.record;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -82,7 +83,7 @@ public final class TestSSTRecord {
in.nextRecord();
SSTRecord result = new SSTRecord(in);
assertEquals(0, in.remaining());
- assertTrue(!in.hasNextRecord());
+ assertFalse(in.hasNextRecord());
return result;
}
@@ -1468,7 +1469,7 @@ public final class TestSSTRecord {
org.apache.poi.hssf.record.common.UnicodeString us1 = expected.getString(k);
org.apache.poi.hssf.record.common.UnicodeString us2 = actual.getString(k);
- assertTrue("String at idx=" + k, us1.equals(us2));
+ assertEquals("String at idx=" + k, us1, us2);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java Sun Dec 15 14:53:46 2019
@@ -19,6 +19,7 @@ package org.apache.poi.hssf.record.aggre
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 static org.junit.Assert.fail;
@@ -59,7 +60,7 @@ public final class TestRowRecordsAggrega
assertNotNull(rr1);
assertEquals("Row number is 1", 4, rr1.getRowNumber());
- assertTrue("Row record retrieved is identical ", rr1 == rr);
+ assertSame("Row record retrieved is identical ", rr1, rr);
}
/**
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java Sun Dec 15 14:53:46 2019
@@ -48,8 +48,8 @@ public final class TestAreaFormatRecord
assertEquals( 0x000000, record.getBackgroundColor());
assertEquals( 1, record.getPattern());
assertEquals( 1, record.getFormatFlags());
- assertEquals( true, record.isAutomatic() );
- assertEquals( false, record.isInvert() );
+ assertTrue(record.isAutomatic());
+ assertFalse(record.isInvert());
assertEquals( 0x4e, record.getForecolorIndex());
assertEquals( 0x4d, record.getBackcolorIndex());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java Sun Dec 15 14:53:46 2019
@@ -39,9 +39,9 @@ public final class TestAreaRecord extend
AreaRecord record = new AreaRecord(TestcaseRecordInputStream.create(0x101A, data));
assertEquals( 2, record.getFormatFlags());
- assertEquals( false, record.isStacked() );
- assertEquals( true, record.isDisplayAsPercentage() );
- assertEquals( false, record.isShadow() );
+ assertFalse(record.isStacked());
+ assertTrue(record.isDisplayAsPercentage());
+ assertFalse(record.isShadow());
assertEquals( 6, record.getRecordSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java Sun Dec 15 14:53:46 2019
@@ -49,14 +49,14 @@ public final class TestAxisOptionsRecord
assertEquals( 0, record.getBaseUnit());
assertEquals( 0, record.getCrossingPoint());
assertEquals( 239, record.getOptions());
- assertEquals( true, record.isDefaultMinimum() );
- assertEquals( true, record.isDefaultMaximum() );
- assertEquals( true, record.isDefaultMajor() );
- assertEquals( true, record.isDefaultMinorUnit() );
- assertEquals( false, record.isIsDate() );
- assertEquals( true, record.isDefaultBase() );
- assertEquals( true, record.isDefaultCross() );
- assertEquals( true, record.isDefaultDateSettings() );
+ assertTrue(record.isDefaultMinimum());
+ assertTrue(record.isDefaultMaximum());
+ assertTrue(record.isDefaultMajor());
+ assertTrue(record.isDefaultMinorUnit());
+ assertFalse(record.isIsDate());
+ assertTrue(record.isDefaultBase());
+ assertTrue(record.isDefaultCross());
+ assertTrue(record.isDefaultDateSettings());
assertEquals( 22, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java Sun Dec 15 14:53:46 2019
@@ -43,10 +43,10 @@ public final class TestBarRecord extends
assertEquals( 0, record.getBarSpace());
assertEquals( 0x96, record.getCategorySpace());
assertEquals( 0, record.getFormatFlags());
- assertEquals( false, record.isHorizontal() );
- assertEquals( false, record.isStacked() );
- assertEquals( false, record.isDisplayAsPercentage() );
- assertEquals( false, record.isShadow() );
+ assertFalse(record.isHorizontal());
+ assertFalse(record.isStacked());
+ assertFalse(record.isDisplayAsPercentage());
+ assertFalse(record.isShadow());
assertEquals( 10, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java Sun Dec 15 14:53:46 2019
@@ -45,9 +45,9 @@ public final class TestCategorySeriesAxi
assertEquals( 1, record.getLabelFrequency());
assertEquals( 1, record.getTickMarkFrequency());
assertEquals( 1, record.getOptions());
- assertEquals( true, record.isValueAxisCrossing() );
- assertEquals( false, record.isCrossesFarRight() );
- assertEquals( false, record.isReversed() );
+ assertTrue(record.isValueAxisCrossing());
+ assertFalse(record.isCrossesFarRight());
+ assertFalse(record.isReversed());
assertEquals( 4 + 8, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java Sun Dec 15 14:53:46 2019
@@ -39,10 +39,10 @@ public final class TestDatRecord extends
DatRecord record = new DatRecord(TestcaseRecordInputStream.create(0x1063, data));
assertEquals( 0xD, record.getOptions());
- assertEquals( true, record.isHorizontalBorder() );
- assertEquals( false, record.isVerticalBorder() );
- assertEquals( true, record.isBorder() );
- assertEquals( true, record.isShowSeriesKey() );
+ assertTrue(record.isHorizontalBorder());
+ assertFalse(record.isVerticalBorder());
+ assertTrue(record.isBorder());
+ assertTrue(record.isShowSeriesKey());
assertEquals( 6, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java Sun Dec 15 14:53:46 2019
@@ -45,7 +45,7 @@ public final class TestDataFormatRecord
assertEquals( 0, record.getSeriesIndex());
assertEquals( 0, record.getSeriesNumber());
assertEquals( 0, record.getFormatFlags());
- assertEquals( false, record.isUseExcel4Colors() );
+ assertFalse(record.isUseExcel4Colors());
assertEquals( 12, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java Sun Dec 15 14:53:46 2019
@@ -41,8 +41,8 @@ public final class TestFrameRecord exten
FrameRecord record = new FrameRecord(TestcaseRecordInputStream.create(0x1032, data));
assertEquals( FrameRecord.BORDER_TYPE_REGULAR, record.getBorderType());
assertEquals( 2, record.getOptions());
- assertEquals( false, record.isAutoSize() );
- assertEquals( true, record.isAutoPosition() );
+ assertFalse(record.isAutoSize());
+ assertTrue(record.isAutoPosition());
assertEquals( 8, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java Sun Dec 15 14:53:46 2019
@@ -50,12 +50,12 @@ public final class TestLegendRecord exte
assertEquals((byte) 0x1, record.getSpacing());
assertEquals((short) 0x1f, record.getOptions());
- assertEquals(true, record.isAutoPosition());
- assertEquals(true, record.isAutoSeries());
- assertEquals(true, record.isAutoXPositioning());
- assertEquals(true, record.isAutoYPositioning());
- assertEquals(true, record.isVertical());
- assertEquals(false, record.isDataTable());
+ assertTrue(record.isAutoPosition());
+ assertTrue(record.isAutoSeries());
+ assertTrue(record.isAutoXPositioning());
+ assertTrue(record.isAutoYPositioning());
+ assertTrue(record.isVertical());
+ assertFalse(record.isDataTable());
assertEquals(24, record.getRecordSize());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java Sun Dec 15 14:53:46 2019
@@ -45,8 +45,8 @@ public final class TestLineFormatRecord
assertEquals( 0, record.getLinePattern());
assertEquals( 0, record.getWeight());
assertEquals( 1, record.getFormat());
- assertEquals( true, record.isAuto() );
- assertEquals( false, record.isDrawTicks() );
+ assertTrue(record.isAuto());
+ assertFalse(record.isDrawTicks());
assertEquals( 0x4d, record.getColourPaletteIndex());
assertEquals( 16, record.getRecordSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java Sun Dec 15 14:53:46 2019
@@ -162,7 +162,7 @@ recordid = 0x1051, size =8
assertEquals( LinkedDataRecord.LINK_TYPE_VALUES, record.getLinkType());
assertEquals( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET, record.getReferenceType());
assertEquals( 0, record.getOptions());
- assertEquals( false, record.isCustomNumberFormat() );
+ assertFalse(record.isCustomNumberFormat());
assertEquals( 0, record.getIndexNumberFmtRecord());
Area3DPtg ptgExpected = new Area3DPtg(0, 7936, 0, 0,
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java Sun Dec 15 14:53:46 2019
@@ -38,12 +38,12 @@ public final class TestSeriesLabelsRecor
public void testLoad() {
SeriesLabelsRecord record = new SeriesLabelsRecord(TestcaseRecordInputStream.create(0x100c, data));
assertEquals( 3, record.getFormatFlags());
- assertEquals( true, record.isShowActual() );
- assertEquals( true, record.isShowPercent() );
- assertEquals( false, record.isLabelAsPercentage() );
- assertEquals( false, record.isSmoothedLine() );
- assertEquals( false, record.isShowLabel() );
- assertEquals( false, record.isShowBubbleSizes() );
+ assertTrue(record.isShowActual());
+ assertTrue(record.isShowPercent());
+ assertFalse(record.isLabelAsPercentage());
+ assertFalse(record.isSmoothedLine());
+ assertFalse(record.isShowLabel());
+ assertFalse(record.isShowBubbleSizes());
assertEquals( 2+4, record.getRecordSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java Sun Dec 15 14:53:46 2019
@@ -45,11 +45,11 @@ public final class TestSheetPropertiesRe
}
assertEquals(0, in.remaining());
assertEquals( 10, record.getFlags());
- assertEquals( false, record.isChartTypeManuallyFormatted() );
- assertEquals( true, record.isPlotVisibleOnly() );
- assertEquals( false, record.isDoNotSizeWithWindow() );
- assertEquals( true, record.isDefaultPlotDimensions() );
- assertEquals( false, record.isAutoPlotArea() );
+ assertFalse(record.isChartTypeManuallyFormatted());
+ assertTrue(record.isPlotVisibleOnly());
+ assertFalse(record.isDoNotSizeWithWindow());
+ assertTrue(record.isDefaultPlotDimensions());
+ assertFalse(record.isAutoPlotArea());
assertEquals( 0, record.getEmpty());
assertEquals( 8, record.getRecordSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java Sun Dec 15 14:53:46 2019
@@ -57,19 +57,19 @@ public final class TestTextRecord extend
assertEquals( 0, record.getWidth());
assertEquals( 0, record.getHeight());
assertEquals( 177, record.getOptions1());
- assertEquals( true, record.isAutoColor() );
- assertEquals( false, record.isShowKey() );
- assertEquals( false, record.isShowValue() );
- assertEquals( false, record.isVertical() );
- assertEquals( true, record.isAutoGeneratedText() );
- assertEquals( true, record.isGenerated() );
- assertEquals( false, record.isAutoLabelDeleted() );
- assertEquals( true, record.isAutoBackground() );
+ assertTrue(record.isAutoColor());
+ assertFalse(record.isShowKey());
+ assertFalse(record.isShowValue());
+ assertFalse(record.isVertical());
+ assertTrue(record.isAutoGeneratedText());
+ assertTrue(record.isGenerated());
+ assertFalse(record.isAutoLabelDeleted());
+ assertTrue(record.isAutoBackground());
assertEquals( TextRecord.ROTATION_NONE, record.getRotation() );
- assertEquals( false, record.isShowCategoryLabelAsPercentage() );
- assertEquals( false, record.isShowValueAsPercentage() );
- assertEquals( false, record.isShowBubbleSizes() );
- assertEquals( false, record.isShowLabel() );
+ assertFalse(record.isShowCategoryLabelAsPercentage());
+ assertFalse(record.isShowValueAsPercentage());
+ assertFalse(record.isShowBubbleSizes());
+ assertFalse(record.isShowLabel());
assertEquals( 77, record.getIndexOfColorValue());
assertEquals( 11088, record.getOptions2());
assertEquals( 0, record.getDataLabelPlacement() );
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java Sun Dec 15 14:53:46 2019
@@ -50,10 +50,10 @@ public final class TestTickRecord extend
assertEquals( (short)0, record.getZero1());
assertEquals( (short)0, record.getZero2());
assertEquals( (short)35, record.getOptions());
- assertEquals( true, record.isAutoTextColor() );
- assertEquals( true, record.isAutoTextBackground() );
+ assertTrue(record.isAutoTextColor());
+ assertTrue(record.isAutoTextBackground());
assertEquals( (short)0x0, record.getRotation() );
- assertEquals( true, record.isAutorotate() );
+ assertTrue(record.isAutorotate());
assertEquals( (short)77, record.getTickColor());
assertEquals( (short)0x0, record.getZero3());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java Sun Dec 15 14:53:46 2019
@@ -49,15 +49,15 @@ public final class TestValueRangeRecord
assertEquals( 0.0, record.getMinorIncrement(), 0.001);
assertEquals( 0.0, record.getCategoryAxisCross(), 0.001);
assertEquals( 0x011f, record.getOptions());
- assertEquals( true, record.isAutomaticMinimum() );
- assertEquals( true, record.isAutomaticMaximum() );
- assertEquals( true, record.isAutomaticMajor() );
- assertEquals( true, record.isAutomaticMinor() );
- assertEquals( true, record.isAutomaticCategoryCrossing() );
- assertEquals( false, record.isLogarithmicScale() );
- assertEquals( false, record.isValuesInReverse() );
- assertEquals( false, record.isCrossCategoryAxisAtMaximum() );
- assertEquals( true, record.isReserved() );
+ assertTrue(record.isAutomaticMinimum());
+ assertTrue(record.isAutomaticMaximum());
+ assertTrue(record.isAutomaticMajor());
+ assertTrue(record.isAutomaticMinor());
+ assertTrue(record.isAutomaticCategoryCrossing());
+ assertFalse(record.isLogarithmicScale());
+ assertFalse(record.isValuesInReverse());
+ assertFalse(record.isCrossCategoryAxisAtMaximum());
+ assertTrue(record.isReserved());
assertEquals( 42+4, record.getRecordSize() );
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java Sun Dec 15 14:53:46 2019
@@ -152,8 +152,8 @@ public final class TestCellStyle extends
assertEquals(cs1.hashCode(), cs1.hashCode());
assertEquals(cs2.hashCode(), cs2.hashCode());
- assertTrue(cs1.equals(cs1));
- assertTrue(cs2.equals(cs2));
+ assertEquals(cs1, cs1);
+ assertEquals(cs2, cs2);
// Change cs1, hash will alter
int hash1 = cs1.hashCode();
@@ -238,8 +238,8 @@ public final class TestCellStyle extends
assertEquals(18, orig.getDataFormat());
HSSFCellStyle clone = wb.createCellStyle();
- assertFalse(HorizontalAlignment.RIGHT == clone.getAlignment());
- assertFalse(fnt == clone.getFont(wb));
+ assertNotSame(HorizontalAlignment.RIGHT, clone.getAlignment());
+ assertNotSame(fnt, clone.getFont(wb));
assertFalse(18 == clone.getDataFormat());
clone.cloneStyleFrom(orig);
@@ -280,9 +280,9 @@ public final class TestCellStyle extends
HSSFCellStyle clone = wbClone.createCellStyle();
assertEquals(4, wbClone.getNumberOfFonts());
-
- assertFalse(HorizontalAlignment.RIGHT == clone.getAlignment());
- assertFalse("TestingFont" == clone.getFont(wbClone).getFontName());
+
+ assertNotSame(HorizontalAlignment.RIGHT, clone.getAlignment());
+ assertNotSame("TestingFont", clone.getFont(wbClone).getFontName());
clone.cloneStyleFrom(orig);
assertEquals(HorizontalAlignment.RIGHT, clone.getAlignment());
@@ -333,9 +333,9 @@ public final class TestCellStyle extends
assertNotNull(wb.getWorkbook().getStyleRecord(22));
// Now check the style names
- assertEquals(null, cs1.getUserStyleName());
- assertEquals(null, cs2.getUserStyleName());
- assertEquals(null, cs3.getUserStyleName());
+ assertNull(cs1.getUserStyleName());
+ assertNull(cs2.getUserStyleName());
+ assertNull(cs3.getUserStyleName());
assertEquals("style1", cs2.getParentStyle().getUserStyleName());
assertEquals("style2", cs3.getParentStyle().getUserStyleName());
@@ -394,7 +394,7 @@ public final class TestCellStyle extends
HSSFRow r = s.getRow(0);
HSSFCellStyle cs = r.getCell(0).getCellStyle();
- assertEquals(true, cs.getShrinkToFit());
+ assertTrue(cs.getShrinkToFit());
// New file
HSSFWorkbook wbOrig = new HSSFWorkbook();
@@ -413,8 +413,8 @@ public final class TestCellStyle extends
wb = HSSFTestDataSamples.writeOutAndReadBack(wbOrig);
s = wb.getSheetAt(0);
r = s.getRow(0);
- assertEquals(false, r.getCell(0).getCellStyle().getShrinkToFit());
- assertEquals(true, r.getCell(1).getCellStyle().getShrinkToFit());
+ assertFalse(r.getCell(0).getCellStyle().getShrinkToFit());
+ assertTrue(r.getCell(1).getCellStyle().getShrinkToFit());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,8 @@
package org.apache.poi.hssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -249,12 +251,12 @@ public final class TestDataValidation ex
assertEquals(3, address.getFirstColumn());
assertEquals(4, address.getLastColumn());
}
- assertEquals(true, dv.getEmptyCellAllowed());
- assertEquals(false, dv.getSuppressDropDownArrow());
- assertEquals(true, dv.getShowErrorBox());
+ assertTrue(dv.getEmptyCellAllowed());
+ assertFalse(dv.getSuppressDropDownArrow());
+ assertTrue(dv.getShowErrorBox());
assertEquals("error-title", dv.getErrorBoxTitle());
assertEquals("error-text", dv.getErrorBoxText());
- assertEquals(true, dv.getShowPromptBox());
+ assertTrue(dv.getShowPromptBox());
assertEquals("prompt-title", dv.getPromptBoxTitle());
assertEquals("prompt-text", dv.getPromptBoxText());
@@ -288,8 +290,8 @@ public final class TestDataValidation ex
assertEquals(OperatorType.BETWEEN, c.getOperator());
assertEquals("A2", c.getFormula1());
assertEquals("A3", c.getFormula2());
- assertEquals(null, c.getValue1());
- assertEquals(null, c.getValue2());
+ assertNull(c.getValue1());
+ assertNull(c.getValue2());
wb.close();
}
@@ -315,8 +317,8 @@ public final class TestDataValidation ex
DVConstraint c = dv.getConstraint();
assertEquals(ValidationType.INTEGER, c.getValidationType());
assertEquals(OperatorType.BETWEEN, c.getOperator());
- assertEquals(null, c.getFormula1());
- assertEquals(null, c.getFormula2());
+ assertNull(c.getFormula1());
+ assertNull(c.getFormula2());
assertEquals(new Double("100"), c.getValue1());
assertEquals(new Double("200"), c.getValue2());
@@ -345,8 +347,8 @@ public final class TestDataValidation ex
assertEquals(ValidationType.DECIMAL, c.getValidationType());
assertEquals(OperatorType.BETWEEN, c.getOperator());
assertEquals("A2", c.getFormula1());
- assertEquals(null, c.getFormula2());
- assertEquals(null, c.getValue1());
+ assertNull(c.getFormula2());
+ assertNull(c.getValue1());
assertEquals(new Double("200"), c.getValue2());
wb.close();
@@ -373,10 +375,10 @@ public final class TestDataValidation ex
DVConstraint c = dv.getConstraint();
assertEquals(ValidationType.DATE, c.getValidationType());
assertEquals(OperatorType.EQUAL, c.getOperator());
- assertEquals(null, c.getFormula1());
- assertEquals(null, c.getFormula2());
+ assertNull(c.getFormula1());
+ assertNull(c.getFormula2());
assertEquals(DateUtil.getExcelDate(DateUtil.parseYYYYMMDDDate("2014/10/25")), c.getValue1(), 0);
- assertEquals(null, c.getValue2());
+ assertNull(c.getValue2());
wb.close();
}
@@ -400,14 +402,14 @@ public final class TestDataValidation ex
assertEquals(1, list.size());
HSSFDataValidation dv = list.get(0);
- assertEquals(true, dv.getSuppressDropDownArrow());
+ assertTrue(dv.getSuppressDropDownArrow());
DVConstraint c = dv.getConstraint();
assertEquals(ValidationType.LIST, c.getValidationType());
- assertEquals(null, c.getFormula1());
- assertEquals(null, c.getFormula2());
- assertEquals(null, c.getValue1());
- assertEquals(null, c.getValue2());
+ assertNull(c.getFormula1());
+ assertNull(c.getFormula2());
+ assertNull(c.getValue1());
+ assertNull(c.getValue2());
String[] values = c.getExplicitListValues();
assertEquals(3, values.length);
assertEquals("aaa", values[0]);
@@ -435,14 +437,14 @@ public final class TestDataValidation ex
assertEquals(1, list.size());
HSSFDataValidation dv = list.get(0);
- assertEquals(true, dv.getSuppressDropDownArrow());
+ assertTrue(dv.getSuppressDropDownArrow());
DVConstraint c = dv.getConstraint();
assertEquals(ValidationType.LIST, c.getValidationType());
assertEquals("A2", c.getFormula1());
- assertEquals(null, c.getFormula2());
- assertEquals(null, c.getValue1());
- assertEquals(null, c.getValue2());
+ assertNull(c.getFormula2());
+ assertNull(c.getValue1());
+ assertNull(c.getValue2());
wb.close();
}
@@ -467,9 +469,9 @@ public final class TestDataValidation ex
DVConstraint c = dv.getConstraint();
assertEquals(ValidationType.FORMULA, c.getValidationType());
assertEquals("A2:A3", c.getFormula1());
- assertEquals(null, c.getFormula2());
- assertEquals(null, c.getValue1());
- assertEquals(null, c.getValue2());
+ assertNull(c.getFormula2());
+ assertNull(c.getValue1());
+ assertNull(c.getValue2());
wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java Sun Dec 15 14:53:46 2019
@@ -140,7 +140,7 @@ public final class TestEscherGraphics2d
public void testDraw() {
graphics.draw(new Line2D.Double(10,10,20,20));
HSSFSimpleShape s = (HSSFSimpleShape) escherGroup.getChildren().get(0);
- assertTrue(s.getShapeType() == HSSFSimpleShape.OBJECT_TYPE_LINE);
+ assertEquals(s.getShapeType(), HSSFSimpleShape.OBJECT_TYPE_LINE);
assertEquals(10, s.getAnchor().getDx1());
assertEquals(10, s.getAnchor().getDy1());
assertEquals(20, s.getAnchor().getDx2());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.hssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
@@ -265,7 +266,7 @@ public final class TestFormulaEvaluatorB
} catch (NumberFormatException e) {
fail("Identified bug 44508");
}
- assertEquals(true, cell.getBooleanCellValue());
+ assertTrue(cell.getBooleanCellValue());
wb.close();
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.hssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -66,7 +67,7 @@ public final class TestFormulas {
r = s.getRow(1);
c = r.getCell(1);
- assertTrue("Formula is as expected",("1+1".equals(c.getCellFormula())));
+ assertEquals("Formula is as expected", "1+1", c.getCellFormula());
wb2.close();
}
@@ -209,10 +210,9 @@ public final class TestFormulas {
for (int y = 1; y < 256 && y > 0; y=(short)(y+2)) {
HSSFCell c = r.getCell(y);
- assertTrue("got a formula",c.getCellFormula()!=null);
+ assertNotNull("got a formula", c.getCellFormula());
- assertTrue("loop Formula is as expected "+x+"."+y+operator+y+"."+x+"!="+c.getCellFormula(),(
- (""+x+"."+y+operator+y+"."+x).equals(c.getCellFormula()) ));
+ assertEquals("loop Formula is as expected " + x + "." + y + operator + y + "." + x + "!=" + c.getCellFormula(), ("" + x + "." + y + operator + y + "." + x), c.getCellFormula());
}
}
}
@@ -316,9 +316,7 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(1);
//get our minimum values
- assertTrue("minval Formula is as expected A2"+operator+"A3 != "+c.getCellFormula(),
- ( ("A2"+operator+"A3").equals(c.getCellFormula())
- ));
+ assertEquals("minval Formula is as expected A2" + operator + "A3 != " + c.getCellFormula(), ("A2" + operator + "A3"), c.getCellFormula());
for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
@@ -354,10 +352,7 @@ public final class TestFormulas {
String ref2=cr.formatAsString();
- assertTrue("loop Formula is as expected "+ref+operator+ref2+"!="+c.getCellFormula(),(
- (""+ref+operator+ref2).equals(c.getCellFormula())
- )
- );
+ assertEquals("loop Formula is as expected " + ref + operator + ref2 + "!=" + c.getCellFormula(), ("" + ref + operator + ref2), c.getCellFormula());
}
}
@@ -391,7 +386,7 @@ public final class TestFormulas {
//get our minimum values
r = s.getRow(0);
c = r.getCell(1);
- assertTrue("minval Formula is as expected", formula.equals(c.getCellFormula()));
+ assertEquals("minval Formula is as expected", formula, c.getCellFormula());
wb2.close();
}
@@ -446,9 +441,7 @@ public final class TestFormulas {
//get our minimum values
r = s.getRow(0);
c = r.getCell(1);
- assertTrue("minval Formula is as expected 1"+operator+"1 != "+c.getCellFormula(),
- ( ("1"+operator+"1").equals(c.getCellFormula())
- ));
+ assertEquals("minval Formula is as expected 1" + operator + "1 != " + c.getCellFormula(), ("1" + operator + "1"), c.getCellFormula());
for (int x = 1; x < Short.MAX_VALUE && x > 0; x=(short)(x*2)) {
r = s.getRow(x);
@@ -457,10 +450,7 @@ public final class TestFormulas {
c = r.getCell(y);
- assertTrue("loop Formula is as expected "+x+operator+y+"!="+c.getCellFormula(),(
- (""+x+operator+y).equals(c.getCellFormula())
- )
- );
+ assertEquals("loop Formula is as expected " + x + operator + y + "!=" + c.getCellFormula(), ("" + x + operator + y), c.getCellFormula());
}
}
@@ -468,10 +458,7 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("maxval Formula is as expected",(
- (""+Short.MAX_VALUE+operator+Short.MAX_VALUE).equals(c.getCellFormula())
- )
- );
+ assertEquals("maxval Formula is as expected", ("" + Short.MAX_VALUE + operator + Short.MAX_VALUE), c.getCellFormula());
}
/**
@@ -496,9 +483,7 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("function ="+function+"(A2:A3)",
- ( (function+"(A2:A3)").equals((function+"(A2:A3)")) )
- );
+ assertEquals("function =" + function + "(A2:A3)", (function + "(A2:A3)"), (function + "(A2:A3)"));
wb2.close();
}
@@ -524,9 +509,7 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("function ="+function+"(A2,A3)",
- ( (function+"(A2,A3)").equals(c.getCellFormula()) )
- );
+ assertEquals("function =" + function + "(A2,A3)", (function + "(A2,A3)"), c.getCellFormula());
wb2.close();
}
@@ -556,14 +539,10 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("function ="+function+"(A2:A4,B2:B4)",
- ( (function+"(A2:A4,B2:B4)").equals(c.getCellFormula()) )
- );
+ assertEquals("function =" + function + "(A2:A4,B2:B4)", (function + "(A2:A4,B2:B4)"), c.getCellFormula());
c=r.getCell(1);
- assertTrue("function ="+function+"($A$2:$A4,B$2:B4)",
- ( (function+"($A$2:$A4,B$2:B4)").equals(c.getCellFormula()) )
- );
+ assertEquals("function =" + function + "($A$2:$A4,B$2:B4)", (function + "($A$2:$A4,B$2:B4)"), c.getCellFormula());
wb2.close();
}
@@ -592,15 +571,15 @@ public final class TestFormulas {
s = wb2.getSheetAt(0);
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("A3+A2", ("A3+A2").equals(c.getCellFormula()));
+ assertEquals("A3+A2", ("A3+A2"), c.getCellFormula());
c = r.getCell(1);
- assertTrue("$A3+$A2", ("$A3+$A2").equals(c.getCellFormula()));
+ assertEquals("$A3+$A2", ("$A3+$A2"), c.getCellFormula());
c = r.getCell(2);
- assertTrue("A$3+A$2", ("A$3+A$2").equals(c.getCellFormula()));
+ assertEquals("A$3+A$2", ("A$3+A$2"), c.getCellFormula());
c = r.getCell(3);
- assertTrue("$A$3+$A$2", ("$A$3+$A$2").equals(c.getCellFormula()));
+ assertEquals("$A$3+$A$2", ("$A$3+$A$2"), c.getCellFormula());
c = r.getCell(4);
- assertTrue("SUM($A$3,$A$2)", ("SUM($A$3,$A$2)").equals(c.getCellFormula()));
+ assertEquals("SUM($A$3,$A$2)", ("SUM($A$3,$A$2)"), c.getCellFormula());
wb2.close();
}
@@ -626,9 +605,9 @@ public final class TestFormulas {
s = wb2.getSheet("B");
r = s.getRow(0);
c = r.getCell(0);
- assertTrue("expected: AVERAGE(A!A1:B1) got: "+c.getCellFormula(), ("AVERAGE(A!A1:B1)").equals(c.getCellFormula()));
+ assertEquals("expected: AVERAGE(A!A1:B1) got: " + c.getCellFormula(), ("AVERAGE(A!A1:B1)"), c.getCellFormula());
c = r.getCell(1);
- assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
+ assertEquals("expected: A!A1+A!B1 got: " + c.getCellFormula(), ("A!A1+A!B1"), c.getCellFormula());
wb2.close();
}
@@ -760,14 +739,14 @@ public final class TestFormulas {
r = s.getRow(0);
c = r.getCell(4);
- assertTrue("expected: IF(A1=D1,\"A1\",\"B1\") got "+c.getCellFormula(), ("IF(A1=D1,\"A1\",\"B1\")").equals(c.getCellFormula()));
+ assertEquals("expected: IF(A1=D1,\"A1\",\"B1\") got " + c.getCellFormula(), ("IF(A1=D1,\"A1\",\"B1\")"), c.getCellFormula());
wb2.close();
wb1 = openSample("IfFormulaTest.xls");
s = wb1.getSheetAt(0);
r = s.getRow(3);
c = r.getCell(0);
- assertTrue("expected: IF(A3=A1,\"A1\",\"A2\") got "+c.getCellFormula(), ("IF(A3=A1,\"A1\",\"A2\")").equals(c.getCellFormula()));
+ assertEquals("expected: IF(A3=A1,\"A1\",\"A2\") got " + c.getCellFormula(), ("IF(A3=A1,\"A1\",\"A2\")"), c.getCellFormula());
//c = r.getCell((short)1);
//assertTrue("expected: A!A1+A!B1 got: "+c.getCellFormula(), ("A!A1+A!B1").equals(c.getCellFormula()));
wb1.close();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java Sun Dec 15 14:53:46 2019
@@ -20,6 +20,7 @@ package org.apache.poi.hssf.usermodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
@@ -377,7 +378,7 @@ public final class TestHSSFCell extends
if (isPresent) {
assertEquals(StringRecord.class, recs[index++].getClass());
} else {
- assertFalse(StringRecord.class == recs[index].getClass());
+ assertNotSame(StringRecord.class, recs[index].getClass());
}
Record dbcr = recs[index];
assertEquals(DBCellRecord.class, dbcr.getClass());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java Sun Dec 15 14:53:46 2019
@@ -19,8 +19,10 @@ package org.apache.poi.hssf.usermodel;
import static org.apache.poi.poifs.storage.RawDataUtil.decompress;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -332,7 +334,7 @@ public final class TestHSSFComment exten
assertEquals(comment.getRow(), 4);
comment.setVisible(false);
- assertEquals(comment.isVisible(), false);
+ assertFalse(comment.isVisible());
HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
sh = wbBack.getSheetAt(0);
@@ -344,7 +346,7 @@ public final class TestHSSFComment exten
assertEquals("poi", comment.getAuthor());
assertEquals(comment.getColumn(), 3);
assertEquals(comment.getRow(), 4);
- assertEquals(comment.isVisible(), false);
+ assertFalse(comment.isVisible());
comment.setString(new HSSFRichTextString("comment12"));
comment.setAuthor("poi2");
@@ -361,7 +363,7 @@ public final class TestHSSFComment exten
assertEquals("poi2", comment.getAuthor());
assertEquals(comment.getColumn(), 32);
assertEquals(comment.getRow(), 42);
- assertEquals(comment.isVisible(), true);
+ assertTrue(comment.isVisible());
wb.close();
wbBack.close();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.hssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.text.DecimalFormat;
@@ -240,7 +241,7 @@ public final class TestHSSFDataFormatter
// should not be equal to "555.555"
assertTrue( DateUtil.isCellDateFormatted(cell) );
- assertTrue( ! "555.555".equals(fmtval));
+ assertFalse("555.555".equals(fmtval));
String fmt = cell.getCellStyle().getDataFormatString();
@@ -270,7 +271,7 @@ public final class TestHSSFDataFormatter
// should not be equal to "555.47431"
assertTrue( DateUtil.isCellDateFormatted(cell) );
- assertTrue( ! "555.47431".equals(fmtval));
+ assertFalse("555.47431".equals(fmtval));
// check we found the time properly
assertTrue("Format came out incorrect - " + fmt + " - found " + fmtval +
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java Sun Dec 15 14:53:46 2019
@@ -107,7 +107,7 @@ public final class TestHSSFPalette {
assertEquals(FillPatternType.NO_FILL, cellA.getCellStyle().getFillPattern());
assertEquals(FillPatternType.NO_FILL, cellA.getCellStyle().getFillPatternEnum());
assertEquals("0:0:0", p.getColor((short)64).getHexString());
- assertEquals(null, p.getColor((short)32767));
+ assertNull(p.getColor((short) 32767));
// Red
assertEquals("I'm red", cellB.getStringCellValue());
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.poifs.eventfilesystem;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.HashSet;
@@ -67,7 +68,7 @@ public final class TestPOIFSReaderRegist
Iterator<POIFSReaderListener> listeners =
registry.getListeners(path, name).iterator();
- assertTrue(!listeners.hasNext());
+ assertFalse(listeners.hasNext());
}
}
}
@@ -102,7 +103,7 @@ public final class TestPOIFSReaderRegist
if (k == n)
{
- assertTrue(!listeners.iterator().hasNext());
+ assertFalse(listeners.iterator().hasNext());
}
else
{
@@ -118,8 +119,8 @@ public final class TestPOIFSReaderRegist
{
if (j == k)
{
- assertTrue(!registeredListeners
- .contains(this.listeners[ j ]));
+ assertFalse(registeredListeners
+ .contains(this.listeners[j]));
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org