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 [1/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...
Author: centic
Date: Sun Dec 15 14:53:46 2019
New Revision: 1871591
URL: http://svn.apache.org/viewvc?rev=1871591&view=rev
Log:
Let IntelliJ simplify some assertions
Modified:
poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
poi/trunk/src/testcases/org/apache/poi/util/TestBitField.java
poi/trunk/src/testcases/org/apache/poi/util/TestIntList.java
poi/trunk/src/testcases/org/apache/poi/util/TestTempFile.java
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java Sun Dec 15 14:53:46 2019
@@ -232,7 +232,7 @@ public class CellNumberFormatter extends
integerSpecials.addAll(specials.subList(0, integerEnd()));
if (exponent == null) {
- StringBuffer fmtBuf = new StringBuffer("%");
+ StringBuilder fmtBuf = new StringBuilder("%");
int integerPartWidth = calculateIntegerPartWidth();
int totalWidth = integerPartWidth + fractionPartWidth;
@@ -789,12 +789,11 @@ public class CellNumberFormatter extends
digit++;
--pos;
}
- StringBuffer extraLeadingDigits = new StringBuffer();
if (pos >= 0) {
// We ran out of places to put digits before we ran out of digits; put this aside so we can add it later
// pos was decremented at the end of the loop above when the iterator was at its end
++pos;
- extraLeadingDigits = new StringBuffer(result.substring(0, pos));
+ StringBuffer extraLeadingDigits = new StringBuffer(result.substring(0, pos));
if (showGroupingSeparator) {
while (pos > 0) {
if (digit > 0 && digit % 3 == 0) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java Sun Dec 15 14:53:46 2019
@@ -85,9 +85,8 @@ public class TestPackagingURIHelper exte
// Relative part name
PackagePartName relativeName = PackagingURIHelper.createPartName(
"media/image1.gif", partBase);
- assertTrue("The part name must be equal to "
- + partNameToValid.getName(), partNameToValid
- .equals(relativeName));
+ assertEquals("The part name must be equal to "
+ + partNameToValid.getName(), partNameToValid, relativeName);
pkg.revert();
}
@@ -106,9 +105,8 @@ public class TestPackagingURIHelper exte
// Relative part name
PackagePartName relativeName = PackagingURIHelper.createPartName(
new URI("media/image1.gif"), partBase);
- assertTrue("The part name must be equal to "
- + partNameToValid.getName(), partNameToValid
- .equals(relativeName));
+ assertEquals("The part name must be equal to "
+ + partNameToValid.getName(), partNameToValid, relativeName);
pkg.revert();
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java Sun Dec 15 14:53:46 2019
@@ -31,11 +31,11 @@ public class CombinedIteratorTest {
Iterator<String> iter = iterable.iterator();
for (String element : expected) {
- Assert.assertEquals(true, iter.hasNext());
+ Assert.assertTrue(iter.hasNext());
Assert.assertEquals(element, iter.next());
}
- Assert.assertEquals(false, iter.hasNext());
+ Assert.assertFalse(iter.hasNext());
}
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java Sun Dec 15 14:53:46 2019
@@ -265,13 +265,13 @@ public class TestXSLFAutoShape {
assertFalse(rPr.isSetB());
r.setBold(true);
assertTrue(r.isBold());
- assertEquals(true, rPr.getB());
+ assertTrue(rPr.getB());
assertFalse(r.isItalic());
assertFalse(rPr.isSetI());
r.setItalic(true);
assertTrue(r.isItalic());
- assertEquals(true, rPr.getI());
+ assertTrue(rPr.getI());
assertFalse(r.isUnderlined());
assertFalse(rPr.isSetU());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java Sun Dec 15 14:53:46 2019
@@ -21,6 +21,8 @@ package org.apache.poi.xslf.usermodel;
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.assertSame;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -188,7 +190,7 @@ public class TestXSLFChart {
XDDFChartData firstSeries = data.get(0);
assertNotNull(firstSeries);
if (firstSeries instanceof XDDFScatterChartData) {
- assertEquals(null, firstSeries.getCategoryAxis());
+ assertNull(firstSeries.getCategoryAxis());
assertEquals(2, firstSeries.getValueAxes().size());
checkAxisOperations(firstSeries.getValueAxes().get(0));
checkAxisOperations(firstSeries.getValueAxes().get(1));
@@ -219,10 +221,10 @@ public class TestXSLFChart {
* According to interface, 0.0 should be returned for
* uninitialized double properties.
*/
- assertTrue(layout.getX() == 0.0);
- assertTrue(layout.getY() == 0.0);
- assertTrue(layout.getWidthRatio() == 0.0);
- assertTrue(layout.getHeightRatio() == 0.0);
+ assertEquals(0.0, layout.getX(), 0.0);
+ assertEquals(0.0, layout.getY(), 0.0);
+ assertEquals(0.0, layout.getWidthRatio(), 0.0);
+ assertEquals(0.0, layout.getHeightRatio(), 0.0);
final double newRatio = 1.1;
final double newCoordinate = 0.3;
@@ -230,31 +232,31 @@ public class TestXSLFChart {
final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
layout.setWidthRatio(newRatio);
- assertTrue(layout.getWidthRatio() == newRatio);
+ assertEquals(layout.getWidthRatio(), newRatio, 0.0);
layout.setHeightRatio(newRatio);
- assertTrue(layout.getHeightRatio() == newRatio);
+ assertEquals(layout.getHeightRatio(), newRatio, 0.0);
layout.setX(newCoordinate);
- assertTrue(layout.getX() == newCoordinate);
+ assertEquals(layout.getX(), newCoordinate, 0.0);
layout.setY(newCoordinate);
- assertTrue(layout.getY() == newCoordinate);
+ assertEquals(layout.getY(), newCoordinate, 0.0);
layout.setXMode(nonDefaultMode);
- assertTrue(layout.getXMode() == nonDefaultMode);
+ assertSame(layout.getXMode(), nonDefaultMode);
layout.setYMode(nonDefaultMode);
- assertTrue(layout.getYMode() == nonDefaultMode);
+ assertSame(layout.getYMode(), nonDefaultMode);
layout.setWidthMode(nonDefaultMode);
- assertTrue(layout.getWidthMode() == nonDefaultMode);
+ assertSame(layout.getWidthMode(), nonDefaultMode);
layout.setHeightMode(nonDefaultMode);
- assertTrue(layout.getHeightMode() == nonDefaultMode);
+ assertSame(layout.getHeightMode(), nonDefaultMode);
layout.setTarget(nonDefaultTarget);
- assertTrue(layout.getTarget() == nonDefaultTarget);
+ assertSame(layout.getTarget(), nonDefaultTarget);
}
private void checkAxisOperations(XDDFValueAxis axis) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java Sun Dec 15 14:53:46 2019
@@ -19,6 +19,7 @@ package org.apache.poi.xslf.usermodel;
import static org.junit.Assert.assertArrayEquals;
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;
@@ -177,8 +178,7 @@ public class TestXSLFPictureShape {
XSLFTextBox tb1 = group.createTextBox();
XSLFTextBox tb2 = group.createTextBox();
- assertFalse("We should have different names now, but had: " + tb1.getShapeName() + " for both",
- tb1.getShapeName().equals(tb2.getShapeName()));
+ assertNotEquals("We should have different names now, but had: " + tb1.getShapeName() + " for both", tb1.getShapeName(), tb2.getShapeName());
XMLSlideShow pptCopy = new XMLSlideShow();
@@ -216,8 +216,7 @@ public class TestXSLFPictureShape {
}
private void differentShapeName(XSLFShape shape1, XSLFShape shape2) {
- assertFalse("We should have different names now, but had: " + shape1.getShapeName() + " for both",
- shape1.getShapeName().equals(shape2.getShapeName()));
+ assertNotEquals("We should have different names now, but had: " + shape1.getShapeName() + " for both", shape1.getShapeName(), shape2.getShapeName());
}
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java Sun Dec 15 14:53:46 2019
@@ -283,7 +283,7 @@ public class TestXSLFTextParagraph {
p.setBulletFont("Calibri");
assertEquals("Calibri", p.getBulletFont());
- assertEquals(null, p.getBulletFontColor());
+ assertNull(p.getBulletFontColor());
p.setBulletFontColor(Color.red);
assertTrue(sameColor(Color.red, p.getBulletFontColor()));
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java Sun Dec 15 14:53:46 2019
@@ -75,14 +75,14 @@ public class TestXSSFImportFromXML {
XSSFSheet sheet = wb.getSheetAt(0);
XSSFRow row = sheet.getRow(0);
- assertTrue(row.getCell(0).getStringCellValue().equals(name));
- assertTrue(row.getCell(1).getStringCellValue().equals(teacher));
- assertTrue(row.getCell(2).getStringCellValue().equals(tutor));
- assertTrue(row.getCell(3).getStringCellValue().equals(cdl));
- assertTrue(row.getCell(4).getStringCellValue().equals(duration));
- assertTrue(row.getCell(5).getStringCellValue().equals(topic));
- assertTrue(row.getCell(6).getStringCellValue().equals(project));
- assertTrue(row.getCell(7).getStringCellValue().equals(credits));
+ assertEquals(row.getCell(0).getStringCellValue(), name);
+ assertEquals(row.getCell(1).getStringCellValue(), teacher);
+ assertEquals(row.getCell(2).getStringCellValue(), tutor);
+ assertEquals(row.getCell(3).getStringCellValue(), cdl);
+ assertEquals(row.getCell(4).getStringCellValue(), duration);
+ assertEquals(row.getCell(5).getStringCellValue(), topic);
+ assertEquals(row.getCell(6).getStringCellValue(), project);
+ assertEquals(row.getCell(7).getStringCellValue(), credits);
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java Sun Dec 15 14:53:46 2019
@@ -101,7 +101,7 @@ public abstract class BaseTestXSSFPivotT
pivotTable.addColumnLabel(DataConsolidateFunction.SUM, columnIndex);
CTPivotTableDefinition defintion = pivotTable.getCTPivotTableDefinition();
- assertEquals(defintion.getColFields(), null);
+ assertNull(defintion.getColFields());
}
/**
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -129,17 +130,17 @@ public class TestXSSFColGrouping {
assertEquals(0, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
assertEquals(2, cols.getColArray(0).getMax()); // 1 based
- assertEquals(true, cols.getColArray(0).getCustomWidth());
+ assertTrue(cols.getColArray(0).getCustomWidth());
assertEquals(1, cols.getColArray(1).getOutlineLevel());
assertEquals(3, cols.getColArray(1).getMin()); // 1 based
assertEquals(4, cols.getColArray(1).getMax()); // 1 based
- assertEquals(true, cols.getColArray(1).getCustomWidth());
+ assertTrue(cols.getColArray(1).getCustomWidth());
assertEquals(0, cols.getColArray(2).getOutlineLevel());
assertEquals(5, cols.getColArray(2).getMin()); // 1 based
assertEquals(5, cols.getColArray(2).getMax()); // 1 based
- assertEquals(true, cols.getColArray(2).getCustomWidth());
+ assertTrue(cols.getColArray(2).getCustomWidth());
assertEquals(3, cols.sizeOfColArray());
@@ -177,17 +178,17 @@ public class TestXSSFColGrouping {
assertEquals(1, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
assertEquals(2, cols.getColArray(0).getMax()); // 1 based
- assertEquals(false, cols.getColArray(0).getCustomWidth());
+ assertFalse(cols.getColArray(0).getCustomWidth());
assertEquals(1, cols.getColArray(1).getOutlineLevel());
assertEquals(3, cols.getColArray(1).getMin()); // 1 based
assertEquals(5, cols.getColArray(1).getMax()); // 1 based
- assertEquals(true, cols.getColArray(1).getCustomWidth());
+ assertTrue(cols.getColArray(1).getCustomWidth());
assertEquals(1, cols.getColArray(2).getOutlineLevel());
assertEquals(6, cols.getColArray(2).getMin()); // 1 based
assertEquals(6, cols.getColArray(2).getMax()); // 1 based
- assertEquals(false, cols.getColArray(2).getCustomWidth());
+ assertFalse(cols.getColArray(2).getCustomWidth());
assertEquals(3, cols.sizeOfColArray());
@@ -225,17 +226,17 @@ public class TestXSSFColGrouping {
assertEquals(0, cols.getColArray(0).getOutlineLevel());
assertEquals(3, cols.getColArray(0).getMin()); // 1 based
assertEquals(3, cols.getColArray(0).getMax()); // 1 based
- assertEquals(true, cols.getColArray(0).getCustomWidth());
+ assertTrue(cols.getColArray(0).getCustomWidth());
assertEquals(1, cols.getColArray(1).getOutlineLevel());
assertEquals(4, cols.getColArray(1).getMin()); // 1 based
assertEquals(5, cols.getColArray(1).getMax()); // 1 based
- assertEquals(true, cols.getColArray(1).getCustomWidth());
+ assertTrue(cols.getColArray(1).getCustomWidth());
assertEquals(1, cols.getColArray(2).getOutlineLevel());
assertEquals(6, cols.getColArray(2).getMin()); // 1 based
assertEquals(6, cols.getColArray(2).getMax()); // 1 based
- assertEquals(false, cols.getColArray(2).getCustomWidth());
+ assertFalse(cols.getColArray(2).getCustomWidth());
assertEquals(3, cols.sizeOfColArray());
@@ -274,17 +275,17 @@ public class TestXSSFColGrouping {
assertEquals(1, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
assertEquals(2, cols.getColArray(0).getMax()); // 1 based
- assertEquals(false, cols.getColArray(0).getCustomWidth());
+ assertFalse(cols.getColArray(0).getCustomWidth());
assertEquals(1, cols.getColArray(1).getOutlineLevel());
assertEquals(3, cols.getColArray(1).getMin()); // 1 based
assertEquals(4, cols.getColArray(1).getMax()); // 1 based
- assertEquals(true, cols.getColArray(1).getCustomWidth());
+ assertTrue(cols.getColArray(1).getCustomWidth());
assertEquals(0, cols.getColArray(2).getOutlineLevel());
assertEquals(5, cols.getColArray(2).getMin()); // 1 based
assertEquals(5, cols.getColArray(2).getMax()); // 1 based
- assertEquals(true, cols.getColArray(2).getCustomWidth());
+ assertTrue(cols.getColArray(2).getCustomWidth());
assertEquals(3, cols.sizeOfColArray());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java Sun Dec 15 14:53:46 2019
@@ -19,9 +19,11 @@ package org.apache.poi.xssf.usermodel;
import static org.apache.poi.xssf.usermodel.XSSFRelation.NS_SPREADSHEETML;
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.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.FileOutputStream;
@@ -77,11 +79,11 @@ public final class TestXSSFComment exten
CTShape vmlShape = CTShape.Factory.newInstance();
XSSFComment comment = new XSSFComment(sheetComments, ctComment, vmlShape);
- assertEquals(null, comment.getString());
+ assertNull(comment.getString());
assertEquals(0, comment.getRow());
assertEquals(0, comment.getColumn());
assertEquals("", comment.getAuthor());
- assertEquals(false, comment.isVisible());
+ assertFalse(comment.isVisible());
}
@Test
@@ -168,7 +170,7 @@ public final class TestXSSFComment exten
assertSame(comment.getString(), richText);
//check that the rich text is set in the comment
CTRPrElt rPr = richText.getCTRst().getRArray(0).getRPr();
- assertEquals(true, rPr.getIArray(0).getVal());
+ assertTrue(rPr.getIArray(0).getVal());
assertEquals(8.5, rPr.getSzArray(0).getVal(), 0);
assertEquals(IndexedColors.BLUE_GREY.getIndex(), rPr.getColorArray(0).getIndexed());
assertEquals("Tahoma", rPr.getRFontArray(0).getVal());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java Sun Dec 15 14:53:46 2019
@@ -17,6 +17,8 @@
package org.apache.poi.xssf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.math.BigDecimal;
@@ -323,7 +325,7 @@ public class TestXSSFDataValidation exte
sheet.addValidationData(validation);
final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
- assertEquals(true, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
+ assertTrue(dataValidations.get(0).getCtDdataValidation().getAllowBlank());
}
}
@@ -338,7 +340,7 @@ public class TestXSSFDataValidation exte
sheet.addValidationData(validation);
final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
- assertEquals(false, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
+ assertFalse(dataValidations.get(0).getCtDdataValidation().getAllowBlank());
}
}
@@ -353,7 +355,7 @@ public class TestXSSFDataValidation exte
sheet.addValidationData(validation);
final List<XSSFDataValidation> dataValidations = sheet.getDataValidations();
- assertEquals(true, dataValidations.get(0).getCtDdataValidation().getAllowBlank());
+ assertTrue(dataValidations.get(0).getCtDdataValidation().getAllowBlank());
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java Sun Dec 15 14:53:46 2019
@@ -210,7 +210,7 @@ public class TestXSSFDrawing {
XSSFShape sh1 = shapes1.get(i);
XSSFShape sh2 = shapes2.get(i);
- assertTrue(sh1.getClass() == sh2.getClass());
+ assertSame(sh1.getClass(), sh2.getClass());
assertEquals(sh1.getShapeProperties().toString(), sh2.getShapeProperties().toString());
}
@@ -246,8 +246,8 @@ public class TestXSSFDrawing {
assertEquals(1, pr.sizeOfRArray());
CTTextCharacterProperties rPr = pr.getRArray(0).getRPr();
- assertEquals(true, rPr.getB());
- assertEquals(true, rPr.getI());
+ assertTrue(rPr.getB());
+ assertTrue(rPr.getI());
assertEquals(STTextUnderlineType.SNG, rPr.getU());
assertArrayEquals(
new byte[]{0, (byte)128, (byte)128} ,
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java Sun Dec 15 14:53:46 2019
@@ -72,12 +72,12 @@ public final class TestXSSFFont extends
bool.setVal(false);
ctFont.setBArray(0,bool);
XSSFFont xssfFont=new XSSFFont(ctFont);
- assertEquals(false, xssfFont.getBold());
+ assertFalse(xssfFont.getBold());
xssfFont.setBold(true);
assertEquals(ctFont.sizeOfBArray(),1);
- assertEquals(true, ctFont.getBArray(0).getVal());
+ assertTrue(ctFont.getBArray(0).getVal());
}
@SuppressWarnings("deprecation")
@@ -105,7 +105,7 @@ public final class TestXSSFFont extends
assertEquals(FontCharset.ARABIC.getValue(), xssfFont.getCharSet());
// This one isn't allowed
- assertEquals(null, FontCharset.valueOf(9999));
+ assertNull(FontCharset.valueOf(9999));
try {
xssfFont.setCharSet(9999);
fail("Shouldn't be able to set an invalid charset");
@@ -153,12 +153,12 @@ public final class TestXSSFFont extends
ctFont.setIArray(0,bool);
XSSFFont xssfFont=new XSSFFont(ctFont);
- assertEquals(false, xssfFont.getItalic());
+ assertFalse(xssfFont.getItalic());
xssfFont.setItalic(true);
assertEquals(ctFont.sizeOfIArray(),1);
- assertEquals(true, ctFont.getIArray(0).getVal());
- assertEquals(true,ctFont.getIArray(0).getVal());
+ assertTrue(ctFont.getIArray(0).getVal());
+ assertTrue(ctFont.getIArray(0).getVal());
}
@Test
@@ -169,12 +169,12 @@ public final class TestXSSFFont extends
ctFont.setStrikeArray(0,bool);
XSSFFont xssfFont=new XSSFFont(ctFont);
- assertEquals(false, xssfFont.getStrikeout());
+ assertFalse(xssfFont.getStrikeout());
xssfFont.setStrikeout(true);
assertEquals(ctFont.sizeOfStrikeArray(),1);
- assertEquals(true, ctFont.getStrikeArray(0).getVal());
- assertEquals(true,ctFont.getStrikeArray(0).getVal());
+ assertTrue(ctFont.getStrikeArray(0).getVal());
+ assertTrue(ctFont.getStrikeArray(0).getVal());
}
@Test
@@ -399,11 +399,7 @@ public final class TestXSSFFont extends
assertEquals(2, wb.getNumberOfFonts());
assertEquals(nf, wb.getFontAt(1));
- assertTrue(
- wb.getFontAt(0)
- !=
- wb.getFontAt(1)
- );
+ assertNotSame(wb.getFontAt(0), wb.getFontAt(1));
// Find it now
assertNotNull(
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java Sun Dec 15 14:53:46 2019
@@ -75,7 +75,7 @@ public final class TestXSSFPicture exten
assertEquals(AnchorType.DONT_MOVE_AND_RESIZE, anchor.getAnchorType());
XSSFPicture shape = drawing.createPicture(anchor, jpegIdx);
- assertTrue(anchor.equals(shape.getAnchor()));
+ assertEquals(anchor, shape.getAnchor());
assertNotNull(shape.getPictureData());
assertArrayEquals(jpegData, shape.getPictureData().getData());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Sun Dec 15 14:53:46 2019
@@ -48,6 +48,7 @@ import org.apache.poi.openxml4j.opc.OPCP
import org.apache.poi.openxml4j.opc.PackageAccess;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackagePartName;
+import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
import org.apache.poi.openxml4j.opc.internal.FileHelper;
@@ -802,7 +803,7 @@ public final class TestXSSFWorkbook exte
}
try (XSSFWorkbook wb2 = (XSSFWorkbook) WorkbookFactory.create(file)) {
- assertTrue(wb2.getPivotTables().size() == 1);
+ assertEquals(1, wb2.getPivotTables().size());
}
assertTrue(file.delete());
@@ -822,7 +823,7 @@ public final class TestXSSFWorkbook exte
try (XSSFWorkbook wb2 = (XSSFWorkbook) WorkbookFactory.create(file)) {
setPivotData(wb2);
- assertTrue(wb2.getPivotTables().size() == 2);
+ assertEquals(2, wb2.getPivotTables().size());
}
assertTrue(file.delete());
@@ -890,7 +891,9 @@ public final class TestXSSFWorkbook exte
assertTrue(wbPart.hasRelationships());
final PackageRelationshipCollection relationships = wbPart.getRelationships().getRelationships(XSSFRelation.VBA_MACROS.getRelation());
assertEquals(1, relationships.size());
- assertEquals(XSSFRelation.VBA_MACROS.getDefaultFileName(), relationships.getRelationship(0).getTargetURI().toString());
+ PackageRelationship relationship = relationships.getRelationship(0);
+ assertNotNull(relationship);
+ assertEquals(XSSFRelation.VBA_MACROS.getDefaultFileName(), relationship.getTargetURI().toString());
PackagePart vbaPart = pkg.getPart(PackagingURIHelper.createPartName(XSSFRelation.VBA_MACROS.getDefaultFileName()));
assertNotNull(vbaPart);
assertFalse(vbaPart.isRelationshipPart());
@@ -984,6 +987,7 @@ public final class TestXSSFWorkbook exte
wb.close();
}
+ @SuppressWarnings("deprecation")
@Test
public void testBug56957CloseWorkbook() throws Exception {
File file = TempFile.createTempFile("TestBug56957_", ".xlsx");
@@ -1027,7 +1031,7 @@ public final class TestXSSFWorkbook exte
}
@Test
- public void closeDoesNotModifyWorkbook() throws IOException, InvalidFormatException {
+ public void closeDoesNotModifyWorkbook() throws IOException {
final String filename = "SampleSS.xlsx";
final File file = POIDataSamples.getSpreadSheetInstance().getFile(filename);
Workbook wb;
@@ -1146,7 +1150,6 @@ public final class TestXSSFWorkbook exte
/**
* See bug #61700
- * @throws Exception
*/
@Test
public void testWorkbookForceFormulaRecalculation() throws Exception {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java Sun Dec 15 14:53:46 2019
@@ -19,6 +19,7 @@ package org.apache.poi.xssf.usermodel.ch
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.assertNull;
@@ -139,7 +140,7 @@ public class TestXSSFChartTitle {
XSSFRichTextString originalTitle = chart.getTitleText();
assertNotNull(originalTitle);
final String myTitle = "My chart title";
- assertFalse(myTitle.equals(originalTitle.toString()));
+ assertNotEquals(myTitle, originalTitle.toString());
chart.setTitleText(myTitle);
XSSFRichTextString queryTitle = chart.getTitleText();
assertNotNull(queryTitle);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFManualLayout.java Sun Dec 15 14:53:46 2019
@@ -17,7 +17,9 @@
package org.apache.poi.xssf.usermodel.charts;
+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.io.IOException;
@@ -68,31 +70,31 @@ public final class TestXSSFManualLayout
final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
layout.setWidthRatio(newRatio);
- assertTrue(layout.getWidthRatio() == newRatio);
+ assertEquals(layout.getWidthRatio(), newRatio, 0.0);
layout.setHeightRatio(newRatio);
- assertTrue(layout.getHeightRatio() == newRatio);
+ assertEquals(layout.getHeightRatio(), newRatio, 0.0);
layout.setX(newCoordinate);
- assertTrue(layout.getX() == newCoordinate);
+ assertEquals(layout.getX(), newCoordinate, 0.0);
layout.setY(newCoordinate);
- assertTrue(layout.getY() == newCoordinate);
+ assertEquals(layout.getY(), newCoordinate, 0.0);
layout.setXMode(nonDefaultMode);
- assertTrue(layout.getXMode() == nonDefaultMode);
+ assertSame(layout.getXMode(), nonDefaultMode);
layout.setYMode(nonDefaultMode);
- assertTrue(layout.getYMode() == nonDefaultMode);
+ assertSame(layout.getYMode(), nonDefaultMode);
layout.setWidthMode(nonDefaultMode);
- assertTrue(layout.getWidthMode() == nonDefaultMode);
+ assertSame(layout.getWidthMode(), nonDefaultMode);
layout.setHeightMode(nonDefaultMode);
- assertTrue(layout.getHeightMode() == nonDefaultMode);
+ assertSame(layout.getHeightMode(), nonDefaultMode);
layout.setTarget(nonDefaultTarget);
- assertTrue(layout.getTarget() == nonDefaultTarget);
+ assertSame(layout.getTarget(), nonDefaultTarget);
}
@@ -111,9 +113,9 @@ public final class TestXSSFManualLayout
* According to interface, 0.0 should be returned for
* uninitialized double properties.
*/
- assertTrue(layout.getX() == 0.0);
- assertTrue(layout.getY() == 0.0);
- assertTrue(layout.getWidthRatio() == 0.0);
- assertTrue(layout.getHeightRatio() == 0.0);
+ assertEquals(0.0, layout.getX(), 0.0);
+ assertEquals(0.0, layout.getY(), 0.0);
+ assertEquals(0.0, layout.getWidthRatio(), 0.0);
+ assertEquals(0.0, layout.getHeightRatio(), 0.0);
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java Sun Dec 15 14:53:46 2019
@@ -94,7 +94,7 @@ public class TestXWPFEndnote {
XWPFRun r2 = testP2.getRuns().get(0);
assertNotNull("Expected a run in testP2", r2);
- assertTrue("Found an endnote reference in testP2", r2.getCTR().getEndnoteRefList().size() == 0);
+ assertEquals("Found an endnote reference in testP2", 0, r2.getCTR().getEndnoteRefList().size());
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java Sun Dec 15 14:53:46 2019
@@ -94,7 +94,7 @@ public class TestXWPFFootnote {
XWPFRun r2 = testP2.getRuns().get(0);
assertNotNull("Expected a run in testP2", r2);
- assertTrue("Found a footnote reference in testP2", r2.getCTR().getFootnoteRefList().size() == 0);
+ assertEquals("Found a footnote reference in testP2", 0, r2.getCTR().getFootnoteRefList().size());
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java Sun Dec 15 14:53:46 2019
@@ -236,8 +236,8 @@ public final class TestHMEFMessage {
if (attr.getProperty().id == 0xe28) hasE28 = true;
if (attr.getProperty().id == 0xe29) hasE29 = true;
}
- assertEquals(true, hasE28);
- assertEquals(true, hasE29);
+ assertTrue(hasE28);
+ assertTrue(hasE29);
// Ensure we can fetch those as custom ones
MAPIProperty propE28 = MAPIProperty.createCustom(0xe28, Types.ASCII_STRING, "Custom E28");
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java Sun Dec 15 14:53:46 2019
@@ -17,6 +17,7 @@
package org.apache.poi.hpbf;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -52,7 +53,7 @@ public final class TestHPBFDocument {
assertTrue(doc.getMainContents().getData().length > 0);
assertTrue(doc.getQuillContents().getData().length > 0);
assertTrue(doc.getEscherStm().getData().length > 0);
- assertTrue(doc.getEscherDelayStm().getData().length == 0);
+ assertEquals(0, doc.getEscherDelayStm().getData().length);
doc.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java Sun Dec 15 14:53:46 2019
@@ -83,9 +83,9 @@ public final class TestHeadersFooters
//the first slide uses per-slide headers / footers
HeadersFooters hd2 = slide.get(1).getHeadersFooters();
- assertEquals(true, hd2.isFooterVisible());
+ assertTrue(hd2.isFooterVisible());
assertEquals("per-slide footer", hd2.getFooterText());
- assertEquals(true, hd2.isUserDateVisible());
+ assertTrue(hd2.isUserDateVisible());
assertEquals("custom date format", hd2.getDateTimeText());
ppt.close();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java Sun Dec 15 14:53:46 2019
@@ -60,10 +60,10 @@ public final class TestDocumentAtom exte
}
public void testBooleans() {
DocumentAtom da = new DocumentAtom(data_a, 0, data_a.length);
- assertEquals(false, da.getSaveWithFonts());
- assertEquals(false, da.getOmitTitlePlace());
- assertEquals(false, da.getRightToLeft());
- assertEquals(true, da.getShowComments());
+ assertFalse(da.getSaveWithFonts());
+ assertFalse(da.getOmitTitlePlace());
+ assertFalse(da.getRightToLeft());
+ assertTrue(da.getShowComments());
}
public void testWrite() throws Exception {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java Sun Dec 15 14:53:46 2019
@@ -38,9 +38,9 @@ public final class TestNotesAtom extends
public void testFlags() {
NotesAtom na = new NotesAtom(data_a, 0, data_a.length);
assertEquals(0x80000000, na.getSlideID());
- assertEquals(false, na.getFollowMasterObjects());
- assertEquals(false, na.getFollowMasterScheme());
- assertEquals(false, na.getFollowMasterBackground());
+ assertFalse(na.getFollowMasterObjects());
+ assertFalse(na.getFollowMasterScheme());
+ assertFalse(na.getFollowMasterBackground());
}
public void testWrite() throws Exception {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java Sun Dec 15 14:53:46 2019
@@ -57,9 +57,9 @@ public final class TestSlideAtom {
assertEquals(256, sa.getNotesID());
// Check the flags
- assertEquals(true, sa.getFollowMasterObjects());
- assertEquals(true, sa.getFollowMasterScheme());
- assertEquals(true, sa.getFollowMasterBackground());
+ assertTrue(sa.getFollowMasterObjects());
+ assertTrue(sa.getFollowMasterScheme());
+ assertTrue(sa.getFollowMasterBackground());
}
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java Sun Dec 15 14:53:46 2019
@@ -39,7 +39,7 @@ public final class TestSlidePersistAtom
public void testFlags() {
SlidePersistAtom spa = new SlidePersistAtom(data_a, 0, data_a.length);
assertEquals(4, spa.getRefID() );
- assertEquals(true, spa.getHasShapesOtherThanPlaceholders() );
+ assertTrue(spa.getHasShapesOtherThanPlaceholders());
assertEquals(2, spa.getNumPlaceholderTexts() );
assertEquals(256, spa.getSlideIdentifier());
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java Sun Dec 15 14:53:46 2019
@@ -226,7 +226,7 @@ public final class TestStyleTextPropAtom
assertEquals(2,b_ch_1.getTextPropList().size());
TextProp tp_1_1 = b_ch_1.getTextPropList().get(0);
TextProp tp_1_2 = b_ch_1.getTextPropList().get(1);
- assertEquals(true, tp_1_1 instanceof CharFlagsTextProp);
+ assertTrue(tp_1_1 instanceof CharFlagsTextProp);
assertEquals("font.size", tp_1_2.getName());
assertEquals(20, tp_1_2.getValue());
@@ -235,7 +235,7 @@ public final class TestStyleTextPropAtom
TextProp tp_2_1 = b_ch_2.getTextPropList().get(0);
TextProp tp_2_2 = b_ch_2.getTextPropList().get(1);
TextProp tp_2_3 = b_ch_2.getTextPropList().get(2);
- assertEquals(true, tp_2_1 instanceof CharFlagsTextProp);
+ assertTrue(tp_2_1 instanceof CharFlagsTextProp);
assertEquals("font.size", tp_2_2.getName());
assertEquals("font.color", tp_2_3.getName());
assertEquals(20, tp_2_2.getValue());
@@ -253,7 +253,7 @@ public final class TestStyleTextPropAtom
TextProp tp_4_1 = b_ch_4.getTextPropList().get(0);
TextProp tp_4_2 = b_ch_4.getTextPropList().get(1);
TextProp tp_4_3 = b_ch_4.getTextPropList().get(2);
- assertEquals(true, tp_4_1 instanceof CharFlagsTextProp);
+ assertTrue(tp_4_1 instanceof CharFlagsTextProp);
assertEquals("font.index", tp_4_2.getName());
assertEquals("font.size", tp_4_3.getName());
assertEquals(24, tp_4_3.getValue());
@@ -317,42 +317,42 @@ public final class TestStyleTextPropAtom
// 1st is bold
CharFlagsTextProp cf_1_1 = (CharFlagsTextProp)b_ch_1.getTextPropList().get(0);
- assertEquals(true,cf_1_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
- assertEquals(false,cf_1_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
+ assertTrue(cf_1_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
+ assertFalse(cf_1_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
// 2nd is italic
CharFlagsTextProp cf_2_1 = (CharFlagsTextProp)b_ch_2.getTextPropList().get(0);
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
- assertEquals(true,cf_2_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
- assertEquals(false,cf_2_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
+ assertTrue(cf_2_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
+ assertFalse(cf_2_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
// 3rd is normal, so lacks a CharFlagsTextProp
assertFalse(b_ch_3.getTextPropList().get(0) instanceof CharFlagsTextProp);
// 4th is underlined
CharFlagsTextProp cf_4_1 = (CharFlagsTextProp)b_ch_4.getTextPropList().get(0);
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
- assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
+ assertTrue(cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
// The value for this should be 4
assertEquals(0x0004, cf_4_1.getValue());
@@ -362,15 +362,15 @@ public final class TestStyleTextPropAtom
cf_4_1.setSubValue(true, CharFlagsTextProp.ITALIC_IDX);
cf_4_1.setSubValue(false, CharFlagsTextProp.UNDERLINE_IDX);
- assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
- assertEquals(true,cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
- assertEquals(false,cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
+ assertTrue(cf_4_1.getSubValue(CharFlagsTextProp.BOLD_IDX));
+ assertTrue(cf_4_1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_1_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.ENABLE_NUMBERING_2_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.RELIEF_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.RESET_NUMBERING_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.SHADOW_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.STRIKETHROUGH_IDX));
+ assertFalse(cf_4_1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
// The value should now be 3
assertEquals(0x0003, cf_4_1.getValue());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java Sun Dec 15 14:53:46 2019
@@ -58,12 +58,12 @@ public final class TestNumberedList {
final TextPFException9[] autoNumbers = numberedListInfo.getAutoNumberTypes();
assertNotNull(autoNumbers);
assertEquals(4, autoNumbers.length);
- assertTrue(4 == autoNumbers[0].getAutoNumberStartNumber());
+ assertEquals(4, (short) autoNumbers[0].getAutoNumberStartNumber());
assertNull(autoNumbers[1].getAutoNumberStartNumber());
- assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbers[0].getAutoNumberScheme());
+ assertEquals(3, (short) autoNumbers[2].getAutoNumberStartNumber());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbers[0].getAutoNumberScheme());
assertNull(autoNumbers[1].getAutoNumberScheme());
- assertTrue(AutoNumberingScheme.alphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.alphaLcParenRight, autoNumbers[2].getAutoNumberScheme());
List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
assertEquals(2, textParass.size());
@@ -100,12 +100,12 @@ public final class TestNumberedList {
final TextPFException9[] autoNumbers = numberedListInfo.getAutoNumberTypes();
assertNotNull(autoNumbers);
assertEquals(4, autoNumbers.length);
- assertTrue(9 == autoNumbers[0].getAutoNumberStartNumber());
+ assertEquals(9, (short) autoNumbers[0].getAutoNumberStartNumber());
assertNull(autoNumbers[1].getAutoNumberStartNumber());
- assertTrue(3 == autoNumbers[2].getAutoNumberStartNumber());
- assertTrue(AutoNumberingScheme.arabicParenRight == autoNumbers[0].getAutoNumberScheme());
+ assertEquals(3, (short) autoNumbers[2].getAutoNumberStartNumber());
+ assertSame(AutoNumberingScheme.arabicParenRight, autoNumbers[0].getAutoNumberScheme());
assertNull(autoNumbers[1].getAutoNumberScheme());
- assertTrue(AutoNumberingScheme.alphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.alphaUcPeriod, autoNumbers[2].getAutoNumberScheme());
final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
assertEquals(2, textParass.size());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java Sun Dec 15 14:53:46 2019
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.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;
import java.io.IOException;
@@ -69,11 +70,11 @@ public final class TestNumberedList2 {
final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox0.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme());
final TextPFException9[] autoNumbersOfTextBox1 = numberedListInfoForTextBox1.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox1[0].getfBulletHasAutoNumber());
assertEquals(Short.valueOf((short)6), autoNumbersOfTextBox1[0].getAutoNumberStartNumber());//Default value = 1 will be used
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox1[0].getAutoNumberScheme());
List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
@@ -105,7 +106,7 @@ public final class TestNumberedList2 {
final TextPFException9[] autoNumbersOfTextBox = numberedListInfoForTextBox.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getfBulletHasAutoNumber());
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox[0].getAutoNumberScheme());
List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
assertEquals(3, textParass.size());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java Sun Dec 15 14:53:46 2019
@@ -22,6 +22,7 @@ package org.apache.poi.hslf.usermodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -68,7 +69,7 @@ public final class TestNumberedList3 {
final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme());
final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
assertEquals(3, textParass.size());
@@ -85,7 +86,7 @@ public final class TestNumberedList3 {
assertEquals(1, autoNumbers.length);
assertEquals(Short.valueOf((short)1), autoNumbers[0].getfBulletHasAutoNumber());
assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used
- assertTrue(AutoNumberingScheme.arabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
+ assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme());
int chCovered = 0;
for (HSLFTextParagraph htp : textParass.get(1)) {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java Sun Dec 15 14:53:46 2019
@@ -33,14 +33,14 @@ public final class TestMAPIProperty exte
public void testGetAll() throws Exception {
Collection<MAPIProperty> all = MAPIProperty.getAll();
- assertEquals(true, all.contains(MAPIProperty.DISPLAY_NAME));
- assertEquals(true, all.contains(MAPIProperty.DISPLAY_CC));
+ assertTrue(all.contains(MAPIProperty.DISPLAY_NAME));
+ assertTrue(all.contains(MAPIProperty.DISPLAY_CC));
// Won't contain custom
- assertEquals(false, all.contains(MAPIProperty.createCustom(1, Types.UNSPECIFIED, "")));
+ assertFalse(all.contains(MAPIProperty.createCustom(1, Types.UNSPECIFIED, "")));
// Won't contain unknown
- assertEquals(false, all.contains(MAPIProperty.UNKNOWN));
+ assertFalse(all.contains(MAPIProperty.UNKNOWN));
}
public void testCustom() throws Exception {
@@ -55,8 +55,8 @@ public final class TestMAPIProperty exte
// Won't be in all list
Collection<MAPIProperty> all = MAPIProperty.getAll();
- assertEquals(false, all.contains(c1));
- assertEquals(false, all.contains(c2a));
- assertEquals(false, all.contains(c2b));
+ assertFalse(all.contains(c1));
+ assertFalse(all.contains(c2a));
+ assertFalse(all.contains(c2b));
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java Sun Dec 15 14:53:46 2019
@@ -40,17 +40,17 @@ public class PlfLfoTest {
assertEquals(0, p.getLfoMac());
assertEquals(0, p2.getLfoMac());
- assertTrue(p.equals(p2));
+ assertEquals(p, p2);
//noinspection ObjectEqualsNull
- assertFalse(p.equals(null));
+ assertNotEquals(null, p);
p.add(new LFO(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0), new LFOData());
assertEquals(1, p.getLfoMac());
- assertFalse(p.equals(p2));
+ assertNotEquals(p, p2);
p2.add(new LFO(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 0), new LFOData());
assertEquals(1, p2.getLfoMac());
- assertTrue(p.equals(p2));
+ assertEquals(p, p2);
}
}
\ No newline at end of file
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java Sun Dec 15 14:53:46 2019
@@ -69,7 +69,7 @@ public final class TestCHPBinTable
{
CHPX oldNode = oldTextRuns.get(x);
CHPX newNode = newTextRuns.get(x);
- assertTrue(oldNode.equals(newNode));
+ assertEquals(oldNode, newNode);
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java Sun Dec 15 14:53:46 2019
@@ -17,6 +17,7 @@
package org.apache.poi.hwpf.model;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
@@ -53,7 +54,7 @@ public final class TestFontTable {
FontTable newFontTable = new FontTable(newTableStream, 0, newTableStream.length);
- assertTrue(_fontTable.equals(newFontTable));
+ assertEquals(_fontTable, newFontTable);
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java Sun Dec 15 14:53:46 2019
@@ -74,7 +74,7 @@ public final class TestPAPBinTable {
PAPX oldNode = oldTextRuns.get( x );
PAPX newNode = newTextRuns.get( x );
- assertTrue( oldNode.equals( newNode ) );
+ assertEquals(oldNode, newNode);
}
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java Sun Dec 15 14:53:46 2019
@@ -18,6 +18,7 @@
package org.apache.poi.hwpf.usermodel;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -178,47 +179,47 @@ public final class TestPictures {
p = r.getParagraph(0);
assertEquals(2, p.numCharacterRuns());
assertEquals("I have lots of embedded files in me\r", p.text());
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
p = r.getParagraph(1);
assertEquals(5, p.numCharacterRuns());
assertEquals("\u0013 EMBED Excel.Sheet.8 \u0014\u0001\u0015\r", p.text());
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
- assertEquals(true, pictureTable.hasPicture(p.getCharacterRun(3)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(2)));
+ assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
p = r.getParagraph(2);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED Excel.Sheet.8 \u0014\u0001\u0015\r", p.text());
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
- assertEquals(true, pictureTable.hasPicture(p.getCharacterRun(3)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(2)));
+ assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(5)));
p = r.getParagraph(3);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED PowerPoint.Show.8 \u0014\u0001\u0015\r", p.text());
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
- assertEquals(true, pictureTable.hasPicture(p.getCharacterRun(3)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(2)));
+ assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(5)));
p = r.getParagraph(4);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED Word.Document.8 \\s \u0014\u0001\u0015\r", p.text());
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(0)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(1)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(2)));
- assertEquals(true, pictureTable.hasPicture(p.getCharacterRun(3)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(4)));
- assertEquals(false, pictureTable.hasPicture(p.getCharacterRun(5)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(2)));
+ assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
+ assertFalse(pictureTable.hasPicture(p.getCharacterRun(5)));
// Look at the pictures table
List<Picture> pictures = pictureTable.getAllPictures();
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java Sun Dec 15 14:53:46 2019
@@ -19,26 +19,29 @@ package org.apache.poi.hpsf.basic;
import java.util.Locale;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.poi.hpsf.ClassID;
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.SummaryInformation;
+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.assertTrue;
/**
* <p>Tests ClassID structure.</p>
*
* @author Michael Zalewski (zalewski@optonline.net)
*/
-public final class TestClassID extends TestCase {
+public final class TestClassID {
/**
* Various tests of overridden .equals()
*/
- public void testEquals()
- {
+ @Test
+ public void testEquals() {
ClassID clsidTest1 = new ClassID(
new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
@@ -54,17 +57,18 @@ public final class TestClassID extends T
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11 }
, 0
);
- Assert.assertEquals(clsidTest1, clsidTest1);
- Assert.assertEquals(clsidTest1, clsidTest2);
- Assert.assertFalse(clsidTest1.equals(clsidTest3));
- Assert.assertFalse(clsidTest1.equals(null));
+ assertEquals(clsidTest1, clsidTest1);
+ assertEquals(clsidTest1, clsidTest2);
+ assertNotEquals(clsidTest1, clsidTest3);
+ assertNotEquals(null, clsidTest1);
}
+
/**
* Try to write to a buffer that is too small. This should
* throw an Exception
*/
- public void testWriteArrayStoreException()
- {
+ @Test
+ public void testWriteArrayStoreException() {
ClassID clsidTest = new ClassID(
new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
@@ -79,7 +83,7 @@ public final class TestClassID extends T
{
bExceptionOccurred = true;
}
- Assert.assertTrue(bExceptionOccurred);
+ assertTrue(bExceptionOccurred);
bExceptionOccurred = false;
try
@@ -90,7 +94,7 @@ public final class TestClassID extends T
{
bExceptionOccurred = true;
}
- Assert.assertTrue(bExceptionOccurred);
+ assertTrue(bExceptionOccurred);
// These should work without throwing an Exception
bExceptionOccurred = false;
@@ -103,21 +107,22 @@ public final class TestClassID extends T
{
bExceptionOccurred = true;
}
- Assert.assertFalse(bExceptionOccurred);
+ assertFalse(bExceptionOccurred);
}
+
/**
* <p>Tests the {@link PropertySet} methods. The test file has two
* property set: the first one is a {@link SummaryInformation},
* the second one is a {@link DocumentSummaryInformation}.</p>
*/
- public void testClassID()
- {
+ @Test
+ public void testClassID() {
ClassID clsidTest = new ClassID(
new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10}
, 0
);
- Assert.assertEquals(clsidTest.toString().toUpperCase(Locale.ROOT),
+ assertEquals(clsidTest.toString().toUpperCase(Locale.ROOT),
"{04030201-0605-0807-090A-0B0C0D0E0F10}"
);
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java Sun Dec 15 14:53:46 2019
@@ -55,7 +55,7 @@ public final class TestAbortableListener
HSSFEventFactory f = new HSSFEventFactory();
assertEquals(0, l.countSeen);
- assertEquals(null, l.lastRecordSeen);
+ assertNull(l.lastRecordSeen);
POIFSFileSystem fs = openSample();
short res = f.abortableProcessWorkbookEvents(req, fs);
@@ -75,7 +75,7 @@ public final class TestAbortableListener
HSSFEventFactory f = new HSSFEventFactory();
assertEquals(0, l.countSeen);
- assertEquals(null, l.lastRecordSeen);
+ assertNull(l.lastRecordSeen);
POIFSFileSystem fs = openSample();
short res = f.abortableProcessWorkbookEvents(req, fs);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java?rev=1871591&r1=1871590&r2=1871591&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java Sun Dec 15 14:53:46 2019
@@ -92,8 +92,8 @@ public final class TestEventRecordFactor
byte[] bytes = bof.serialize();
Record[] records = RecordFactory.createRecord(TestcaseRecordInputStream.create(bytes));
-
- assertTrue("record.length must be 1, was ="+records.length,records.length == 1);
+
+ assertEquals("record.length must be 1, was =" + records.length, 1, records.length);
assertTrue("record is the same", compareRec(bof,records[0]));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org