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 [20/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/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java Thu Dec 24 18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test to see if Range.replaceText() works even if the Range contains a
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java Thu Dec 24 18:42:29 2020
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.Ffn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* API for processing of symbols, see Bugzilla 49908
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java Thu Dec 24 18:42:29 2020
@@ -16,18 +16,18 @@
==================================================================== */
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.InputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestTableRow {
private static final POIDataSamples SAMPLES = POIDataSamples.getDocumentInstance();
-
+
@Test
public void testInnerTableCellsDetection() throws IOException {
InputStream is = SAMPLES.openResourceAsStream( "innertable.doc" );
@@ -62,7 +62,7 @@ public class TestTableRow {
assertEquals( 3, outerTable.getRow( 0 ).numCells() );
assertEquals( 3, outerTable.getRow( 1 ).numCells() );
assertEquals( 3, outerTable.getRow( 2 ).numCells() );
-
+
hwpfDocument.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java Thu Dec 24 18:42:29 2020
@@ -17,12 +17,12 @@
package org.apache.poi.hwpf.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.io.Reader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestLittleEndianCP950Reader {
@@ -63,6 +63,6 @@ public class TestLittleEndianCP950Reader
int c = reader.read();
assertEquals((int) expected, c);
int eof = reader.read();
- assertEquals("should be end of stream", -1, eof);
+ assertEquals(-1, eof, "should be end of stream");
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Thu Dec 24 18:42:29 2020
@@ -23,10 +23,10 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNoException;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.lang.reflect.Field;
import java.security.AccessController;
@@ -84,9 +84,7 @@ public final class POITestCase {
assertNotNull(needle);
String hay = haystack.toLowerCase(locale);
String n = needle.toLowerCase(locale);
- assertTrue("Unable to find expected text '" + needle + "' in text:\n" + haystack,
- hay.contains(n)
- );
+ assertTrue(hay.contains(n), "Unable to find expected text '" + needle + "' in text:\n" + haystack);
}
public static void assertContainsIgnoreCase(String haystack, String needle) {
assertContainsIgnoreCase(haystack, needle, Locale.ROOT);
@@ -103,17 +101,11 @@ public final class POITestCase {
* @param key needle
*/
public static <T> void assertContains(Map<T, ?> map, T key) {
- if (map.containsKey(key)) {
- return;
- }
- fail("Unable to find " + key + " in " + map);
+ assertTrue(map.containsKey(key), "Unable to find " + key + " in " + map);
}
public static <T> void assertNotContained(Set<T> set, T element) {
- assertThat(set, not(hasItem(element)));
- /*if (set.contains(element)) {
- fail("Set should not contain " + element);
- }*/
+ assertThat("Set should not contain " + element, set, not(hasItem(element)));
}
/**
@@ -123,7 +115,7 @@ public final class POITestCase {
@SuppressWarnings({"unused", "unchecked"})
@SuppressForbidden("For test usage only")
public static <R,T> R getFieldValue(final Class<? super T> clazz, final T instance, final Class<R> fieldType, final String fieldName) {
- assertTrue("Reflection of private fields is only allowed for POI classes.", clazz.getName().startsWith("org.apache.poi."));
+ assertTrue(clazz.getName().startsWith("org.apache.poi."), "Reflection of private fields is only allowed for POI classes.");
try {
return AccessController.doPrivileged((PrivilegedExceptionAction<R>) () -> {
Field f = clazz.getDeclaredField(fieldName);
@@ -193,7 +185,7 @@ public final class POITestCase {
* be raised when the bug is fixed
*/
public static void skipTest(Throwable e) {
- assumeNoException("This test currently fails with", e);
+ assumeTrue(e != null, "This test currently fails with");
}
/**
* @see #skipTest(Throwable)
@@ -205,9 +197,7 @@ public final class POITestCase {
}
public static void assertBetween(String message, int value, int min, int max) {
- assertTrue(message + ": " + value + " is less than the minimum value of " + min,
- min <= value);
- assertTrue(message + ": " + value + " is greater than the maximum value of " + max,
- value <= max);
+ assertTrue(min <= value, message + ": " + value + " is less than the minimum value of " + min);
+ assertTrue(value <= max, message + ": " + value + " is greater than the maximum value of " + max);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/TestJDK12.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestJDK12.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestJDK12.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestJDK12.java Thu Dec 24 18:42:29 2020
@@ -23,7 +23,7 @@ import java.awt.font.TextLayout;
import java.awt.image.BufferedImage;
import java.text.AttributedString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Minimal Test-Class found when running the Apache POI regression tests.
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,8 +31,8 @@ import org.apache.poi.hpsf.SummaryInform
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that POIDocument correctly loads and saves the common
@@ -49,7 +49,7 @@ public final class TestPOIDocumentMain {
/**
* Set things up, two spreadsheets for our testing
*/
- @Before
+ @BeforeEach
public void setUp() {
doc = HSSFTestDataSamples.openSampleWorkbook("DateFormats.xls");
doc2 = HSSFTestDataSamples.openSampleWorkbook("StringFormulas.xls");
@@ -114,7 +114,7 @@ public final class TestPOIDocumentMain {
// Check they're still there
POIDocument doc3 = new HPSFPropertiesOnlyDocument(inFS);
doc3.readProperties();
-
+
// Delegate test
readPropertiesHelper(doc3);
doc3.close();
@@ -144,7 +144,7 @@ public final class TestPOIDocumentMain {
assertNotNull(doc.getSummaryInformation());
assertNotNull(doc.getDocumentSummaryInformation());
-
+
doc.close();
}
@@ -159,9 +159,9 @@ public final class TestPOIDocumentMain {
// Write out and back in again, no change
ByteArrayOutputStream baos = new ByteArrayOutputStream();
doc.write(baos);
-
+
doc.close();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
doc = new HSSFWorkbook(bais);
@@ -176,7 +176,7 @@ public final class TestPOIDocumentMain {
// Save and re-load
baos = new ByteArrayOutputStream();
doc.write(baos);
-
+
doc.close();
bais = new ByteArrayInputStream(baos.toByteArray());
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOITestCase.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.util.Collections;
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.poifs.property.PropertyTable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* A class for testing the POI Junit TestCase utility class
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -26,7 +26,7 @@ import org.apache.poi.poifs.storage.RawD
import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherBSERecord {
@Test
@@ -56,7 +56,7 @@ public final class TestEscherBSERecord {
EscherBSERecord r = createRecord();
String exp64 = "H4sIAAAAAAAAAGNkYP+gwsDAwMrKyMTMwsrGzsHJxc3Dy8fPwMgAAkxAzAzEICkAgs9OoSwAAAA=";
byte[] expected = RawDataUtil.decompress(exp64);
-
+
byte[] data = new byte[8 + 36];
int bytesWritten = r.serialize( 0, data, new NullEscherSerializationListener() );
assertEquals(data.length, bytesWritten);
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertArrayEquals;
-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.assertArrayEquals;
+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 org.apache.poi.POIDataSamples;
import org.apache.poi.sl.usermodel.PictureData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test read/serialize of escher blip records
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherBoolProperty {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherChildAnchorRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherClientAnchorRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java Thu Dec 24 18:42:29 2020
@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
+
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherClientDataRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java Thu Dec 24 18:42:29 2020
@@ -17,18 +17,18 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.poi.POIDataSamples;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link EscherContainerRecord}
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherDgRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherDggRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherDump.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -33,8 +33,8 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.poifs.storage.RawDataUtil;
import org.apache.poi.util.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestEscherDump {
private static final String recordData =
@@ -67,7 +67,7 @@ public class TestEscherDump {
private ByteArrayOutputStream baos = new ByteArrayOutputStream();
private PrintStream stream;
- @Before
+ @BeforeEach
public void setup() throws UnsupportedEncodingException {
stream = new PrintStream(baos, true, StandardCharsets.UTF_8.name());
}
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java Thu Dec 24 18:42:29 2020
@@ -17,15 +17,15 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.apache.poi.poifs.storage.RawDataUtil;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherOptRecord {
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java Thu Dec 24 18:42:29 2020
@@ -17,17 +17,17 @@
package org.apache.poi.ddf;
-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.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherProperty {
/**
* assure that EscherProperty.getName() returns correct name for complex properties
- * See Bugzilla 50401
+ * See Bugzilla 50401
*/
@Test
public void testPropertyNames() throws Exception {
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherPropertyFactory {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestEscherSpRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherSpgrRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.ddf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestEscherSplitMenuColorsRecord {
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.ddf;
-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.util.HexDump;
import org.apache.poi.util.HexRead;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestUnknownEscherRecord {
@Test
@@ -81,7 +81,7 @@ public final class TestUnknownEscherReco
assertTrue( r.isContainerRecord() );
assertEquals( 1, r.getChildRecords().size() );
assertEquals( (short) 0xFFFF, r.getChild( 0 ).getRecordId() );
-
+
//Add by Zhang Zhang test error situation when remaining bytes > avalible bytes
testData =
"00 02 " + // options
@@ -91,7 +91,7 @@ public final class TestUnknownEscherReco
r = new UnknownEscherRecord();
r.fillFields( HexRead.readFromString( testData ), factory );
-
+
assertEquals( 0x0200, r.getOptions() );
assertEquals( (short) 0xF111, r.getRecordId() );
assertEquals( 12, r.getRecordSize() );
@@ -102,7 +102,7 @@ public final class TestUnknownEscherReco
assertEquals( 2, r.getData()[1] );
assertEquals( 3, r.getData()[2] );
assertEquals( 4, r.getData()[3] );
-
+
testData =
"0F 02 " + // options
"11 F1 " + // record id
@@ -113,7 +113,7 @@ public final class TestUnknownEscherReco
r = new UnknownEscherRecord();
r.fillFields( HexRead.readFromString( testData ), factory );
-
+
assertEquals( 0x020F, r.getOptions() );
assertEquals( (short) 0xF111, r.getRecordId() );
assertEquals( 8, r.getRecordSize() );
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java Thu Dec 24 18:42:29 2020
@@ -18,19 +18,19 @@
*/
package org.apache.poi.hpsf;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.math.BigInteger;
import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.poifs.storage.RawDataUtil;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestVariantSupport {
@Test
@@ -52,10 +52,10 @@ public class TestVariantSupport {
Object hdrs = s.getProperty(PropertyIDMap.PID_HEADINGPAIR);
assertNotNull(hdrs);
assertEquals(byte[].class, hdrs.getClass());
-
+
// parse the value
Vector v = new Vector((short)Variant.VT_VARIANT);
- LittleEndianByteArrayInputStream lei = new LittleEndianByteArrayInputStream((byte[])hdrs, 0);
+ LittleEndianByteArrayInputStream lei = new LittleEndianByteArrayInputStream((byte[])hdrs, 0);
v.read(lei);
TypedPropertyValue[] items = v.getValues();
@@ -70,7 +70,7 @@ public class TestVariantSupport {
assertEquals(1, i);
}
-
+
@Test
public void newNumberTypes() throws Exception {
ClipboardData cd = new ClipboardData();
@@ -90,8 +90,7 @@ public class TestVariantSupport {
{Variant.VT_R4, -999.99f},
{Variant.VT_R8, -999.99d},
};
-
- HSSFWorkbook wb = new HSSFWorkbook();
+
POIFSFileSystem poifs = new POIFSFileSystem();
DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation();
CustomProperties cpList = new CustomProperties();
@@ -99,7 +98,7 @@ public class TestVariantSupport {
int type = (Integer)o[0];
Property p = new Property(PropertyIDMap.PID_MAX+type, type, o[1]);
cpList.put("testprop"+type, new CustomProperty(p, "testprop"+type));
-
+
}
dsi.setCustomProperties(cpList);
dsi.write(poifs.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
@@ -108,14 +107,15 @@ public class TestVariantSupport {
poifs.close();
poifs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
dsi = (DocumentSummaryInformation)PropertySetFactory.create(poifs.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
+ assertNotNull(dsi);
cpList = dsi.getCustomProperties();
int i=0;
for (Object[] o : exp) {
Object obj = cpList.get("testprop"+o[0]);
if (o[1] instanceof byte[]) {
- assertArrayEquals("property "+i, (byte[])o[1], (byte[])obj);
+ assertArrayEquals((byte[])o[1], (byte[])obj, "property "+i);
} else {
- assertEquals("property "+i, o[1], obj);
+ assertEquals(o[1], obj, "property "+i);
}
i++;
}
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hpsf.basic;
-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.io.ByteArrayInputStream;
import java.io.File;
@@ -42,8 +42,8 @@ import org.apache.poi.hpsf.PropertySetFa
import org.apache.poi.hpsf.Section;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* <p>Tests the basic HPSF functionality.</p>
@@ -76,7 +76,7 @@ public final class TestBasic {
* @exception FileNotFoundException if the file to be read does not exist.
* @exception IOException if any other I/O exception occurs.
*/
- @Before
+ @BeforeEach
public void setUp() throws IOException {
final File data = samples.getFile("TestGermanWord90.doc");
poiFiles = Util.readPOIFiles(data);
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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020
@@ -17,14 +17,15 @@
package org.apache.poi.hpsf.basic;
-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 static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Locale;
import org.apache.poi.hpsf.ClassID;
import org.apache.poi.hpsf.ClassIDPredefined;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests ClassID structure.
@@ -52,14 +53,14 @@ public final class TestClassID {
* Try to write to a buffer that is too small. This should
* throw an Exception
*/
- @Test(expected = ArrayStoreException.class)
+ @Test
public void testWriteArrayStoreException1() {
- new ClassID(BUF16, 0).write(new byte[15], 0);
+ assertThrows(ArrayStoreException.class, () -> new ClassID(BUF16, 0).write(new byte[15], 0));
}
- @Test(expected = ArrayIndexOutOfBoundsException.class)
+ @Test
public void testWriteArrayStoreException2() {
- new ClassID(BUF16, 0).write(new byte[16], 1);
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> new ClassID(BUF16, 0).write(new byte[16], 1));
}
@Test
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hpsf.basic;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -38,8 +38,8 @@ import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hpsf.Variant;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test case for OLE2 files with empty properties.
@@ -69,7 +69,7 @@ public final class TestEmptyProperties {
* does not exist
* @exception IOException if an I/O exception occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws IOException {
final File data = samples.getFile(POI_FS);
poiFiles = Util.readPOIFiles(data);
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hpsf.basic;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -38,7 +38,7 @@ import org.apache.poi.hpsf.SummaryInform
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests various bugs have been fixed
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java Thu Dec 24 18:42:29 2020
@@ -17,12 +17,11 @@
package org.apache.poi.hpsf.basic;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import 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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -38,9 +37,10 @@ import org.apache.poi.hpsf.PropertySetFa
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-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;
+
/**
* Basing on: src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java
* This class tests reading and writing of meta data. No actual document is created. All information
@@ -52,7 +52,7 @@ public final class TestMetaDataIPI {
private DocumentSummaryInformation dsi;
private SummaryInformation si;
- @After
+ @AfterEach
public void tearDown() throws Exception {
poifs.close();
}
@@ -61,7 +61,7 @@ public final class TestMetaDataIPI {
* Setup is used to get the document ready. Gets the DocumentSummaryInformation and the
* SummaryInformation to reasonable values
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
poifs = new POIFSFileSystem();
dsi = PropertySetFactory.newDocumentSummaryInformation();
@@ -113,15 +113,15 @@ public final class TestMetaDataIPI {
assertNotNull(dsi);
assertNotNull(si);
- assertEquals("Category", "xxxCategoryxxx", dsi.getCategory());
- assertEquals("Company", "xxxCompanyxxx", dsi.getCompany());
- assertEquals("Manager", "xxxManagerxxx", dsi.getManager());
-
- assertEquals("", "xxxAuthorxxx", si.getAuthor());
- assertEquals("", "xxxTitlexxx", si.getTitle());
- assertEquals("", "xxxCommentsxxx", si.getComments());
- assertEquals("", "xxxKeyWordsxxx", si.getKeywords());
- assertEquals("", "xxxSubjectxxx", si.getSubject());
+ assertEquals("xxxCategoryxxx", dsi.getCategory(), "Category");
+ assertEquals("xxxCompanyxxx", dsi.getCompany(), "Company");
+ assertEquals("xxxManagerxxx", dsi.getManager(), "Manager");
+
+ assertEquals("xxxAuthorxxx", si.getAuthor());
+ assertEquals("xxxTitlexxx", si.getTitle());
+ assertEquals("xxxCommentsxxx", si.getComments());
+ assertEquals("xxxKeyWordsxxx", si.getKeywords());
+ assertEquals("xxxSubjectxxx", si.getSubject());
/*
* Read the custom properties. If there are no custom properties yet,
@@ -133,21 +133,21 @@ public final class TestMetaDataIPI {
/* Insert some custom properties into the container. */
String a1 = (String) customProperties.get("Key1");
- assertEquals("Key1", "Value1", a1);
+ assertEquals("Value1", a1, "Key1");
String a2 = (String) customProperties.get("Schl\u00fcssel2");
- assertEquals("Schl\u00fcssel2", "Wert2", a2);
+ assertEquals("Wert2", a2, "Schl\u00fcssel2");
Integer a3 = (Integer) customProperties.get("Sample Integer");
- assertEquals("Sample Number", 12345, (int)a3);
+ assertEquals(12345, (int)a3, "Sample Number");
Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
- assertTrue("Sample Boolean", a4);
+ assertTrue(a4, "Sample Boolean");
Date a5 = (Date) customProperties.get("Sample Date");
- assertEquals("Custom Date:", date, a5);
+ assertEquals(date, a5, "Custom Date:");
Double a6 = (Double) customProperties.get("Sample Double");
- assertEquals("Custom Float", -1.0001, a6, 0);
+ assertEquals(-1.0001, a6, 0, "Custom Float");
Integer a7 = (Integer) customProperties.get("Sample Negative Integer");
- assertEquals("Neg", -100000, (int)a7);
+ assertEquals(-100000, (int)a7, "Neg");
}
/**
@@ -201,15 +201,15 @@ public final class TestMetaDataIPI {
* Change the category to "POI example". Any former category value will
* be lost. If there has been no category yet, it will be created.
*/
- assertEquals("Category", category, dsi.getCategory());
- assertEquals("Company", company, dsi.getCompany());
- assertEquals("Manager", manager, dsi.getManager());
-
- assertEquals("", author, si.getAuthor());
- assertEquals("", title, si.getTitle());
- assertEquals("", comments, si.getComments());
- assertEquals("", keywords, si.getKeywords());
- assertEquals("", subject, si.getSubject());
+ assertEquals(category, dsi.getCategory(), "Category");
+ assertEquals(company, dsi.getCompany(), "Company");
+ assertEquals(manager, dsi.getManager(), "Manager");
+
+ assertEquals(author, si.getAuthor());
+ assertEquals(title, si.getTitle());
+ assertEquals(comments, si.getComments());
+ assertEquals(keywords, si.getKeywords());
+ assertEquals(subject, si.getSubject());
/*
* Read the custom properties. If there are no custom properties yet,
@@ -217,21 +217,19 @@ public final class TestMetaDataIPI {
* serve as a container for custom properties.
*/
customProperties = dsi.getCustomProperties();
- if (customProperties == null) {
- fail();
- }
+ assertNotNull(customProperties);
/* Insert some custom properties into the container. */
String a1 = (String) customProperties.get(k1);
- assertEquals("Key1", p1, a1);
+ assertEquals(p1, a1, "Key1");
String a2 = (String) customProperties.get(k2);
- assertEquals("Schl\u00fcssel2", p2, a2);
+ assertEquals(p2, a2, "Schl\u00fcssel2");
Integer a3 = (Integer) customProperties.get("Sample Number");
- assertEquals("Sample Number", 12345, (int)a3);
+ assertEquals(12345, (int)a3, "Sample Number");
Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
- assertTrue("Sample Boolean", a4);
+ assertTrue(a4, "Sample Boolean");
Date a5 = (Date) customProperties.get("Sample Date");
- assertEquals("Custom Date:", date, a5);
+ assertEquals(date, a5, "Custom Date:");
}
@@ -287,15 +285,15 @@ public final class TestMetaDataIPI {
* Change the category to "POI example". Any former category value will
* be lost. If there has been no category yet, it will be created.
*/
- assertEquals("Category", category, dsi.getCategory());
- assertEquals("Company", company, dsi.getCompany());
- assertEquals("Manager", manager, dsi.getManager());
-
- assertEquals("", author, si.getAuthor());
- assertEquals("", title, si.getTitle());
- assertEquals("", comments, si.getComments());
- assertEquals("", keywords, si.getKeywords());
- assertEquals("", subject, si.getSubject());
+ assertEquals(category, dsi.getCategory(), "Category");
+ assertEquals(company, dsi.getCompany(), "Company");
+ assertEquals(manager, dsi.getManager(), "Manager");
+
+ assertEquals(author, si.getAuthor());
+ assertEquals(title, si.getTitle());
+ assertEquals(comments, si.getComments());
+ assertEquals(keywords, si.getKeywords());
+ assertEquals(subject, si.getSubject());
/*
* Read the custom properties. If there are no custom properties yet,
@@ -303,22 +301,20 @@ public final class TestMetaDataIPI {
* serve as a container for custom properties.
*/
customProperties = dsi.getCustomProperties();
- if (customProperties == null) {
- fail();
- }
+ assertNotNull(customProperties);
/* Insert some custom properties into the container. */
// System.out.println(k1);
String a1 = (String) customProperties.get(k1);
- assertEquals("Key1", p1, a1);
+ assertEquals(p1, a1, "Key1");
String a2 = (String) customProperties.get(k2);
- assertEquals("Schl\u00fcssel2", p2, a2);
+ assertEquals(p2, a2, "Schl\u00fcssel2");
Integer a3 = (Integer) customProperties.get("Sample Number");
- assertEquals("Sample Number", 12345, (int)a3);
+ assertEquals(12345, (int)a3, "Sample Number");
Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
- assertFalse("Sample Boolean", a4);
+ assertFalse(a4, "Sample Boolean");
Date a5 = (Date) customProperties.get("Sample Date");
- assertEquals("Custom Date:", date, a5);
+ assertEquals(date, a5, "Custom Date:");
}
@@ -380,15 +376,15 @@ public final class TestMetaDataIPI {
* Change the category to "POI example". Any former category value will
* be lost. If there has been no category yet, it will be created.
*/
- assertEquals("Category", category, dsi.getCategory());
- assertEquals("Company", company, dsi.getCompany());
- assertEquals("Manager", manager, dsi.getManager());
-
- assertEquals("", author, si.getAuthor());
- assertEquals("", title, si.getTitle());
- assertEquals("", comments, si.getComments());
- assertEquals("", keywords, si.getKeywords());
- assertEquals("", subject, si.getSubject());
+ assertEquals(category, dsi.getCategory(), "Category");
+ assertEquals(company, dsi.getCompany(), "Company");
+ assertEquals(manager, dsi.getManager(), "Manager");
+
+ assertEquals(author, si.getAuthor());
+ assertEquals(title, si.getTitle());
+ assertEquals(comments, si.getComments());
+ assertEquals(keywords, si.getKeywords());
+ assertEquals(subject, si.getSubject());
/*
* Read the custom properties. If there are no custom properties yet,
@@ -401,15 +397,15 @@ public final class TestMetaDataIPI {
/* Insert some custom properties into the container. */
// System.out.println(k1);
String a1 = (String) customProperties.get(k1);
- assertEquals("Key1", p1, a1);
+ assertEquals(p1, a1, "Key1");
String a2 = (String) customProperties.get(k2);
- assertEquals("Schl\u00fcssel2", p2, a2);
+ assertEquals(p2, a2, "Schl\u00fcssel2");
Integer a3 = (Integer) customProperties.get("Sample Number");
- assertEquals("Sample Number", 12345, (int)a3);
+ assertEquals(12345, (int)a3, "Sample Number");
Boolean a4 = (Boolean) customProperties.get("Sample Boolean");
- assertTrue("Sample Boolean", a4);
+ assertTrue(a4, "Sample Boolean");
Date a5 = (Date) customProperties.get("Sample Date");
- assertEquals("Custom Date:", date, a5);
+ assertEquals(date, a5, "Custom Date:");
}
@@ -479,38 +475,36 @@ public final class TestMetaDataIPI {
* serve as a container for custom properties.
*/
customProperties = dsi.getCustomProperties();
- if (customProperties == null) {
- fail();
- }
+ assertNotNull(customProperties);
/* Insert some custom properties into the container. */
Integer a3 = (Integer) customProperties.get("int");
- assertEquals("int", 12345, (int)a3);
+ assertEquals(12345, (int)a3, "int");
a3 = (Integer) customProperties.get("negint");
- assertEquals("negint", -12345, (int)a3);
+ assertEquals(-12345, (int)a3, "negint");
Long al = (Long) customProperties.get("neglong");
- assertEquals("neglong", -12345L, (long)al);
+ assertEquals(-12345L, (long)al, "neglong");
al = (Long) customProperties.get("long");
- assertEquals("long", 12345L, (long)al);
+ assertEquals(12345L, (long)al, "long");
Boolean a4 = (Boolean) customProperties.get("boolean");
- assertTrue("boolean", a4);
+ assertTrue(a4, "boolean");
Date a5 = (Date) customProperties.get("date");
- assertEquals("Custom Date:", date, a5);
+ assertEquals(date, a5, "Custom Date:");
Double d = (Double) customProperties.get("double");
- assertEquals("int", 12345.2, d, 0);
+ assertEquals(12345.2, d, 0, "int");
d = (Double) customProperties.get("negdouble");
- assertEquals("string", -12345.3, d, 0);
+ assertEquals(-12345.3, d, 0, "string");
String s = (String) customProperties.get("string");
- assertEquals("sring", "a String", s);
+ assertEquals("a String", s, "string");
assertTrue(customProperties.get("string") instanceof String);
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hpsf.basic;
-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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,7 +29,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hpsf.CustomProperties;
@@ -42,43 +42,35 @@ import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Tests some HPSF functionality by reading all property sets from all files
* in the "data" directory. If you want to ensure HPSF can deal with a certain
* OLE2 file, just add it to the "data" directory and run this test case.
*/
-@RunWith(Parameterized.class)
public class TestReadAllFiles {
private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
- @Parameters(name="{index}: {0} using {1}")
- public static Iterable<Object[]> files() {
+ public static Stream<Arguments> files() {
File hpsfTestDir = _samples.getFile("");
File[] files = hpsfTestDir.listFiles(f -> true);
Objects.requireNonNull(files, "Could not find directory " + hpsfTestDir.getAbsolutePath());
// convert to list of object-arrays for @Parameterized
- return Arrays.stream(files).
- map(file1 -> new Object[] {file1}).
- collect(Collectors.toList());
+ return Arrays.stream(files).map(Arguments::of);
}
- @Parameter()
- public File file;
-
/**
* This test methods reads all property set streams from all POI
* filesystems in the "data" directory.
*/
- @Test
- public void read() throws IOException, NoPropertySetStreamException, MarkUnsupportedException {
+ @ParameterizedTest
+ @MethodSource("files")
+ public void read(File file) throws IOException, NoPropertySetStreamException, MarkUnsupportedException {
/* Read the POI filesystem's property set streams: */
for (POIFile pf : Util.readPropertySets(file)) {
try (InputStream in = new ByteArrayInputStream(pf.getBytes())) {
@@ -102,8 +94,9 @@ public class TestReadAllFiles {
* the origin file and check whether they are equal.
* </ul>
*/
- @Test
- public void recreate() throws IOException, HPSFException {
+ @ParameterizedTest
+ @MethodSource("files")
+ public void recreate(File file) throws IOException, HPSFException {
/* Read the POI filesystem's property set streams: */
Map<String,PropertySet> psMap = new HashMap<>();
@@ -135,7 +128,7 @@ public class TestReadAllFiles {
String ps1str = ps1.toString().replace(" 00", " ").replace(".", " ").replaceAll("(?m)( +$|(size|offset): [0-9]+)","");
String ps2str = ps2.toString().replace(" 00", " ").replace(".", " ").replaceAll("(?m)( +$|(size|offset): [0-9]+)","");
- assertEquals("Equality for file " + file.getName(), ps1str, ps2str);
+ assertEquals(ps1str, ps2str, "Equality for file " + file.getName());
}
poiFs.close();
}
@@ -147,8 +140,9 @@ public class TestReadAllFiles {
* the document summary information stream in the root directory and calling
* its get... methods.
*/
- @Test
- public void readDocumentSummaryInformation() throws Exception {
+ @ParameterizedTest
+ @MethodSource("files")
+ public void readDocumentSummaryInformation(File file) throws Exception {
/* Read a test document <em>doc</em> into a POI filesystem. */
try (POIFSFileSystem poifs = new POIFSFileSystem(file, true)) {
final DirectoryEntry dir = poifs.getRoot();
@@ -189,8 +183,9 @@ public class TestReadAllFiles {
*
* @throws Exception if anything goes wrong.
*/
- @Test
- public void readCustomPropertiesFromFiles() throws Exception {
+ @ParameterizedTest
+ @MethodSource("files")
+ public void readCustomPropertiesFromFiles(File file) throws Exception {
/* Read a test document <em>doc</em> into a POI filesystem. */
try (POIFSFileSystem poifs = new POIFSFileSystem(file)) {
/*
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hpsf.basic;
-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 java.io.ByteArrayInputStream;
import java.io.File;
@@ -33,8 +33,8 @@ import org.apache.poi.hpsf.PropertySetFa
import org.apache.poi.hpsf.Section;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.util.CodePageUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests whether Unicode string can be read from a DocumentSummaryInformation.
@@ -55,7 +55,7 @@ public class TestUnicode {
* @exception FileNotFoundException if the file to be read does not exist.
* @exception IOException if any other I/O exception occurs
*/
- @Before
+ @BeforeEach
public void setUp() {
POIDataSamples samples = POIDataSamples.getHPSFInstance();
data = samples.getFile(POI_FS);
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java Thu Dec 24 18:42:29 2020
@@ -19,12 +19,14 @@ package org.apache.poi.hpsf.basic;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-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.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -71,8 +73,8 @@ import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.TempFile;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
/**
* Tests HPSF's writing functionality
@@ -120,7 +122,7 @@ public class TestWrite {
*
* @exception IOException if an I/O exception occurs
*/
- @Test(expected=NoFormatIDException.class)
+ @Test
public void withoutAFormatID() throws Exception {
final File filename = TempFile.createTempFile(POI_FS, ".doc");
@@ -134,7 +136,7 @@ public class TestWrite {
try (OutputStream out = new FileOutputStream(filename);
POIFSFileSystem poiFs = new POIFSFileSystem();
ByteArrayOutputStream psStream = new ByteArrayOutputStream()) {
- ps.write(psStream);
+ assertThrows(NoFormatIDException.class, () -> ps.write(psStream));
poiFs.createDocument(new ByteArrayInputStream(psStream.toByteArray()), SummaryInformation.DEFAULT_STREAM_NAME);
poiFs.writeFilesystem(out);
}
@@ -270,11 +272,7 @@ public class TestWrite {
final PropertySet[] psa = new PropertySet[1];
final POIFSReader r = new POIFSReader();
final POIFSReaderListener listener = (event) -> {
- try {
- psa[0] = PropertySetFactory.create(event.getStream());
- } catch (Exception ex) {
- fail(ex.getMessage());
- }
+ assertDoesNotThrow(() -> psa[0] = PropertySetFactory.create(event.getStream()));
};
r.registerListener(listener,STREAM_NAME);
@@ -291,13 +289,7 @@ public class TestWrite {
}
private static POIFSReaderListener getListener(List<PropertySet> psa) {
- return event -> {
- try {
- psa.add(PropertySetFactory.create(event.getStream()));
- } catch (Exception ex) {
- fail(ex.getMessage());
- }
- };
+ return event -> assertDoesNotThrow(() -> psa.add(PropertySetFactory.create(event.getStream())));
}
/**
@@ -307,7 +299,7 @@ public class TestWrite {
@Test
public void variantTypes() throws Exception {
final int codepage = CODEPAGE_DEFAULT;
- Assume.assumeTrue(IMPROPER_DEFAULT_CHARSET_MESSAGE, hasProperDefaultCharset());
+ Assumptions.assumeTrue(hasProperDefaultCharset(), IMPROPER_DEFAULT_CHARSET_MESSAGE);
check(Variant.VT_EMPTY, null, codepage);
check(Variant.VT_BOOL, Boolean.TRUE, codepage);
@@ -358,12 +350,9 @@ public class TestWrite {
final int[] invalidCodepages = new int[] {0, 1, 2, 4711, 815};
for (int cp : invalidCodepages) {
- try {
- checkString(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", cp);
- fail("UnsupportedEncodingException for codepage " + cp + " expected.");
- } catch (UnsupportedEncodingException ex) {
- /* This is the expected behaviour. */
- }
+ assertThrows(UnsupportedEncodingException.class,
+ () -> checkString(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", cp),
+ "UnsupportedEncodingException for codepage " + cp + " expected.");
}
}
@@ -683,7 +672,7 @@ public class TestWrite {
* Tests writing and reading back a proper dictionary with an invalid
* codepage. (HPSF writes Unicode dictionaries only.)
*/
- @Test(expected=UnsupportedEncodingException.class)
+ @Test
public void dictionaryWithInvalidCodepage() throws IOException, HPSFException {
final File copy = TempFile.createTempFile("Test-HPSF", "ole2");
copy.deleteOnExit();
@@ -703,7 +692,7 @@ public class TestWrite {
s.setFormatID(DocumentSummaryInformation.FORMAT_ID[0]);
int codepage = 12345;
s.setProperty(PropertyIDMap.PID_CODEPAGE, Variant.VT_I2, codepage);
- poiFs.createDocument(ps1.toInputStream(), "Test");
+ assertThrows(UnsupportedEncodingException.class, () -> poiFs.createDocument(ps1.toInputStream(), "Test"));
poiFs.writeFilesystem(out);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.hpsf.basic;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import 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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -51,8 +51,8 @@ import org.apache.poi.poifs.filesystem.P
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.TempFile;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* <p>Tests HPSF's high-level writing functionality for the well-known property
@@ -62,7 +62,7 @@ public class TestWriteWellKnown {
private static final String POI_FS = "TestWriteWellKnown.doc";
- @BeforeClass
+ @BeforeAll
public static void setUp() {
VariantSupport.setLogUnsupportedTypes(false);
}
@@ -125,7 +125,7 @@ public class TestWriteWellKnown {
cal.set(2002, 8, 8, 8, 8, 8);
P_LAST_SAVE_DATE_TIME = cal.getTime();
}
-
+
/**
* <p>This test method test the writing of properties in the well-known
* property set streams "SummaryInformation" and
@@ -172,7 +172,7 @@ public class TestWriteWellKnown {
@Test
public void testWriteWellKnown() throws Exception {
POIDataSamples _samples = POIDataSamples.getHPSFInstance();
-
+
final File doc1 = TempFile.createTempFile("POI_HPSF_Test1.", ".tmp");
final File doc2 = TempFile.createTempFile("POI_HPSF_Test2.", ".tmp");
final File doc3 = TempFile.createTempFile("POI_HPSF_Test3.", ".tmp");
@@ -182,14 +182,14 @@ public class TestWriteWellKnown {
IOUtils.copy(fis, fos);
fos.close();
fis.close();
-
+
CustomProperties cps1 = write1stFile(doc1, doc2);
CustomProperties cps2 = write2ndFile(doc2, doc3);
write3rdFile(doc3);
-
+
assertEquals(cps1, cps2);
}
-
+
/*
* Write all properties supported by HPSF to the summary information
* (e.g. author, edit date, application name) and to the document
@@ -268,17 +268,17 @@ public class TestWriteWellKnown {
cps.put("min_Long", MIN_LONG);
cps.put("max_Double", MAX_DOUBLE);
cps.put("min_Double", MIN_DOUBLE);
-
+
// Check the keys went in
assertTrue(cps.containsKey("Schl\u00fcssel \u00e4"));
assertTrue(cps.containsKey("Boolean"));
-
+
// Check the values went in
assertEquals("Wert \u00e4", cps.get("Schl\u00fcssel \u00e4"));
assertEquals(Boolean.TRUE, cps.get("Boolean"));
assertTrue(cps.containsValue(Boolean.TRUE));
assertTrue(cps.containsValue("Wert \u00e4"));
-
+
// Check that things that aren't in aren't in
assertFalse(cps.containsKey("False Boolean"));
assertFalse(cps.containsValue(Boolean.FALSE));
@@ -286,7 +286,7 @@ public class TestWriteWellKnown {
// Save as our custom properties
dsi.setCustomProperties(cps);
-
+
/* Write the summary information stream and the document summary
* information stream to the POI filesystem. */
si.write(poifs.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME);
@@ -298,10 +298,10 @@ public class TestWriteWellKnown {
poifs.writeFilesystem(out);
out.close();
poifs.close();
-
+
return cps;
}
-
+
/*
* Open <em>doc2</em> for reading and check summary information and
* document summary information. All properties written before must be
@@ -419,10 +419,10 @@ public class TestWriteWellKnown {
poifs.writeFilesystem(out);
out.close();
poifs.close();
-
+
return cps;
}
-
+
/*
* Open {@code doc3} for reading and check summary information
* and document summary information. All properties removed before must not
@@ -491,7 +491,7 @@ public class TestWriteWellKnown {
dis.close();
return si;
}
-
+
static DocumentSummaryInformation getDocumentSummaryInformation(POIFSFileSystem poifs)
throws IOException, NoPropertySetStreamException, UnexpectedPropertySetTypeException {
if (!poifs.getRoot().hasEntry(DocumentSummaryInformation.DEFAULT_STREAM_NAME)) {
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java Thu Dec 24 18:42:29 2020
@@ -18,7 +18,8 @@
package org.apache.poi.hpsf.basic;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.FileNotFoundException;
@@ -47,7 +48,7 @@ final class Util {
* as an array of {@link POIFile} instances. This method loads all
* files into memory and thus does not cope well with large POI
* filessystems.</p>
- *
+ *
* @param poiFs The name of the POI filesystem as seen by the
* operating system. (This is the "filename".)
*
@@ -55,28 +56,24 @@ final class Util {
*
* @return The POI files. The elements are ordered in the same way
* as the files in the POI filesystem.
- *
- * @exception FileNotFoundException if the file containing the POI
+ *
+ * @exception FileNotFoundException if the file containing the POI
* filesystem does not exist
- *
+ *
* @exception IOException if an I/O exception occurs
*/
static List<POIFile> readPOIFiles(final File poiFs, final String... poiFiles) throws IOException {
final List<POIFile> files = new ArrayList<>();
POIFSReader r = new POIFSReader();
- POIFSReaderListener pfl = event -> {
- try {
- final POIFile f = new POIFile();
- f.setName(event.getName());
- f.setPath(event.getPath());
- final InputStream in = event.getStream();
- f.setBytes(IOUtils.toByteArray(in));
- in.close();
- files.add(f);
- } catch (IOException ex) {
- fail(ex.getMessage());
- }
- };
+ POIFSReaderListener pfl = event -> assertDoesNotThrow(() -> {
+ final POIFile f = new POIFile();
+ f.setName(event.getName());
+ f.setPath(event.getPath());
+ final InputStream in = event.getStream();
+ f.setBytes(IOUtils.toByteArray(in));
+ in.close();
+ files.add(f);
+ });
if (poiFiles.length == 0) {
/* Register the listener for all POI files. */
r.registerListener(pfl);
@@ -98,32 +95,28 @@ final class Util {
* <p>Read all files from a POI filesystem which are property set streams
* and returns them as an array of {@link org.apache.poi.hpsf.PropertySet}
* instances.</p>
- *
+ *
* @param poiFs The name of the POI filesystem as seen by the
* operating system. (This is the "filename".)
*
* @return The property sets. The elements are ordered in the same way
* as the files in the POI filesystem.
- *
+ *
* @exception IOException if an I/O exception occurs
*/
static List<POIFile> readPropertySets(final File poiFs) throws IOException {
final List<POIFile> files = new ArrayList<>(7);
final POIFSReader r = new POIFSReader();
- final POIFSReaderListener pfl = event -> {
- try {
- final POIFile f = new POIFile();
- f.setName(event.getName());
- f.setPath(event.getPath());
- final InputStream in = event.getStream();
- if (PropertySet.isPropertySetStream(in)) {
- f.setBytes(IOUtils.toByteArray(in));
- files.add(f);
- }
- } catch (Exception ex) {
- fail(ex.getMessage());
+ final POIFSReaderListener pfl = event -> assertDoesNotThrow(() -> {
+ final POIFile f = new POIFile();
+ f.setName(event.getName());
+ f.setPath(event.getPath());
+ final InputStream in = event.getStream();
+ if (PropertySet.isPropertySetStream(in)) {
+ f.setBytes(IOUtils.toByteArray(in));
+ files.add(f);
}
- };
+ });
/* Register the listener for all POI files. */
r.registerListener(pfl);
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java Thu Dec 24 18:42:29 2020
@@ -18,8 +18,8 @@
package org.apache.poi.hpsf.extractor;
import static org.apache.poi.POITestCase.assertContains;
-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.io.InputStream;
@@ -30,7 +30,7 @@ import org.apache.poi.hssf.HSSFTestDataS
import org.apache.poi.hssf.extractor.ExcelExtractor;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestHPSFPropertiesExtractor {
private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java Thu Dec 24 18:42:29 2020
@@ -16,8 +16,8 @@
==================================================================== */
package org.apache.poi.hssf.dev;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.util.ArrayList;
@@ -25,53 +25,45 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.poi.POIDataSamples;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Base class for integration-style tests which iterate over all test-files
* and execute the same action to find out if any change breaks these applications.
- *
- * This test uses {@link Parameterized} to run the test for each file separatedely.
*/
-@RunWith(Parameterized.class)
public abstract class BaseTestIteratingXLS {
protected static final Map<String,Class<? extends Throwable>> EXCLUDED = new HashMap<>();
- @Parameters(name="{index}: {0}")
- public static Iterable<Object[]> files() {
+ private static Stream<Arguments> files() {
String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
if(dataDirName == null) {
dataDirName = "test-data";
}
- List<Object[]> files = new ArrayList<>();
+ List<Arguments> files = new ArrayList<>();
findFile(files, dataDirName + "/spreadsheet");
findFile(files, dataDirName + "/hpsf");
- return files;
+ return files.stream();
}
- private static void findFile(List<Object[]> list, String dir) {
+ private static void findFile(List<Arguments> list, String dir) {
String[] files = new File(dir).list((arg0, arg1) -> arg1.toLowerCase(Locale.ROOT).endsWith(".xls"));
-
- assertNotNull("Did not find any xls files in directory " + dir, files);
+ assertNotNull(files, "Did not find any xls files in directory " + dir);
for(String file : files) {
- list.add(new Object[]{new File(dir, file)});
- }
+ list.add(Arguments.of(new File(dir, file)));
}
+ }
- @Parameter
- public File file;
-
- @Test
- public void testMain() throws Exception {
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testMain(File file) throws Exception {
String fileName = file.getName();
Class<? extends Throwable> t = EXCLUDED.get(fileName);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java Thu Dec 24 18:42:29 2020
@@ -25,10 +25,10 @@ import org.apache.poi.hssf.OldExcelForma
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.NullOutputStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class TestBiffDrawingToXml extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java Thu Dec 24 18:42:29 2020
@@ -27,10 +27,10 @@ import org.apache.poi.poifs.filesystem.P
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.NullOutputStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class TestBiffViewer extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("35897-type4.xls", IllegalArgumentException.class); // unsupported crypto api header
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java Thu Dec 24 18:42:29 2020
@@ -25,10 +25,10 @@ import org.apache.poi.hssf.OldExcelForma
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.NullPrintStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class TestEFBiffViewer extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java Thu Dec 24 18:42:29 2020
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.dev;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.PrintStream;
@@ -26,10 +26,10 @@ import org.apache.poi.hssf.OldExcelForma
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.NullPrintStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class TestFormulaViewer extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java Thu Dec 24 18:42:29 2020
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.dev;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.PrintStream;
@@ -27,12 +27,12 @@ import org.apache.poi.hssf.OldExcelForma
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.NullPrintStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class TestReSave extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
@@ -84,7 +84,7 @@ public class TestReSave extends BaseTest
}
}
- @Ignore("Only used for local testing")
+ @Disabled("Only used for local testing")
@Test
public void testOneFile() throws Exception {
String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java Thu Dec 24 18:42:29 2020
@@ -23,10 +23,10 @@ import java.io.PrintStream;
import org.apache.poi.hssf.OldExcelFormatException;
import org.apache.poi.util.NullPrintStream;
import org.apache.poi.util.RecordFormatException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
public class TestRecordLister extends BaseTestIteratingXLS {
- @BeforeClass
+ @BeforeAll
public static void setup() {
EXCLUDED.clear();
EXCLUDED.put("46904.xls", OldExcelFormatException.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org