You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/12/24 18:42:38 UTC
svn commit: r1884783 [24/40] - in /poi:
site/src/documentation/content/xdocs/ trunk/ trunk/sonar/
trunk/sonar/integration-test/ trunk/sonar/ooxml/
trunk/src/excelant/poi-ant-contrib/
trunk/src/excelant/testcases/org/apache/poi/ss/excelant/ trunk/src/ex...
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the DefaultDataLabelTextPropertiesRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the FontBasisRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the FontIndexRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the FrameRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.hssf.record.chart;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the LegendRecord class works
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the LineFormatRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,13 +19,13 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the LinkedDataRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the NumberFormatIndexRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the ObjectLinkRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java Thu Dec 24 18:42:29 2020
@@ -18,10 +18,10 @@
package org.apache.poi.hssf.record.chart;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the PlotAreaRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the PlotGrowthRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesChartGroupIndexRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesIndexRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesLabelsRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesListRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java Thu Dec 24 18:42:29 2020
@@ -18,13 +18,13 @@
package org.apache.poi.hssf.record.chart;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the SeriesTextRecord class
@@ -88,7 +88,7 @@ public final class TestSeriesTextRecord
// "Bad requested string length (-126)"
SeriesTextRecord str = new SeriesTextRecord(in);
- assertTrue("Identified bug 45784b", str.getRecordSize() >= 0);
+ assertTrue(str.getRecordSize() >= 0, "Identified bug 45784b");
byte[] ser = str.serialize();
confirmRecordEncoding(SeriesTextRecord.sid, data, ser);
}
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,14 +19,14 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link SheetPropertiesRecord}
@@ -43,7 +43,7 @@ public final class TestSheetPropertiesRe
public void testLoad() {
RecordInputStream in = TestcaseRecordInputStream.create(0x1044, data);
SheetPropertiesRecord record = new SheetPropertiesRecord(in);
- assertNotEquals("Identified bug 44693c", 1, in.remaining());
+ assertNotEquals(1, in.remaining(), "Identified bug 44693c");
assertEquals(0, in.remaining());
assertEquals( 10, record.getFlags());
assertFalse(record.isChartTypeManuallyFormatted());
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the TextRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,11 +19,11 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the TickRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the UnitsRecord
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -19,12 +19,12 @@ package org.apache.poi.hssf.record.chart
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the serialization and deserialization of the ValueRangeRecord
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.common;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@ import org.apache.poi.util.LittleEndianI
import org.apache.poi.util.LittleEndianInputStream;
import org.apache.poi.util.LittleEndianOutputStream;
import org.apache.poi.util.StringUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests that {@link UnicodeString} record size calculates correctly. The record size
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java Thu Dec 24 18:42:29 2020
@@ -18,13 +18,13 @@
package org.apache.poi.hssf.record.pivot;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.record.pivottable.ExtendedPivotTableViewFieldsRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ExtendedPivotTableViewFieldsRecord}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java Thu Dec 24 18:42:29 2020
@@ -18,14 +18,14 @@
package org.apache.poi.hssf.record.pivot;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.record.pivottable.PageItemRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link PageItemRecord}
@@ -36,7 +36,7 @@ public final class TestPageItemRecord {
byte[] data = HexRead.readFromString("01 02 03 04 05 06 07 08 09 0A 0B 0C");
RecordInputStream in = TestcaseRecordInputStream.create(PageItemRecord.sid, data);
PageItemRecord rec = new PageItemRecord(in);
- assertNotEquals("Identified bug 46917", 6, in.remaining());
+ assertNotEquals(6, in.remaining(), "Identified bug 46917");
assertEquals(0, in.remaining());
assertEquals(4+data.length, rec.getRecordSize());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java Thu Dec 24 18:42:29 2020
@@ -18,14 +18,14 @@
package org.apache.poi.hssf.record.pivot;
import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.hssf.record.pivottable.ViewFieldsRecord;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link ViewFieldsRecord}
@@ -37,7 +37,7 @@ public final class TestViewFieldsRecord
byte[] data = HexRead.readFromString("01 00 01 00 01 00 04 00 05 00 00 6D 61 72 63 6F");
RecordInputStream in = TestcaseRecordInputStream.create(ViewFieldsRecord.sid, data);
ViewFieldsRecord rec = new ViewFieldsRecord(in);
- assertNotEquals("Identified bug 46693b", 1, in.remaining());
+ assertNotEquals(1, in.remaining(), "Identified bug 46693b");
assertEquals(0, in.remaining());
assertEquals(4+data.length, rec.getRecordSize());
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java Thu Dec 24 18:42:29 2020
@@ -19,188 +19,107 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.poi.hssf.model.InternalSheet;
import org.apache.poi.hssf.model.InternalWorkbook;
-import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BackupRecord;
-import org.apache.poi.hssf.record.BookBoolRecord;
-import org.apache.poi.hssf.record.BoundSheetRecord;
-import org.apache.poi.hssf.record.CalcModeRecord;
-import org.apache.poi.hssf.record.CodepageRecord;
-import org.apache.poi.hssf.record.CountryRecord;
-import org.apache.poi.hssf.record.DSFRecord;
-import org.apache.poi.hssf.record.DateWindow1904Record;
-import org.apache.poi.hssf.record.DefaultColWidthRecord;
-import org.apache.poi.hssf.record.DefaultRowHeightRecord;
-import org.apache.poi.hssf.record.DeltaRecord;
-import org.apache.poi.hssf.record.DimensionsRecord;
-import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.ExtSSTRecord;
-import org.apache.poi.hssf.record.ExtendedFormatRecord;
-import org.apache.poi.hssf.record.ExternSheetRecord;
-import org.apache.poi.hssf.record.FnGroupCountRecord;
-import org.apache.poi.hssf.record.FontRecord;
-import org.apache.poi.hssf.record.FormatRecord;
-import org.apache.poi.hssf.record.GridsetRecord;
-import org.apache.poi.hssf.record.GutsRecord;
-import org.apache.poi.hssf.record.HideObjRecord;
-import org.apache.poi.hssf.record.InterfaceEndRecord;
-import org.apache.poi.hssf.record.InterfaceHdrRecord;
-import org.apache.poi.hssf.record.IterationRecord;
-import org.apache.poi.hssf.record.MMSRecord;
-import org.apache.poi.hssf.record.NameRecord;
-import org.apache.poi.hssf.record.PasswordRev4Record;
-import org.apache.poi.hssf.record.PrecisionRecord;
-import org.apache.poi.hssf.record.PrintGridlinesRecord;
-import org.apache.poi.hssf.record.PrintHeadersRecord;
-import org.apache.poi.hssf.record.ProtectRecord;
-import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordBase;
-import org.apache.poi.hssf.record.RefModeRecord;
-import org.apache.poi.hssf.record.RefreshAllRecord;
-import org.apache.poi.hssf.record.SSTRecord;
-import org.apache.poi.hssf.record.SaveRecalcRecord;
-import org.apache.poi.hssf.record.SelectionRecord;
-import org.apache.poi.hssf.record.StyleRecord;
-import org.apache.poi.hssf.record.SupBookRecord;
-import org.apache.poi.hssf.record.TabIdRecord;
-import org.apache.poi.hssf.record.UseSelFSRecord;
-import org.apache.poi.hssf.record.WSBoolRecord;
-import org.apache.poi.hssf.record.WindowOneRecord;
-import org.apache.poi.hssf.record.WindowProtectRecord;
-import org.apache.poi.hssf.record.WindowTwoRecord;
-import org.apache.poi.hssf.record.WriteAccessRecord;
+import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.aggregates.PageSettingsBlock;
/**
* Designed to check wither the records written actually make sense.
*/
public class SanityChecker {
- static class CheckRecord
- {
+ static class CheckRecord {
Class<? extends RecordBase> record;
char occurance; // 1 = one time, M = 1..many times, * = 0..many, 0 = optional
private final boolean together;
- public CheckRecord( Class<? extends RecordBase> record, char occurance )
- {
+ public CheckRecord(Class<? extends RecordBase> record, char occurance) {
this(record, occurance, true);
}
/**
- * @param record The record type to check
- * @param occurance The occurance 1 = occurs once, M = occurs many times
+ * @param record The record type to check
+ * @param occurance The occurance 1 = occurs once, M = occurs many times
* @param together
*/
- public CheckRecord(Class<? extends RecordBase> record, char occurance, boolean together)
- {
+ public CheckRecord(Class<? extends RecordBase> record, char occurance, boolean together) {
this.record = record;
this.occurance = occurance;
this.together = together;
}
- public Class<? extends RecordBase> getRecord()
- {
+ public Class<? extends RecordBase> getRecord() {
return record;
}
- public char getOccurance()
- {
- return occurance;
- }
-
- public boolean isRequired()
- {
+ public boolean isRequired() {
return occurance == '1' || occurance == 'M';
}
- public boolean isOptional()
- {
+ public boolean isOptional() {
return occurance == '0' || occurance == '*';
}
- public boolean isTogether()
- {
- return together;
- }
-
- public boolean isMany()
- {
+ public boolean isMany() {
return occurance == '*' || occurance == 'M';
}
- public int match( List<? extends RecordBase> records, int recordIdx )
- {
+ public int match(List<? extends RecordBase> records, int recordIdx) {
int firstRecord = findFirstRecord(records, getRecord(), recordIdx);
- if (isRequired())
- {
- return matchRequired( firstRecord, records, recordIdx );
+ if (isRequired()) {
+ return matchRequired(firstRecord, records, recordIdx);
}
- return matchOptional( firstRecord, records, recordIdx );
+ return matchOptional(firstRecord, records, recordIdx);
}
- private int matchOptional( int firstRecord, List<? extends RecordBase> records, int recordIdx )
- {
- if (firstRecord == -1)
- {
+ private int matchOptional(int firstRecord, List<? extends RecordBase> records, int recordIdx) {
+ if (firstRecord == -1) {
return recordIdx;
}
- return matchOneOrMany( records, firstRecord );
+ return matchOneOrMany(records, firstRecord);
}
- private int matchRequired( int firstRecord, List<? extends RecordBase> records, int recordIdx )
- {
- if (firstRecord == -1)
- {
- fail("Manditory record missing or out of order: " + record);
- }
+ private int matchRequired(int firstRecord, List<? extends RecordBase> records, int recordIdx) {
+ assertNotEquals(-1, firstRecord, "Manditory record missing or out of order: " + record);
- return matchOneOrMany( records, firstRecord );
+ return matchOneOrMany(records, firstRecord);
}
- private int matchOneOrMany( List<? extends RecordBase> records, int recordIdx )
- {
- if (isZeroOrOne())
- {
+ private int matchOneOrMany(List<? extends RecordBase> records, int recordIdx) {
+ if (isZeroOrOne()) {
// check no other records
- if (findFirstRecord(records, getRecord(), recordIdx+1) != -1)
- fail("More than one record matched for " + getRecord().getName());
- }
- else if (isZeroToMany())
- {
- if (together)
- {
- int nextIdx = findFirstRecord(records, record, recordIdx+1);
- while (nextIdx != -1)
- {
- if (nextIdx - 1 != recordIdx)
- fail("Records are not together " + record.getName());
+ assertEquals(-1, findFirstRecord(records, getRecord(), recordIdx + 1),
+ "More than one record matched for " + getRecord().getName());
+ } else if (isZeroToMany()) {
+ if (together) {
+ int nextIdx = findFirstRecord(records, record, recordIdx + 1);
+ while (nextIdx != -1) {
+ assertEquals(recordIdx+1, nextIdx, "Records are not together " + record.getName());
recordIdx = nextIdx;
- nextIdx = findFirstRecord(records, record, recordIdx+1);
+ nextIdx = findFirstRecord(records, record, recordIdx + 1);
}
}
}
- return recordIdx+1;
+ return recordIdx + 1;
}
- private boolean isZeroToMany()
- {
+ private boolean isZeroToMany() {
return occurance == '*' || occurance == 'M';
}
- private boolean isZeroOrOne()
- {
+ private boolean isZeroOrOne() {
return occurance == '0' || occurance == '1';
}
}
- CheckRecord[] workbookRecords = new CheckRecord[] {
+ CheckRecord[] workbookRecords = {
new CheckRecord(BOFRecord.class, '1'),
new CheckRecord(InterfaceHdrRecord.class, '1'),
new CheckRecord(MMSRecord.class, '1'),
@@ -235,7 +154,7 @@ public class SanityChecker {
new CheckRecord(EOFRecord.class, '1'),
};
- CheckRecord[] sheetRecords = new CheckRecord[] {
+ CheckRecord[] sheetRecords = {
new CheckRecord(BOFRecord.class, '1'),
new CheckRecord(CalcModeRecord.class, '1'),
new CheckRecord(RefModeRecord.class, '1'),
@@ -256,14 +175,12 @@ public class SanityChecker {
new CheckRecord(EOFRecord.class, '1')
};
- private void checkWorkbookRecords(InternalWorkbook workbook)
- {
+ private void checkWorkbookRecords(InternalWorkbook workbook) {
List<org.apache.poi.hssf.record.Record> records = workbook.getRecords();
assertTrue(records.get(0) instanceof BOFRecord);
assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
checkRecordOrder(records, workbookRecords);
-// checkRecordsTogether(records, workbookRecords);
}
private void checkSheetRecords(InternalSheet sheet) {
@@ -272,104 +189,27 @@ public class SanityChecker {
assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
checkRecordOrder(records, sheetRecords);
-// checkRecordsTogether(records, sheetRecords);
}
- public void checkHSSFWorkbook(HSSFWorkbook wb)
- {
+ public void checkHSSFWorkbook(HSSFWorkbook wb) {
checkWorkbookRecords(wb.getWorkbook());
for (int i = 0; i < wb.getNumberOfSheets(); i++)
checkSheetRecords(wb.getSheetAt(i).getSheet());
}
- /*
- private void checkRecordsTogether(List records, CheckRecord[] check)
- {
- for ( int checkIdx = 0; checkIdx < check.length; checkIdx++ )
- {
- int recordIdx = findFirstRecord(records, check[checkIdx].getRecord());
- boolean notFoundAndRecordRequired = (recordIdx == -1 && check[checkIdx].isRequired());
- if (notFoundAndRecordRequired)
- {
- fail("Expected to find record of class " + check.getClass() + " but did not");
- }
- else if (recordIdx >= 0)
- {
- if (check[checkIdx].isMany())
- {
- // Skip records that are together
- while (recordIdx < records.size() && check[checkIdx].getRecord().isInstance(records.get(recordIdx)))
- recordIdx++;
- }
-
- // Make sure record does not occur in remaining records (after the next)
- recordIdx++;
- for (int recordIdx2 = recordIdx; recordIdx2 < records.size(); recordIdx2++)
- {
- if (check[checkIdx].getRecord().isInstance(records.get(recordIdx2)))
- fail("Record occurs scattered throughout record chain:\n" + records.get(recordIdx2));
- }
- }
- }
- } */
-
- /* package */ static int findFirstRecord( List<? extends RecordBase> records, Class<? extends RecordBase> record, int startIndex )
- {
- for (int i = startIndex; i < records.size(); i++)
- {
+ static int findFirstRecord(List<? extends RecordBase> records, Class<? extends RecordBase> record, int startIndex) {
+ for (int i = startIndex; i < records.size(); i++) {
if (record.getName().equals(records.get(i).getClass().getName()))
return i;
}
return -1;
}
- void checkRecordOrder(List<? extends RecordBase> records, CheckRecord[] check)
- {
+ void checkRecordOrder(List<? extends RecordBase> records, CheckRecord[] check) {
int recordIdx = 0;
for (CheckRecord element : check) {
recordIdx = element.match(records, recordIdx);
}
}
-
- /*
- void checkRecordOrder(List records, CheckRecord[] check)
- {
- int checkIndex = 0;
- for (int recordIndex = 0; recordIndex < records.size(); recordIndex++)
- {
- Record record = (org.apache.poi.hssf.record.Record) records.get(recordIndex);
- if (check[checkIndex].getRecord().isInstance(record))
- {
- if (check[checkIndex].getOccurance() == 'M')
- {
- // skip over duplicate records if multiples are allowed
- while (recordIndex+1 < records.size() && check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
- recordIndex++;
-// lastGoodMatch = recordIndex;
- }
- else if (check[checkIndex].getOccurance() == '1')
- {
- // Check next record to make sure there's not more than one
- if (recordIndex != records.size() - 1)
- {
- if (check[checkIndex].getRecord().isInstance(records.get(recordIndex+1)))
- {
- fail("More than one occurance of record found:\n" + records.get(recordIndex).toString());
- }
- }
-// lastGoodMatch = recordIndex;
- }
-// else if (check[checkIndex].getOccurance() == '0')
-// {
-//
-// }
- checkIndex++;
- }
- if (checkIndex >= check.length)
- return;
- }
- fail("Could not find required record: " + check[checkIndex]);
- } */
-
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java Thu Dec 24 18:42:29 2020
@@ -17,19 +17,19 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.Iterator;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.FormulaRecord;
import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
-import org.apache.poi.ss.util.CellReference;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.Row;
-import org.junit.Test;
+import org.apache.poi.ss.util.CellReference;
+import org.junit.jupiter.api.Test;
/**
*
@@ -42,7 +42,7 @@ public final class TestBug42464 {
process(wb);
wb.close();
}
-
+
@Test
public void testExpSharedBadFile() throws Exception {
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("42464-ExpPtg-bad.xls");
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Thu Dec 24 18:42:29 2020
@@ -20,7 +20,7 @@ package org.apache.poi.hssf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleWorkbook;
import static org.apache.poi.hssf.HSSFTestDataSamples.writeOutAndReadBack;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
@@ -88,11 +88,11 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Testcases for bugs entered in bugzilla
@@ -110,7 +110,7 @@ public final class TestBugs extends Base
private static final Map<String,HSSFFormulaEvaluator> SIMPLE_REFS = new LinkedHashMap<>();
// References used for the simpleTest convenience method
- @BeforeClass
+ @BeforeAll
public static void initSimpleRefs() {
String[] refs = {
"Calculations",
@@ -138,7 +138,7 @@ public final class TestBugs extends Base
LocaleUtil.setUserLocale(Locale.US);
}
- @AfterClass
+ @AfterAll
public static void cleanUpRefs() {
SIMPLE_REFS.clear();
}
@@ -837,7 +837,7 @@ public final class TestBugs extends Base
* Problems with extracting check boxes from
* HSSFObjectData
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void bug44840() throws Exception {
try (HSSFWorkbook wb = openSampleWorkbook("WithCheckBoxes.xls")) {
@@ -863,7 +863,7 @@ public final class TestBugs extends Base
assertEquals(12, obj.getObjectData().length);
assertEquals("Forms.CheckBox.1", obj.getOLE2ClassName());
- obj.getDirectory();
+ assertThrows(IllegalArgumentException.class, obj::getDirectory);
}
}
@@ -1001,13 +1001,8 @@ public final class TestBugs extends Base
// formula cells, so we can see it updates properly
c3.setCellValue(new HSSFRichTextString("test"));
confirmCachedValue("test", c3);
- try {
- c3.getNumericCellValue();
- fail("exception should have been thrown");
- } catch (IllegalStateException e) {
- assertEquals("Cannot get a NUMERIC value from a STRING formula cell", e.getMessage());
- }
-
+ IllegalStateException e = assertThrows(IllegalStateException.class, c3::getNumericCellValue);
+ assertEquals("Cannot get a NUMERIC value from a STRING formula cell", e.getMessage());
// Now evaluate, they should all be changed
HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb1);
@@ -1082,7 +1077,7 @@ public final class TestBugs extends Base
* <p>
* Expected ExpPtg to be converted from Shared to Non-Shared...
*/
- @Ignore("For now, blows up with an exception from ExtPtg")
+ @Disabled("For now, blows up with an exception from ExtPtg")
@Test
public void test43623() throws Exception {
try (HSSFWorkbook wb1 = openSampleWorkbook("43623.xls")) {
@@ -1913,12 +1908,10 @@ public final class TestBugs extends Base
// Will show as the center, as that is what excel does
// with an invalid footer lacking left/right/center details
- assertEquals("Left text should be empty", "", f.getLeft());
- assertEquals("Right text should be empty", "", f.getRight());
- assertEquals(
- "Center text should contain the illegal value",
- "BlahBlah blah blah ", f.getCenter()
- );
+ assertEquals("", f.getLeft(), "Left text should be empty");
+ assertEquals("", f.getRight(), "Right text should be empty");
+ assertEquals("BlahBlah blah blah ", f.getCenter(),
+ "Center text should contain the illegal value");
}
}
@@ -2226,9 +2219,9 @@ public final class TestBugs extends Base
* Normally encrypted files have BOF then FILEPASS, but
* some may squeeze a WRITEPROTECT in the middle
*/
- @Test(expected = EncryptedDocumentException.class)
- public void bug51832() throws IOException {
- simpleTest("51832.xls");
+ @Test
+ public void bug51832() {
+ assertThrows(EncryptedDocumentException.class, () -> simpleTest("51832.xls"));
}
@Test
@@ -2265,9 +2258,9 @@ public final class TestBugs extends Base
// Problem 3: These used to fail, now pass
HSSFFormulaEvaluator eval = new HSSFFormulaEvaluator(wb);
- assertEquals("evaluating c1", 30.0, eval.evaluate(c1).getNumberValue(), 0.001);
- assertEquals("evaluating d1", 30.0, eval.evaluate(d1).getNumberValue(), 0.001);
- assertEquals("evaluating e1", 30.0, eval.evaluate(e1).getNumberValue(), 0.001);
+ assertEquals(30.0, eval.evaluate(c1).getNumberValue(), 0.001, "evaluating c1");
+ assertEquals(30.0, eval.evaluate(d1).getNumberValue(), 0.001, "evaluating d1");
+ assertEquals(30.0, eval.evaluate(e1).getNumberValue(), 0.001, "evaluating e1");
}
}
@@ -2697,7 +2690,7 @@ public final class TestBugs extends Base
try {
bimage = ImageIO.read(structURL);
} catch (IOException e) {
- Assume.assumeNoException("Downloading a jpg from poi.apache.org should work", e);
+ Assumptions.assumeFalse(true, "Downloading a jpg from poi.apache.org should work");
return;
}
@@ -2711,7 +2704,7 @@ public final class TestBugs extends Base
// Pop structure into Structure HSSFSheet
int pict = wb.addPicture(imageBytes, HSSFWorkbook.PICTURE_TYPE_JPEG);
Sheet sheet = wb.getSheet("Structure");
- assertNotNull("Did not find sheet", sheet);
+ assertNotNull(sheet, "Did not find sheet");
HSSFPatriarch patriarch = (HSSFPatriarch) sheet.createDrawingPatriarch();
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 1, 1, (short) 10, 22);
anchor.setAnchorType(AnchorType.MOVE_DONT_RESIZE);
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.hssf.usermodel;
-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.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -45,7 +45,7 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.TempFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class to test cell styling functionality
@@ -97,8 +97,8 @@ public final class TestCellStyle {
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
- assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
+ assertEquals(99, s.getLastRowNum(), "LAST ROW == 99");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW == 0");
}
// assert((s.getLastRowNum() == 99));
@@ -134,8 +134,8 @@ public final class TestCellStyle {
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW ", 0, s.getLastRowNum());
- assertEquals("FIRST ROW ", 0, s.getFirstRowNum());
+ assertEquals(0, s.getLastRowNum(), "LAST ROW");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW");
}
}
@@ -185,8 +185,6 @@ public final class TestCellStyle {
File file = TempFile.createTempFile("testWriteSheetStyle", ".xls");
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet s = wb.createSheet();
- HSSFRow r = null;
- HSSFCell c = null;
HSSFFont fnt = wb.createFont();
HSSFCellStyle cs = wb.createCellStyle();
HSSFCellStyle cs2 = wb.createCellStyle();
@@ -203,10 +201,10 @@ public final class TestCellStyle {
cs2.setFillPattern(FillPatternType.DIAMONDS);
cs2.setFont(fnt);
for (int rownum = 0; rownum < 100; rownum++) {
- r = s.createRow(rownum);
+ HSSFRow r = s.createRow(rownum);
for (int cellnum = 0; cellnum < 50; cellnum += 2) {
- c = r.createCell(cellnum);
+ HSSFCell c = r.createCell(cellnum);
c.setCellValue(rownum * 10000 + cellnum
+ (((double) rownum / 1000)
+ ((double) cellnum / 10000)));
@@ -221,8 +219,8 @@ public final class TestCellStyle {
}
SanityChecker sanityChecker = new SanityChecker();
sanityChecker.checkHSSFWorkbook(wb);
- assertEquals("LAST ROW == 99", 99, s.getLastRowNum());
- assertEquals("FIRST ROW == 0", 0, s.getFirstRowNum());
+ assertEquals(99, s.getLastRowNum(), "LAST ROW == 99");
+ assertEquals(0, s.getFirstRowNum(), "FIRST ROW == 0");
}
}
@@ -455,13 +453,13 @@ public final class TestCellStyle {
Sheet sheet = wb.getSheetAt(0);
for (Row row : sheet) {
- for (Integer idxCell = 0; idxCell < row.getLastCellNum(); idxCell++) {
+ for (int idxCell = 0; idxCell < row.getLastCellNum(); idxCell++) {
Cell cell = row.getCell(idxCell);
cell.getCellStyle().getDataFormatString();
if (cell.getCellType() == CellType.NUMERIC) {
boolean isDate = DateUtil.isCellDateFormatted(cell);
- assertFalse("cell " + idxCell + " is not a date.", idxCell > 0 && isDate);
+ assertFalse(idxCell > 0 && isDate, "cell " + idxCell + " is not a date.");
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java Thu Dec 24 18:42:29 2020
@@ -17,18 +17,21 @@
package org.apache.poi.hssf.usermodel;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.IOException;
+import java.util.Arrays;
+
import org.apache.poi.ddf.EscherDgRecord;
import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
import org.apache.poi.hssf.record.EscherAggregate;
import org.apache.poi.ss.usermodel.BaseTestCloneSheet;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
/**
* Test the ability to clone a sheet.
@@ -46,7 +49,7 @@ public final class TestCloneSheet extend
HSSFWorkbook b = new HSSFWorkbook();
HSSFSheet s = b.createSheet("Test");
HSSFSheet s2 = s.cloneSheet(b);
-
+
assertNull(s.getDrawingPatriarch());
assertNull(s2.getDrawingPatriarch());
assertEquals(HSSFTestHelper.getSheetForTest(s).getRecords().size(), HSSFTestHelper.getSheetForTest(s2).getRecords().size());
@@ -97,7 +100,7 @@ public final class TestCloneSheet extend
c.setColumn(1);
c.setRow(2);
c.setString(new HSSFRichTextString("qwertyuio"));
-
+
HSSFSheet sh2 = wb.cloneSheet(0);
HSSFPatriarch p2 = sh2.getDrawingPatriarch();
HSSFComment c2 = (HSSFComment) p2.getChildren().get(0);
@@ -106,11 +109,11 @@ public final class TestCloneSheet extend
assertEquals(c.getRow(), c2.getRow());
assertEquals(c.getColumn(), c2.getColumn());
- // The ShapeId is not equal?
+ // The ShapeId is not equal?
// assertEquals(c.getNoteRecord().getShapeId(), c2.getNoteRecord().getShapeId());
-
+
assertArrayEquals(c2.getTextObjectRecord().serialize(), c.getTextObjectRecord().serialize());
-
+
// ShapeId is different
CommonObjectDataSubRecord subRecord = (CommonObjectDataSubRecord) c2.getObjRecord().getSubRecords().get(0);
subRecord.setObjectId(1025);
@@ -126,7 +129,7 @@ public final class TestCloneSheet extend
EscherSpRecord sp = (EscherSpRecord) c2.getEscherContainer().getChild(0);
sp.setShapeId(1025);
assertArrayEquals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize());
-
+
wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java Thu Dec 24 18:42:29 2020
@@ -24,8 +24,7 @@ import java.io.IOException;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestCryptoAPI {
final HSSFITestDataProvider ssTests = HSSFITestDataProvider.instance;
@@ -44,7 +43,7 @@ public class TestCryptoAPI {
// CryptoAPI
validateContent("35897-type4.xls", "freedom", "Sheet1\nhello there!\n");
}
-
+
private void validateContent(String wbFile, String password, String textExpected) throws IOException {
Biff8EncryptionKey.setCurrentUserPassword(password);
try (HSSFWorkbook wb = ssTests.openSampleWorkbook(wbFile);
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -17,11 +17,12 @@
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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -45,7 +46,7 @@ import org.apache.poi.ss.usermodel.Sheet
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Class for testing Excel's data validation mechanism
@@ -164,9 +165,7 @@ public final class TestDataValidation ex
// nextSid should be for a DVRecord. If anything comes between the DV header record
// and the DV records, Excel will not be able to open the workbook without error.
- if (nextSid == 0x0867) {
- fail("Identified bug 45519");
- }
+ assertNotEquals(0x0867, nextSid, "Identified bug 45519");
assertEquals(DVRecord.sid, nextSid);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.util.List;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for the embedded object fetching support in HSSF
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.awt.Font;
@@ -28,9 +28,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the capabilities of the EscherGraphics class.
@@ -45,7 +45,7 @@ public final class TestEscherGraphics {
private HSSFShapeGroup escherGroupA;
private EscherGraphics graphics;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
workbook = new HSSFWorkbook();
@@ -55,8 +55,8 @@ public final class TestEscherGraphics {
patriarch.createGroup(new HSSFClientAnchor(20,30,500,200,(short)0,0,(short) 0,0));
graphics = new EscherGraphics(escherGroupA, workbook, Color.black, 1.0f);
}
-
- @After
+
+ @AfterEach
public void closeResources() throws IOException {
workbook.close();
}
@@ -268,9 +268,9 @@ public final class TestEscherGraphics {
assertEquals(40, patriarch.getY2());
// Check the two groups and the text
- // Result of patriarch.countOfAllChildren() makes no sense:
+ // Result of patriarch.countOfAllChildren() makes no sense:
// Returns 4 for 2 empty groups + 1 TextBox.
- //assertEquals(3, patriarch.countOfAllChildren());
+ //assertEquals(3, patriarch.countOfAllChildren());
assertEquals(3, patriarch.getChildren().size());
// Should be two groups and a text
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -17,9 +17,8 @@
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.awt.Color;
import java.awt.Font;
@@ -27,9 +26,9 @@ import java.awt.FontMetrics;
import java.awt.geom.Line2D;
import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the Graphics2d drawing capability.
@@ -39,7 +38,7 @@ public final class TestEscherGraphics2d
private HSSFShapeGroup escherGroup;
private EscherGraphics2d graphics;
- @Before
+ @BeforeEach
public void setUp() {
workbook = new HSSFWorkbook();
HSSFSheet sheet = workbook.createSheet("test");
@@ -48,8 +47,8 @@ public final class TestEscherGraphics2d
EscherGraphics g = new EscherGraphics(escherGroup, workbook, Color.black, 1.0f);
graphics = new EscherGraphics2d(g);
}
-
- @After
+
+ @AfterEach
public void closeResources() throws IOException {
workbook.close();
}
@@ -77,12 +76,7 @@ public final class TestEscherGraphics2d
// But with an invalid font, we get an exception
font = new Font("IamAmadeUPfont", Font.PLAIN, 22);
graphics.setFont(font);
- try {
- graphics.drawString("This is another test", 10, 10);
- fail();
- } catch(IllegalArgumentException e) {
- // expected
- }
+ assertThrows(IllegalArgumentException.class, () -> graphics.drawString("This is another test", 10, 10));
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java Thu Dec 24 18:42:29 2020
@@ -16,16 +16,16 @@
==================================================================== */
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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.CellType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestExternalReferenceChange {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java Thu Dec 24 18:42:29 2020
@@ -17,12 +17,12 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Properties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the implementation of the FontDetails class.
@@ -30,7 +30,7 @@ import org.junit.Test;
public final class TestFontDetails {
private FontDetails fontDetails;
- @Before
+ @BeforeEach
public void setUp() {
Properties properties = new Properties();
properties.setProperty("font.Arial.height", "13");
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.FileOutputStream;
@@ -45,8 +45,8 @@ import org.apache.poi.ss.usermodel.CellT
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
*
@@ -55,7 +55,7 @@ public final class TestFormulaEvaluatorB
private static boolean OUTPUT_TEST_FILES;
private static String tmpDirName;
- @BeforeClass
+ @BeforeAll
public static void setUp() {
tmpDirName = System.getProperty("java.io.tmpdir");
OUTPUT_TEST_FILES = Boolean.parseBoolean(
@@ -95,7 +95,7 @@ public final class TestFormulaEvaluatorB
System.err.println("Existing file for bug #44636 written to " + existing);
}
wb.close();
-
+
// Now, do a new file from scratch
wb = new HSSFWorkbook();
sheet = wb.createSheet();
@@ -182,7 +182,7 @@ public final class TestFormulaEvaluatorB
cell = row.getCell(0);
assertEquals("-1000000-3000000", cell.getCellFormula());
assertEquals(-4000000, eva.evaluate(cell).getNumberValue(), 0);
-
+
wb.close();
}
@@ -243,7 +243,7 @@ public final class TestFormulaEvaluatorB
HSSFCell cellSUM2D = rowSUM2D.getCell(0);
assertEquals("SUM(C:D)", cellSUM2D.getCellFormula());
assertEquals(66, eva.evaluate(cellSUM2D).getNumberValue(), 0);
-
+
wb.close();
}
@@ -267,7 +267,7 @@ public final class TestFormulaEvaluatorB
fail("Identified bug 44508");
}
assertTrue(cell.getBooleanCellValue());
-
+
wb.close();
}
@@ -292,27 +292,24 @@ public final class TestFormulaEvaluatorB
}
}
}
-
+
wb.close();
}
@Test
public void testEvaluateInCellWithErrorCode_bug44950() throws Exception {
- HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("Sheet1");
- HSSFRow row = sheet.createRow(1);
- HSSFCell cell = row.createCell(0);
- cell.setCellFormula("na()"); // this formula evaluates to an Excel error code '#N/A'
- HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- try {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb.createSheet("Sheet1");
+ HSSFRow row = sheet.createRow(1);
+ HSSFCell cell = row.createCell(0);
+ cell.setCellFormula("na()"); // this formula evaluates to an Excel error code '#N/A'
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
fe.evaluateInCell(cell);
} catch (NumberFormatException e) {
if (e.getMessage().equals("You cannot get an error value from a non-error cell")) {
fail("Identified bug 44950 b");
}
throw e;
- } finally {
- wb.close();
}
}
@@ -357,7 +354,7 @@ public final class TestFormulaEvaluatorB
cell.setCellFormula("DATE(2012,2-12,1+4)");
fe.notifyUpdateCell(cell);
assertEquals(40579.0, fe.evaluate(cell).getNumberValue(), 0);
-
+
wb.close();
}
@@ -420,13 +417,11 @@ public final class TestFormulaEvaluatorB
WorkbookEvaluator evaluator = WorkbookEvaluatorTestHelper.createEvaluator(wb, evalListener);
ValueEval ve = evaluator.evaluate(HSSFEvaluationTestHelper.wrapCell(cell));
int evalCount = evalListener.getCountCacheMisses();
- if (evalCount > 10) {
- // Without caching, evaluating cell 'A9' takes 21845 evaluations which consumes
- // much time (~3 sec on Core 2 Duo 2.2GHz)
- // short-circuit-if optimisation cuts this down to 255 evaluations which is still too high
- // System.err.println("Cell A9 took " + evalCount + " intermediate evaluations");
- fail("Identifed bug 45376 - Formula evaluator should cache values");
- }
+ // Without caching, evaluating cell 'A9' takes 21845 evaluations which consumes
+ // much time (~3 sec on Core 2 Duo 2.2GHz)
+ // short-circuit-if optimisation cuts this down to 255 evaluations which is still too high
+ // System.err.println("Cell A9 took " + evalCount + " intermediate evaluations");
+ assertTrue(evalCount <= 10, "Identifed bug 45376 - Formula evaluator should cache values");
// With caching, the evaluationCount is 8 which is exactly the
// number of formula cells that needed to be evaluated.
assertEquals(8, evalCount);
@@ -440,7 +435,7 @@ public final class TestFormulaEvaluatorB
// confirm the evaluation result too
assertEquals(ErrorEval.NA, ve);
-
+
wb.close();
}
@@ -527,22 +522,22 @@ public final class TestFormulaEvaluatorB
cell = row.getCell(CellReference.convertColStringToIndex("B"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("D"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 6); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("F"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
// assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-
+
cell = row.getCell(CellReference.convertColStringToIndex("G"));
assertRefPtgA1('V', getPtgs(cell), 0);
// assertRefPtgA1('V', getPtgs(cell), 4); // FIXME!
// assertRefPtgA1('V', getPtgs(cell), 9); // FIXME!
-
-
+
+
// Check our cached values were correctly evaluated
cell = row.getCell(CellReference.convertColStringToIndex("A"));
assertEquals("abc", cell.getStringCellValue());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -25,7 +25,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests to show that our documentation at
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org