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 [19/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/converter/AbstractWordUtilsTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/AbstractWordUtilsTest.java Thu Dec 24 18:42:29 2020
@@ -16,13 +16,13 @@
==================================================================== */
package org.apache.poi.hwpf.converter;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.usermodel.Range;
import org.apache.poi.hwpf.usermodel.Table;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link AbstractWordUtils}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java Thu Dec 24 18:42:29 2020
@@ -16,9 +16,9 @@
==================================================================== */
package org.apache.poi.hwpf.converter;
-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 class TestNumberFormatter {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java Thu Dec 24 18:42:29 2020
@@ -16,13 +16,17 @@
==================================================================== */
package org.apache.poi.hwpf.converter;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
+import java.io.FilenameFilter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -32,46 +36,39 @@ import javax.xml.transform.stream.Stream
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocumentCore;
import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-@RunWith(Parameterized.class)
public class TestWordToConverterSuite
{
/**
* YK: a quick hack to exclude failing documents from the suite.
*/
- private static List<String> failingFiles = Arrays
- .asList( "ProblemExtracting.doc",
- "Bug50955.doc" //basic extraction works,
- // but these extractors modify the document,
- // which is a no-go for this Word 6.0 file
- );
-
- @Parameterized.Parameters(name="{index}: {0}")
- public static Iterable<Object[]> files() {
- List<Object[]> files = new ArrayList<>();
- File directory = POIDataSamples.getDocumentInstance().getFile(
- "../document" );
- for ( final File child : directory.listFiles((dir,name) -> name.endsWith( ".doc" ) && !failingFiles.contains( name ))) {
- files.add(new Object[] { child });
- }
-
- return files;
+ private static final List<String> failingFiles = Arrays.asList(
+ "ProblemExtracting.doc",
+ // basic extraction works, but these extractors modify the document, which is a no-go for this Word 6.0 file
+ "Bug50955.doc",
+ // password protected files
+ "PasswordProtected.doc",
+ "password_tika_binaryrc4.doc",
+ "password_password_cryptoapi.doc",
+ // WORD 2.0 file
+ "word2.doc"
+ );
+
+ public static Stream<Arguments> files() {
+ File directory = POIDataSamples.getDocumentInstance().getFile("../document" );
+ FilenameFilter ff = (dir, name) -> name.endsWith(".doc") && !failingFiles.contains(name);
+ File[] docs = directory.listFiles(ff);
+ assertNotNull(docs);
+ return Arrays.stream(docs).map(Arguments::of);
}
- @Parameterized.Parameter
- public File child;
-
- @Test
- public void testFo() throws Exception {
- HWPFDocumentCore hwpfDocument;
- try {
- hwpfDocument = AbstractWordUtils.loadDoc( child );
- } catch ( Exception exc ) {
- return;
- }
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testFo(File child) throws Exception {
+ HWPFDocumentCore hwpfDocument = AbstractWordUtils.loadDoc( child );
WordToFoConverter wordToFoConverter = new WordToFoConverter(
XMLHelper.newDocumentBuilder().newDocument() );
@@ -88,15 +85,10 @@ public class TestWordToConverterSuite
assertNotNull(stringWriter.toString());
}
- @Test
- public void testHtml() throws Exception
- {
- HWPFDocumentCore hwpfDocument;
- try {
- hwpfDocument = AbstractWordUtils.loadDoc( child );
- } catch ( Exception exc ) {
- return;
- }
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testHtml(File child) throws Exception {
+ HWPFDocumentCore hwpfDocument = AbstractWordUtils.loadDoc( child );
WordToHtmlConverter wordToHtmlConverter = new WordToHtmlConverter(
XMLHelper.newDocumentBuilder().newDocument() );
@@ -114,15 +106,10 @@ public class TestWordToConverterSuite
assertNotNull(stringWriter.toString());
}
- @Test
- public void testText() throws Exception
- {
- HWPFDocumentCore wordDocument;
- try {
- wordDocument = AbstractWordUtils.loadDoc( child );
- } catch ( Exception exc ) {
- return;
- }
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testText(File child) throws Exception {
+ HWPFDocumentCore wordDocument = AbstractWordUtils.loadDoc( child );
WordToTextConverter wordToTextConverter = new WordToTextConverter(
XMLHelper.newDocumentBuilder().newDocument() );
@@ -140,4 +127,6 @@ public class TestWordToConverterSuite
// no exceptions
assertNotNull(stringWriter.toString());
}
+
+
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java Thu Dec 24 18:42:29 2020
@@ -29,7 +29,7 @@ import javax.xml.transform.stream.Stream
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link WordToFoConverter}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hwpf.converter;
import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import java.io.StringWriter;
@@ -29,7 +29,7 @@ import javax.xml.transform.stream.Stream
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
/**
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hwpf.converter;
import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestWordToTextConverter {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java Thu Dec 24 18:42:29 2020
@@ -21,26 +21,26 @@ import java.io.PrintStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.util.NullPrintStream;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class TestHWPFLister {
private static PrintStream oldStdOut;
- @BeforeClass
+ @BeforeAll
public static void muteStdout() {
oldStdOut = System.out;
System.setOut(new NullPrintStream());
}
- @AfterClass
+ @AfterAll
public static void restoreStdout() {
System.setOut(oldStdOut);
}
- @After
+ @AfterEach
public void tearDown() {
// the main-method sets these properties, we need to revert them here to not affect other tests
System.clearProperty("org.apache.poi.hwpf.preserveBinTables");
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java Thu Dec 24 18:42:29 2020
@@ -17,20 +17,19 @@
package org.apache.poi.hwpf.extractor;
-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.junit.Test;
-
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.usermodel.Paragraph;
import org.apache.poi.hwpf.usermodel.Range;
import org.apache.poi.util.StringUtil;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test the different routes to extracting text
@@ -57,12 +56,12 @@ public final class TestDifferentRoutes {
private HWPFDocument doc;
- @Before
+ @BeforeEach
public void setUp() {
doc = HWPFTestDataSamples.openSampleFile("test2.doc");
}
-
- @After
+
+ @AfterEach
public void tearDown() throws IOException {
doc.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java Thu Dec 24 18:42:29 2020
@@ -19,9 +19,10 @@ package org.apache.poi.hwpf.extractor;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertStartsWith;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -36,15 +37,15 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.StringUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the different routes to extracting text
*/
public final class TestWordExtractor {
- private static POIDataSamples docTests = POIDataSamples.getDocumentInstance();
-
+ private static final POIDataSamples docTests = POIDataSamples.getDocumentInstance();
+
private static void assertEqualsTrim( String expected, String actual )
{
String newExpected = expected.replaceAll( "\r\n", "\n" )
@@ -53,7 +54,7 @@ public final class TestWordExtractor {
.replaceAll( "\r", "\n" ).trim();
assertEquals( newExpected, newActual );
}
-
+
private static void assertExtractedContains(String[] extracted, String needle) {
String endnote = StringUtil.join(extracted, "");
assertContains(endnote, needle);
@@ -175,7 +176,7 @@ public final class TestWordExtractor {
extractorB.close();
docB.close();
-
+
fs.close();
}
@@ -233,7 +234,7 @@ public final class TestWordExtractor {
assertExtractedContains(extractor.getFootnoteText(), "TestFootnote");
assertEquals(0x00, doc.getRange().getSection(0).getFootnoteNumberingFormat()); // msonfcArabic
assertEquals(0x00, doc.getRange().getSection(0).getFootnoteRestartQualifier()); // rncCont
- assertEquals(0, doc.getRange().getSection(0).getFootnoteNumberingOffset());
+ assertEquals(0, doc.getRange().getSection(0).getFootnoteNumberingOffset());
assertEquals(1, doc.getFootnotes().getNotesCount());
extractor.close();
doc.close();
@@ -247,7 +248,7 @@ public final class TestWordExtractor {
assertExtractedContains(extractor.getEndnoteText(), "TestEndnote");
assertEquals(0x02, doc.getRange().getSection(0).getEndnoteNumberingFormat()); // msonfcLCRoman
assertEquals(0x00, doc.getRange().getSection(0).getEndnoteRestartQualifier()); // rncCont
- assertEquals(0, doc.getRange().getSection(0).getEndnoteNumberingOffset());
+ assertEquals(0, doc.getRange().getSection(0).getEndnoteNumberingOffset());
assertEquals(1, doc.getEndnotes().getNotesCount());
extractor.close();
doc.close();
@@ -259,13 +260,13 @@ public final class TestWordExtractor {
assertExtractedContains(extractor.getCommentsText(), "TestComment");
extractor.close();
}
-
- @Test(expected=OldWordFileFormatException.class)
- public void testWord95_WordExtractor() throws Exception {
+
+ @Test
+ public void testWord95_WordExtractor() {
// Too old for the default
- openExtractor("Word95.doc").close();
+ assertThrows(OldWordFileFormatException.class, () -> openExtractor("Word95.doc"));
}
-
+
@Test
public void testWord95() throws Exception {
// Can work with the special one
@@ -279,7 +280,7 @@ public final class TestWordExtractor {
assertContains(text, "Paragraph 2");
assertContains(text, "Paragraph 3. Has some RED text and some BLUE BOLD text in it");
assertContains(text, "Last (4th) paragraph");
-
+
@SuppressWarnings("deprecation")
String[] tp = w6e.getParagraphText();
assertEquals(7, tp.length);
@@ -293,12 +294,12 @@ public final class TestWordExtractor {
w6e.close();
}
- @Test(expected=OldWordFileFormatException.class)
- public void testWord6_WordExtractor() throws IOException {
+ @Test
+ public void testWord6_WordExtractor() {
// Too old for the default
- openExtractor("Word6.doc").close();
+ assertThrows(OldWordFileFormatException.class, () -> openExtractor("Word6.doc"));
}
-
+
@Test
public void testWord6() throws Exception {
try (InputStream is = docTests.openResourceAsStream("Word6.doc");
@@ -321,7 +322,7 @@ public final class TestWordExtractor {
String text = extractor.getText();
assertContains(text, "\u0425\u0425\u0425\u0425\u0425");
assertContains(text, "\u0423\u0423\u0423\u0423\u0423");
-
+
extractor.close();
}
@@ -334,7 +335,7 @@ public final class TestWordExtractor {
assertStartsWith(text, "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435");
extractor.close();
}
-
+
/**
* Tests that we can work with both {@link POIFSFileSystem}
* and {@link POIFSFileSystem}
@@ -400,7 +401,7 @@ public final class TestWordExtractor {
assertContains(text, "COMPANY = sample company");
}
}
-
+
private WordExtractor openExtractor(String fileName) throws IOException {
try (InputStream is = docTests.openResourceAsStream(fileName)) {
return new WordExtractor(is);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hwpf.extractor;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.io.InputStream;
@@ -26,7 +26,7 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.extractor.POITextExtractor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for bugs with the WordExtractor
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/PlfLfoTest.java Thu Dec 24 18:42:29 2020
@@ -18,9 +18,11 @@
*/
package org.apache.poi.hwpf.model;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
public class PlfLfoTest {
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hwpf.model;
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;
@@ -25,7 +25,7 @@ import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.usermodel.Bookmark;
import org.apache.poi.hwpf.usermodel.Bookmarks;
import org.apache.poi.hwpf.usermodel.Range;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link BookmarksTables} and default implementation of
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.util.List;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-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;
public final class TestCHPBinTable {
private CHPBinTable _cHPBinTable;
@@ -73,14 +73,14 @@ public final class TestCHPBinTable {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
_hWPFDocFixture.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_cHPBinTable = null;
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.hwpf.model;
+import static org.apache.poi.POITestCase.assertReflectEquals;
+
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.model.types.DOPAbstractType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.apache.poi.POITestCase.assertReflectEquals;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
// TODO: Add DocumentProperties#equals ???
@@ -31,7 +31,7 @@ public final class TestDocumentPropertie
private DocumentProperties _documentProperties;
private HWPFDocFixture _hWPFDocFixture;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// TODO verify the constructors
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
@@ -39,7 +39,7 @@ public final class TestDocumentPropertie
_documentProperties = new DocumentProperties(_hWPFDocFixture._tableStream, _hWPFDocFixture._fib.getFcDop(), _hWPFDocFixture._fib.getLcbDop());
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_documentProperties = null;
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java Thu Dec 24 18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.hwpf.model;
import static org.apache.poi.POITestCase.assertReflectEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.poi.hwpf.HWPFDocFixture;
-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;
public final class TestFileInformationBlock {
private FileInformationBlock _fileInformationBlock;
@@ -43,7 +43,7 @@ public final class TestFileInformationBl
assertNotNull(_fileInformationBlock.toString());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
/** @todo verify the constructors */
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
@@ -51,7 +51,7 @@ public final class TestFileInformationBl
_fileInformationBlock = _hWPFDocFixture._fib;
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_fileInformationBlock = null;
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java Thu Dec 24 18:42:29 2020
@@ -17,17 +17,16 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-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;
public final class TestFontTable {
private FontTable _fontTable;
@@ -58,13 +57,13 @@ public final class TestFontTable {
}
- @Before
+ @BeforeEach
public void setUp() throws IOException {
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
_hWPFDocFixture.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
_hWPFDocFixture.tearDown();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.poi.hwpf.HWPFTestCase;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestListTables extends HWPFTestCase {
@@ -36,21 +36,21 @@ public final class TestListTables extend
int listOffset = fib.getFcPlfLst();
int lfoOffset = fib.getFcPlfLfo();
int bLfoOffset = fib.getLcbPlfLfo();
-
+
if (listOffset != 0 && bLfoOffset != 0) {
// TODO: this is actually never executed ...
-
+
ListTables listTables = new ListTables(tableStream, listOffset, lfoOffset, bLfoOffset);
HWPFFileSystem fileSys = new HWPFFileSystem();
-
+
ByteArrayOutputStream tableOut = fileSys.getStream("1Table");
-
+
listTables.writeListDataTo(fib, tableOut);
listTables.writeListOverridesTo(fib, tableOut);
-
+
ListTables newTables = new ListTables(tableOut.toByteArray(),
fib.getFcPlfLst(), fib.getFcPlfLfo(), fib.getLcbPlfLfo());
-
+
assertEquals(listTables, newTables);
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java Thu Dec 24 18:42:29 2020
@@ -16,12 +16,12 @@
==================================================================== */
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.usermodel.Notes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link NotesTables} and default implementation of
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hwpf.model;
-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.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestPAPBinTable {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.util.LittleEndian;
-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;
public final class TestPlexOfCps {
private PlexOfCps _plexOfCps;
@@ -59,7 +59,7 @@ public final class TestPlexOfCps {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
/**@todo verify the constructors*/
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
@@ -67,7 +67,7 @@ public final class TestPlexOfCps {
_hWPFDocFixture.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_plexOfCps = null;
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java Thu Dec 24 18:42:29 2020
@@ -19,11 +19,11 @@ package org.apache.poi.hwpf.model;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-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;
/**
* Test the table which handles author revision marks
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,7 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link SavedByTable} and {@link SavedByEntry}.
@@ -64,8 +64,7 @@ public final class TestSavedByTable {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("saved-by-table.doc");
// Check what we just read.
- assertEquals("List of saved-by entries was not as expected", expected,
- doc.getSavedByTable().getEntries());
+ assertEquals( expected, doc.getSavedByTable().getEntries(), "List of saved-by entries was not as expected" );
// Now write the entire document out, and read it back in...
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
@@ -75,9 +74,8 @@ public final class TestSavedByTable {
HWPFDocument copy = new HWPFDocument(copyStream);
// And check again.
- assertEquals("List of saved-by entries was incorrect after writing",
- expected, copy.getSavedByTable().getEntries());
-
+ assertEquals( expected, copy.getSavedByTable().getEntries(), "List of saved-by entries was incorrect after writing" );
+
copy.close();
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.util.List;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-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;
public final class TestSectionTable {
private HWPFDocFixture _hWPFDocFixture;
@@ -85,7 +85,7 @@ public final class TestSectionTable {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
/*@todo verify the constructors*/
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
@@ -93,7 +93,7 @@ public final class TestSectionTable {
_hWPFDocFixture.setUp();
}
- @After
+ @AfterEach
public void tearDown() {
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hwpf.model;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.poi.hwpf.HWPFDocFixture;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-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;
public final class TestStyleSheet {
private StyleSheet _styleSheet;
@@ -64,7 +64,7 @@ public final class TestStyleSheet {
assertEquals(newStyleSheet, _styleSheet);
}
- @Before
+ @BeforeEach
public void setUp() throws IOException {
/**@todo verify the constructors*/
_hWPFDocFixture = new HWPFDocFixture(this, HWPFDocFixture.DEFAULT_TEST_FILE);
@@ -77,7 +77,7 @@ public final class TestStyleSheet {
_styleSheet = new StyleSheet(tableStream, fib.getFcStshf());
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_styleSheet = null;
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java Thu Dec 24 18:42:29 2020
@@ -18,9 +18,9 @@
package org.apache.poi.hwpf.model;
import static org.apache.poi.POITestCase.assertStartsWith;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-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.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,15 +29,15 @@ import org.apache.poi.hwpf.HWPFDocFixtur
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.io.HWPFFileSystem;
-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;
@SuppressWarnings("deprecation")
public final class TestTextPieceTable {
private HWPFDocFixture _hWPFDocFixture;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty("org.apache.poi.hwpf.preserveTextTable",
Boolean.TRUE.toString());
@@ -47,7 +47,7 @@ public final class TestTextPieceTable {
_hWPFDocFixture.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
_hWPFDocFixture.tearDown();
_hWPFDocFixture = null;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractTypeTest.java Thu Dec 24 18:42:29 2020
@@ -16,9 +16,9 @@
==================================================================== */
package org.apache.poi.hwpf.model.types;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link LFOLVLBaseAbstractType}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/LVLFAbstractTypeTest.java Thu Dec 24 18:42:29 2020
@@ -16,9 +16,9 @@
==================================================================== */
package org.apache.poi.hwpf.model.types;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link LVLFAbstractType}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java Thu Dec 24 18:42:29 2020
@@ -18,10 +18,10 @@
*/
package org.apache.poi.hwpf.sprm;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwpf.usermodel.TableProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TableSprmUncompressorTest {
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java Thu Dec 24 18:42:29 2020
@@ -19,8 +19,8 @@
package org.apache.poi.hwpf.sprm;
-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.ByteArrayOutputStream;
@@ -32,7 +32,7 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.usermodel.Paragraph;
import org.apache.poi.hwpf.usermodel.Range;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestSprms {
private static HWPFDocument reload( HWPFDocument hwpfDocument )
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.hwpf.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 org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* API for BorderCode, see Bugzill 49919
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,12 @@
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertNotNull;
import static org.apache.poi.POITestCase.assertContains;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
+import org.junit.jupiter.api.Test;
public final class TestBug46610 {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java Thu Dec 24 18:42:29 2020
@@ -16,49 +16,44 @@
==================================================================== */
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.util.HexDump;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
/**
* Bug 47563 - Exception when working with table
*/
-@RunWith(Parameterized.class)
public class TestBug47563 {
- @Parameterized.Parameter()
- public int rows;
- @Parameterized.Parameter(1)
- public int columns;
-
- @Parameterized.Parameters(name="rows: {0}, columns: {1}")
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<>();
-
- data.add(new Object[] {1, 5});
- data.add(new Object[] {1, 6});
- data.add(new Object[] {5, 1});
- data.add(new Object[] {6, 1});
- data.add(new Object[] {2, 2});
- data.add(new Object[] {3, 2});
- data.add(new Object[] {2, 3}); //
- data.add(new Object[] {3, 3});
- return data;
+ public static Stream<Arguments> data() {
+ List<Arguments> data = new ArrayList<>();
+
+ data.add(Arguments.of( 1, 5 ));
+ data.add(Arguments.of( 1, 6 ));
+ data.add(Arguments.of( 5, 1 ));
+ data.add(Arguments.of( 6, 1 ));
+ data.add(Arguments.of( 2, 2 ));
+ data.add(Arguments.of( 3, 2 ));
+ data.add(Arguments.of( 2, 3 ));
+ data.add(Arguments.of( 3, 3 ));
+
+ return data.stream();
}
- @Test
- public void test() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void test(int rows, int columns) throws Exception {
// POI apparently can't create a document from scratch,
// so we need an existing empty dummy document
try (HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc")) {
@@ -93,10 +88,8 @@ public class TestBug47563 {
int mustBeAfter = 0;
for (int i = 0; i < rows * columns; i++) {
int next = text.indexOf(Integer.toString(i), mustBeAfter);
- assertTrue("Test with " + rows + "/" + columns + ": Should find " + i +
- " but did not find it (" + next + ") with " + mustBeAfter + " in " + textBytes + "\n" +
- text.indexOf(Integer.toString(i), mustBeAfter),
- next != -1);
+ assertTrue( next != -1, "Test with " + rows + "/" + columns + ": Should find " + i +
+ " but did not find it (" + next + ") with " + mustBeAfter + " in " + textBytes + "\n" + next);
mustBeAfter = next;
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
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 org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.StyleSheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public final class TestBug49820 {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java Thu Dec 24 18:42:29 2020
@@ -16,8 +16,8 @@
==================================================================== */
package org.apache.poi.hwpf.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;
@@ -25,7 +25,7 @@ import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.LFO;
import org.apache.poi.hwpf.model.ListLevel;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestBug50075 {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java Thu Dec 24 18:42:29 2020
@@ -18,9 +18,10 @@ package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertNotContained;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -41,17 +42,15 @@ import org.apache.poi.hwpf.converter.Wor
import org.apache.poi.hwpf.converter.WordToTextConverter;
import org.apache.poi.hwpf.extractor.Word6Extractor;
import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.hwpf.model.FieldsDocumentPart;
import org.apache.poi.hwpf.model.FileInformationBlock;
import org.apache.poi.hwpf.model.PicturesTable;
-import org.apache.poi.hwpf.model.PlexOfField;
import org.apache.poi.hwpf.model.SubdocumentType;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.XMLHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
/**
@@ -78,9 +77,8 @@ public class TestBugs{
Paragraph actParagraph = actual.getParagraph(p);
assertEqualsIgnoreNewline(expParagraph.text(), actParagraph.text());
- assertEquals("Different isInTable flags for paragraphs #" + p
- + " -- " + expParagraph + " -- " + actParagraph + ".",
- expParagraph.isInTable(), actParagraph.isInTable());
+ assertEquals( expParagraph.isInTable(), actParagraph.isInTable(), "Different isInTable flags for paragraphs #" + p
+ + " -- " + expParagraph + " -- " + actParagraph + "." );
assertEquals(expParagraph.isTableRowEnd(),
actParagraph.isTableRowEnd());
@@ -476,7 +474,7 @@ public class TestBugs{
for (String filename : filenames) {
HWPFDocument hwpfDocument = HWPFTestDataSamples.openSampleFile(filename);
- assertNotNull(filename, hwpfDocument.getPicturesTable().getAllPictures());
+ assertNotNull( hwpfDocument.getPicturesTable().getAllPictures(), filename );
hwpfDocument.close();
}
@@ -832,13 +830,11 @@ public class TestBugs{
assertNotNull(hwpfDocument);
}
- @Test(expected=ArrayIndexOutOfBoundsException.class)
+ @Test
public void test57603SevenRowTable() throws Exception {
- HWPFDocument hwpfDocument = HWPFTestDataSamples.openSampleFile("57603-seven_columns.doc");
- HWPFDocument hwpfDocument2 = HWPFTestDataSamples.writeOutAndReadBack(hwpfDocument);
- assertNotNull(hwpfDocument2);
- hwpfDocument2.close();
- hwpfDocument.close();
+ try (HWPFDocument hwpfDocument = HWPFTestDataSamples.openSampleFile("57603-seven_columns.doc")) {
+ assertThrows(ArrayIndexOutOfBoundsException.class, () -> HWPFTestDataSamples.writeOutAndReadBack(hwpfDocument));
+ }
}
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java Thu Dec 24 18:42:29 2020
@@ -18,7 +18,10 @@
package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.apache.poi.hwpf.HWPFTestDataSamples.openOldSampleFile;
+import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -27,10 +30,9 @@ import org.apache.poi.OldFileFormatExcep
import org.apache.poi.common.usermodel.fonts.FontCharset;
import org.apache.poi.hwpf.HWPFOldDocument;
import org.apache.poi.hwpf.HWPFTestCase;
-import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.extractor.Word6Extractor;
import org.apache.poi.hwpf.model.OldFontTable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Word 6 and Word 95 support
@@ -39,16 +41,16 @@ public final class TestHWPFOldDocument e
/**
* Test a simple Word 6 document
*/
- @Test(expected=OldFileFormatException.class)
- public void testWord6hwpf() throws IOException {
+ @Test
+ public void testWord6hwpf() {
// Can't open as HWPFDocument
- HWPFTestDataSamples.openSampleFile("Word6.doc");
+ assertThrows(OldFileFormatException.class, () -> openSampleFile("Word6.doc"));
}
@Test
public void testWord6hwpfOld() throws IOException {
// Open
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6.doc");
+ HWPFOldDocument doc = openOldSampleFile("Word6.doc");
// Check
assertEquals(1, doc.getRange().numSections());
@@ -63,32 +65,31 @@ public final class TestHWPFOldDocument e
/**
* Test a simple Word 2 document
*/
- @Test(expected=IllegalArgumentException.class)
- public void testWord2hwpf() throws IOException {
+ @Test
+ public void testWord2hwpf() {
// Can't open as HWPFDocument
- HWPFTestDataSamples.openSampleFile("word2.doc");
+ assertThrows(IllegalArgumentException.class, () -> openSampleFile("word2.doc"));
}
- @Test(expected=RuntimeException.class)
- public void testWord2hwpfOld() throws IOException {
+ @Test
+ public void testWord2hwpfOld() {
// Open
- HWPFTestDataSamples.openOldSampleFile("word2.doc");
+ assertThrows(RuntimeException.class, () -> openOldSampleFile("word2.doc"));
}
/**
* Test a simple Word 95 document
*/
- @Test(expected=OldFileFormatException.class)
- public void testWord95hwpf() throws IOException {
+ @Test
+ public void testWord95hwpf() {
// Can't open as HWPFDocument
- HWPFTestDataSamples.openSampleFile("Word95.doc");
+ assertThrows(OldFileFormatException.class, () -> openSampleFile("Word95.doc"));
}
-
+
@Test
public void testWord95hwpfOld() throws IOException {
// Open
- HWPFOldDocument doc = HWPFTestDataSamples
- .openOldSampleFile("Word95.doc");
+ HWPFOldDocument doc = openOldSampleFile("Word95.doc");
// Check
assertEquals(1, doc.getRange().numSections());
@@ -126,7 +127,7 @@ public final class TestHWPFOldDocument e
*/
@Test
public void testWord6Sections() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6_sections.doc");
+ HWPFOldDocument doc = openOldSampleFile("Word6_sections.doc");
assertEquals(3, doc.getRange().numSections());
assertEquals(6, doc.getRange().numParagraphs());
@@ -135,7 +136,7 @@ public final class TestHWPFOldDocument e
doc.getRange().getParagraph(0).text());
assertEquals("\r", doc.getRange().getParagraph(1).text());
// Section / line?
- assertEquals("\u000c", doc.getRange().getParagraph(2).text());
+ assertEquals("\u000c", doc.getRange().getParagraph(2).text());
assertEquals("This is a new section.\r",
doc.getRange().getParagraph(3).text());
// Section / line?
@@ -150,8 +151,7 @@ public final class TestHWPFOldDocument e
*/
@Test
public void testWord6Sections2() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples
- .openOldSampleFile("Word6_sections2.doc");
+ HWPFOldDocument doc = openOldSampleFile("Word6_sections2.doc");
assertEquals(1, doc.getRange().numSections());
assertEquals(57, doc.getRange().numParagraphs());
@@ -164,7 +164,7 @@ public final class TestHWPFOldDocument e
@Test
public void testDefaultCodePageEncoding() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug60942.doc");
+ HWPFOldDocument doc = openOldSampleFile("Bug60942.doc");
Word6Extractor ex = new Word6Extractor(doc);
String txt = ex.getText();
assertContains(txt, "BERTHOD");
@@ -179,7 +179,7 @@ public final class TestHWPFOldDocument e
@Test
public void testCodePageBug50955() throws IOException {
//windows 1251
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug50955.doc");
+ HWPFOldDocument doc = openOldSampleFile("Bug50955.doc");
Word6Extractor ex = new Word6Extractor(doc);
StringBuilder sb = new StringBuilder();
@@ -197,7 +197,7 @@ public final class TestHWPFOldDocument e
//see https://bz.apache.org/ooo/show_bug.cgi?id=12445 for the inspiration
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug60936.doc");
+ HWPFOldDocument doc = openOldSampleFile("Bug60936.doc");
Word6Extractor ex = new Word6Extractor(doc);
StringBuilder sb = new StringBuilder();
for (String p : ex.getParagraphText()) {
@@ -210,7 +210,7 @@ public final class TestHWPFOldDocument e
@Test
public void testOldFontTableEncoding() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug51944.doc");
+ HWPFOldDocument doc = openOldSampleFile("Bug51944.doc");
OldFontTable oldFontTable = doc.getOldFontTable();
assertEquals(5, oldFontTable.getFontNames().length);
assertEquals("\u7D30\u660E\u9AD4", oldFontTable.getFontNames()[0].getMainFontName());
@@ -221,8 +221,8 @@ public final class TestHWPFOldDocument e
}
@Test
- public void testOldFontTableAltName() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug60942b.doc");
+ public void testOldFontTableAltName() {
+ HWPFOldDocument doc = openOldSampleFile("Bug60942b.doc");
OldFontTable oldFontTable = doc.getOldFontTable();
assertEquals(5, oldFontTable.getFontNames().length);
assertEquals("Roboto", oldFontTable.getFontNames()[3].getMainFontName());
@@ -234,7 +234,7 @@ public final class TestHWPFOldDocument e
@Test
public void test51944() throws IOException {
- HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug51944.doc");
+ HWPFOldDocument doc = openOldSampleFile("Bug51944.doc");
Word6Extractor ex = new Word6Extractor(doc);
StringBuilder sb = new StringBuilder();
for (String p : ex.getParagraphText()) {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java Thu Dec 24 18:42:29 2020
@@ -17,7 +17,8 @@
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,14 +35,14 @@ import org.apache.poi.hwpf.HWPFTestDataS
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.TempFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test various write situations
*/
public final class TestHWPFWrite extends HWPFTestCase {
private static final POIDataSamples SAMPLES = POIDataSamples.getDocumentInstance();
-
+
/**
* Write to a stream
*/
@@ -124,26 +125,22 @@ public final class TestHWPFWrite extends
poifs.close();
}
- @Test(expected=IllegalStateException.class)
+ @Test
public void testInvalidInPlaceWriteInputStream() throws IOException {
// Can't work for InputStream opened files
try (InputStream is = SAMPLES.openResourceAsStream("SampleDoc.doc");
HWPFDocument doc = new HWPFDocument(is)) {
- doc.write();
+ assertThrows(IllegalStateException.class, doc::write);
}
}
-
- @Test(expected=IllegalStateException.class)
+
+ @Test
public void testInvalidInPlaceWritePOIFS() throws Exception {
// Can't work for Read-Only files
- POIFSFileSystem fs = new POIFSFileSystem(SAMPLES.getFile("SampleDoc.doc"), true);
- HWPFDocument doc = new HWPFDocument(fs.getRoot());
- try {
- doc.write();
- } finally {
- doc.close();
- fs.close();
+ try (POIFSFileSystem fs = new POIFSFileSystem(SAMPLES.getFile("SampleDoc.doc"), true);
+ HWPFDocument doc = new HWPFDocument(fs.getRoot())) {
+ assertThrows(IllegalStateException.class, doc::write);
}
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java Thu Dec 24 18:42:29 2020
@@ -18,13 +18,13 @@
package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+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 org.apache.poi.hwpf.HWPFDocument;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for the handling of header stories into headers, footers etc
@@ -40,7 +40,7 @@ public final class TestHeaderStories {
private HWPFDocument unicode;
private HWPFDocument withFields;
- @Before
+ @BeforeEach
public void setUp() {
none = openSampleFile("NoHeadFoot.doc");
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java Thu Dec 24 18:42:29 2020
@@ -18,16 +18,16 @@
package org.apache.poi.hwpf.usermodel;
import static org.apache.poi.hwpf.HWPFTestDataSamples.openSampleFile;
-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 java.io.IOException;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.ListLevel;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for our handling of lists
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
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 org.apache.poi.ddf.EscherComplexProperty;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherOptRecord;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.util.StringUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test cases for {@link OfficeDrawing} and {@link OfficeDrawingsImpl} classes.
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hwpf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.FileOutputStream;
import java.io.OutputStream;
@@ -30,8 +30,8 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.PicturesTable;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test the picture handling
@@ -165,23 +165,23 @@ public final class TestPictures {
// This file has two embeded excel files, an embeded powerpoint
// file and an embeded word file, in that order
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("word_with_embeded.doc");
-
+
// Check we don't break loading the pictures
doc.getPicturesTable().getAllPictures();
PicturesTable pictureTable = doc.getPicturesTable();
-
+
// Check the text, and its embeded images
Paragraph p;
Range r = doc.getRange();
assertEquals(1, r.numSections());
assertEquals(5, r.numParagraphs());
-
+
p = r.getParagraph(0);
assertEquals(2, p.numCharacterRuns());
assertEquals("I have lots of embedded files in me\r", p.text());
assertFalse(pictureTable.hasPicture(p.getCharacterRun(0)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(1)));
-
+
p = r.getParagraph(1);
assertEquals(5, p.numCharacterRuns());
assertEquals("\u0013 EMBED Excel.Sheet.8 \u0014\u0001\u0015\r", p.text());
@@ -190,7 +190,7 @@ public final class TestPictures {
assertFalse(pictureTable.hasPicture(p.getCharacterRun(2)));
assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
-
+
p = r.getParagraph(2);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED Excel.Sheet.8 \u0014\u0001\u0015\r", p.text());
@@ -200,7 +200,7 @@ public final class TestPictures {
assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(5)));
-
+
p = r.getParagraph(3);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED PowerPoint.Show.8 \u0014\u0001\u0015\r", p.text());
@@ -210,7 +210,7 @@ public final class TestPictures {
assertTrue(pictureTable.hasPicture(p.getCharacterRun(3)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(4)));
assertFalse(pictureTable.hasPicture(p.getCharacterRun(5)));
-
+
p = r.getParagraph(4);
assertEquals(6, p.numCharacterRuns());
assertEquals("\u0013 EMBED Word.Document.8 \\s \u0014\u0001\u0015\r", p.text());
@@ -276,15 +276,15 @@ public final class TestPictures {
public void testFloatingPictures() {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("FloatingPictures.doc");
PicturesTable pictures = doc.getPicturesTable();
-
+
// There are 19 images in the picture, but some are
// duplicate floating ones
assertEquals(17, pictures.getAllPictures().size());
-
+
int plain8s = 0;
int escher8s = 0;
int image1s = 0;
-
+
Range r = doc.getRange();
for(int np=0; np < r.numParagraphs(); np++) {
Paragraph p = r.getParagraph(np);
@@ -316,7 +316,7 @@ public final class TestPictures {
assertEquals(2, pics.size());
Picture pic1 = pics.get(0);
- assertEquals("FIXME: unable to get image width", -1, pic1.getWidth());
+ assertEquals( -1, pic1.getWidth(), "FIXME: unable to get image width" );
assertEquals(270, pic1.getHorizontalScalingFactor());
assertEquals(271, pic1.getVerticalScalingFactor());
assertEquals(12000, pic1.getDxaGoal()); // 21.17 cm / 2.54 cm/inch * 72dpi * 20 = 12000
@@ -327,7 +327,7 @@ public final class TestPictures {
assertEquals(0, pic1.getDyaCropBottom());
Picture pic2 = pics.get(1);
- assertEquals("FIXME: unable to get image width", -1, pic2.getWidth());
+ assertEquals( -1, pic2.getWidth(), "FIXME: unable to get image width" );
assertEquals(764, pic2.getHorizontalScalingFactor());
assertEquals(685, pic2.getVerticalScalingFactor());
assertEquals(12000, pic2.getDxaGoal()); // 21.17 cm / 2.54 cm/inch * 72dpi * 20 = 12000
@@ -342,14 +342,14 @@ public final class TestPictures {
public void testPictureDetectionWithPNG() {
HWPFDocument document = HWPFTestDataSamples.openSampleFile("PngPicture.doc");
PicturesTable pictureTable = document.getPicturesTable();
-
+
assertEquals(1, pictureTable.getAllPictures().size());
-
+
Picture p = pictureTable.getAllPictures().get(0);
assertEquals(PictureType.PNG, p.suggestPictureType());
assertEquals("png", p.suggestFileExtension());
}
-
+
@Test
public void testPictureWithAlternativeText() {
HWPFDocument document = HWPFTestDataSamples.openSampleFile("Picture_Alternative_Text.doc");
@@ -358,12 +358,12 @@ public final class TestPictures {
assertEquals("This is the alternative text for the picture.", picture.getDescription());
}
-
- @Ignore("This bug is not fixed yet")
+
+ @Disabled("This bug is not fixed yet")
@Test
public void test58804_1() throws Exception {
HWPFDocument docA = HWPFTestDataSamples.openSampleFile("58804_1.doc");
-
+
expectImages(docA, 1);
HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
@@ -375,11 +375,11 @@ public final class TestPictures {
expectImages(docB, 1);
}
- @Ignore("This bug is not fixed yet")
+ @Disabled("This bug is not fixed yet")
@Test
public void test58804() throws Exception {
HWPFDocument docA = HWPFTestDataSamples.openSampleFile("58804.doc");
-
+
expectImages(docA, 7);
HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,9 @@
package org.apache.poi.hwpf.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 static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
@@ -28,7 +29,7 @@ import org.apache.poi.hwpf.HWPFTestCase;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.extractor.WordExtractor;
import org.apache.poi.hwpf.model.StyleSheet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test various problem documents
@@ -49,7 +50,7 @@ public final class TestProblems extends
s.getParagraph(y);
}
}
-
+
doc.close();
}
@@ -62,7 +63,7 @@ public final class TestProblems extends
StyleSheet styleSheet = doc.getStyleSheet();
assertNotNull(styleSheet);
-
+
Range r = doc.getRange();
for (int x = 0; x < r.numSections(); x++) {
Section s = r.getSection(x);
@@ -144,7 +145,7 @@ public final class TestProblems extends
assertEquals(4, cell._parEnd);
assertEquals(65, cell.getStartOffset());
assertEquals(85, cell.getEndOffset());
-
+
doc.close();
}
@@ -181,16 +182,17 @@ public final class TestProblems extends
}
assertEquals(newLength, totalLength - deletedLength);
-
+
doc.close();
}
/**
* With an encrypted file, we should give a suitable exception, and not OOM
*/
- @Test(expected=EncryptedDocumentException.class)
- public void testEncryptedFile() throws IOException {
- HWPFTestDataSamples.openSampleFile("PasswordProtected.doc");
+ @Test
+ public void testEncryptedFile() {
+ assertThrows(EncryptedDocumentException.class, () -> HWPFTestDataSamples.openSampleFile("PasswordProtected.doc"));
+
}
@Test
@@ -240,7 +242,7 @@ public final class TestProblems extends
assertEquals(offset, para.text().indexOf(shorter));
}
}
-
+
doc.close();
}
@@ -280,7 +282,7 @@ public final class TestProblems extends
doc.getRange().getParagraph(0).text());
assertEquals("After Crashing Part\r",
doc.getRange().getParagraph(13).text());
-
+
doc.close();
}
@@ -428,7 +430,7 @@ public final class TestProblems extends
assertEquals(106, cell.getStartOffset());
assertEquals(119, cell.getEndOffset());
assertEquals("Row 3/Cell 3\u0007", cell.text());
-
+
doc.close();
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hwpf.usermodel;
-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.IOException;
import java.io.InputStream;
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.model.SEPX;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for Range which aren't around deletion, insertion, text replacement or
@@ -35,7 +35,7 @@ import org.junit.Test;
*/
public final class TestRange {
private static final POIDataSamples SAMPLES = POIDataSamples.getDocumentInstance();
-
+
@Test
public void testFieldStripping() {
String exp = "This is some text.";
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java Thu Dec 24 18:42:29 2020
@@ -18,13 +18,13 @@
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.apache.poi.hwpf.model.PAPX;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test to see if Range.delete() works even if the Range contains a
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.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.insertBefore() works even if the Range contains a
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hwpf.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.util.List;
@@ -27,8 +27,8 @@ import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.model.PAPX;
import org.apache.poi.hwpf.model.StyleSheet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests to ensure that our ranges end up with
@@ -68,7 +68,7 @@ public final class TestRangeProperties {
private HWPFDocument u;
private HWPFDocument a;
- @Before
+ @BeforeEach
public void setUp() {
u = HWPFTestDataSamples.openSampleFile("HeaderFooterUnicode.doc");
a = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org