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 [18/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/hslf/usermodel/TestNumberedList3.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java Thu Dec 24 18:42:29 2020
@@ -19,11 +19,11 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import 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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.List;
@@ -35,7 +35,7 @@ import org.apache.poi.hslf.record.Escher
import org.apache.poi.hslf.record.StyleTextProp9Atom;
import org.apache.poi.hslf.record.StyleTextPropAtom;
import org.apache.poi.sl.usermodel.AutoNumberingScheme;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -43,22 +43,20 @@ import org.junit.Test;
* if a paragraph has autonumber ()
* @see <a href="http://social.msdn.microsoft.com/Forums/mr-IN/os_binaryfile/thread/650888db-fabd-4b95-88dc-f0455f6e2d28">
* PPT: Missing TextAutoNumberScheme structure providing the style of the number bullets</a>
- *
+ *
* @author Alex Nikiforov [mailto:anikif@gmail.com]
*/
public final class TestNumberedList3 {
- private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+ private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
@Test
public void testNumberedList() throws IOException {
- HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers3.ppt"));
- assertTrue("No Exceptions while reading file", true);
-
- final List<HSLFSlide> slides = ppt.getSlides();
- assertEquals(1, slides.size());
- final HSLFSlide slide = slides.get(0);
- checkSlide(slide);
- ppt.close();
+ try (HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("numbers3.ppt"))) {
+ final List<HSLFSlide> slides = ppt.getSlides();
+ assertEquals(1, slides.size());
+ final HSLFSlide slide = slides.get(0);
+ checkSlide(slide);
+ }
}
private void checkSlide(final HSLFSlide s) {
final StyleTextProp9Atom[] numberedListArray = s.getNumberedListInfo();
@@ -68,9 +66,9 @@ public final class TestNumberedList3 {
assertNotNull(numberedListInfoForTextBox);
final TextPFException9[] autoNumbersOfTextBox0 = numberedListInfoForTextBox.getAutoNumberTypes();
assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getfBulletHasAutoNumber());
- assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used
+ assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used
assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme());
-
+
final List<List<HSLFTextParagraph>> textParass = s.getTextParagraphs();
assertEquals(3, textParass.size());
assertEquals("Bulleted list\rMore bullets\rNo bullets here", HSLFTextParagraph.getRawText(textParass.get(0)));
@@ -85,9 +83,9 @@ public final class TestNumberedList3 {
final TextPFException9[] autoNumbers = textParass.get(1).get(0).getStyleTextProp9Atom().getAutoNumberTypes();
assertEquals(1, autoNumbers.length);
assertEquals(Short.valueOf((short)1), autoNumbers[0].getfBulletHasAutoNumber());
- assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used
+ assertEquals(Short.valueOf((short)1), autoNumbers[0].getAutoNumberStartNumber());//Default value = 1 will be used
assertSame(AutoNumberingScheme.arabicPeriod, autoNumbersOfTextBox0[0].getAutoNumberScheme());
-
+
int chCovered = 0;
for (HSLFTextParagraph htp : textParass.get(1)) {
for (HSLFTextRun htr : htp.getTextRuns()) {
@@ -96,9 +94,9 @@ public final class TestNumberedList3 {
}
}
assertEquals(67, chCovered);
-
+
assertTrue(textParass.get(0).get(0).isBullet());
-
+
final EscherTextboxWrapper[] styleAtoms = s.getTextboxWrappers();
assertEquals(textParass.size(), styleAtoms.length);
checkSingleRunWrapper(43, styleAtoms[0]);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.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.assertSame;
import java.awt.Graphics2D;
import java.awt.Rectangle;
@@ -36,8 +36,8 @@ import javax.imageio.ImageIO;
import org.apache.poi.POIDataSamples;
import org.apache.poi.ddf.EscherBSERecord;
import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test Picture shape.
@@ -45,7 +45,7 @@ import org.junit.Test;
public final class TestPicture {
private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
- @BeforeClass
+ @BeforeAll
public static void disableImageIOCache() {
ImageIO.setUseCache(false);
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hslf.usermodel;
-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.awt.Dimension;
import java.io.ByteArrayInputStream;
@@ -41,8 +41,8 @@ import org.apache.poi.sl.image.ImageHead
import org.apache.poi.sl.image.ImageHeaderWMF;
import org.apache.poi.sl.usermodel.PictureData.PictureType;
import org.apache.poi.util.Units;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test adding/reading pictures
@@ -459,7 +459,7 @@ public final class TestPictures {
* See "Please remove my file from your svn" on @poi-dev from Dec 12, 2013
*/
@Test
- @Ignore("requires an internet connection to a 3rd party site")
+ @Disabled("requires an internet connection to a 3rd party site")
// As of 2017-06-20, the file still exists at the specified URL and the test passes.
public void testZeroPictureLength() throws IOException {
// take the data from www instead of test directory
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java Thu Dec 24 18:42:29 2020
@@ -18,16 +18,14 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that SlideShow can re-order slides properly
@@ -48,7 +46,7 @@ public final class TestReOrderingSlides
/**
* Create/open the slideshows
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
@@ -90,7 +88,7 @@ public final class TestReOrderingSlides
assertEquals(256, s1._getSheetNumber());
assertEquals(3, s1._getSheetRefId());
assertEquals(1, s1.getSlideNumber());
-
+
ss_read.close();
}
@@ -261,11 +259,11 @@ public final class TestReOrderingSlides
s1 = ss_three.getSlides().get(0);
s2 = ss_three.getSlides().get(1);
s3 = ss_three.getSlides().get(2);
-
+
assertEquals(1, s1.getSlideNumber());
assertEquals(2, s2.getSlideNumber());
assertEquals(3, s3.getSlideNumber());
-
+
assertEquals("Slide 3", ((HSLFTextShape)s1.getShapes().get(0)).getText());
assertEquals("Slide 1", ((HSLFTextShape)s3.getShapes().get(0)).getText());
@@ -294,7 +292,7 @@ public final class TestReOrderingSlides
assertEquals(s3._getSheetNumber(), _s3._getSheetNumber());
assertEquals(s3._getSheetRefId(), _s3._getSheetRefId());
assertEquals(3, s3.getSlideNumber());
-
+
ss_read.close();
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java Thu Dec 24 18:42:29 2020
@@ -17,12 +17,12 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.record.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that the record setup done by SlideShow
@@ -37,7 +37,7 @@ public final class TestRecordSetup {
private HSLFSlideShow ss;
private HSLFSlideShowImpl hss;
- @Before
+ @BeforeEach
public void init() throws Exception {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java Thu Dec 24 18:42:29 2020
@@ -18,11 +18,11 @@
package org.apache.poi.hslf.usermodel;
import static org.apache.poi.POITestCase.assertContains;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -35,9 +35,9 @@ import org.apache.poi.hslf.record.Record
import org.apache.poi.hslf.record.SlideListWithText;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
-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;
/**
* Test that the friendly getters and setters on RichTextRun
@@ -53,27 +53,27 @@ public final class TestRichTextRun {
private HSLFSlideShow ssChinese;
private static String filenameC;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
// Basic (non rich) test file
ss = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt");
// Rich test file A
ssRichA = HSLFTestDataSamples.getSlideShow("Single_Coloured_Page.ppt");
-
+
// Rich test file B
ssRichB = HSLFTestDataSamples.getSlideShow("Single_Coloured_Page_With_Fonts_and_Alignments.ppt");
-
+
// Rich test file C - has paragraph styles that run out before
// the character ones do
filenameC = "ParagraphStylesShorterThanCharStyles.ppt";
ssRichC = HSLFTestDataSamples.getSlideShow(filenameC);
-
+
// Rich test file with Chinese + English text in it
ssChinese = HSLFTestDataSamples.getSlideShow("54880_chinese.ppt");
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
ss.close();
ssRichA.close();
@@ -81,7 +81,7 @@ public final class TestRichTextRun {
ssRichC.close();
ssChinese.close();
}
-
+
/**
* Test the stuff about getting/setting bold
* on a non rich text run
@@ -162,13 +162,16 @@ public final class TestRichTextRun {
// Start off with rich one
// First run has defaults
+ assertNotNull(rtrRa.getFontSize());
assertEquals(44, rtrRa.getFontSize(), 0);
assertEquals(defaultFont, rtrRa.getFontFamily());
// Second is size 20, default font
+ assertNotNull(rtrRb.getFontSize());
assertEquals(20, rtrRb.getFontSize(), 0);
assertEquals(defaultFont, rtrRb.getFontFamily());
// Third is size 24, alt font
+ assertNotNull(rtrRc.getFontSize());
assertEquals(24, rtrRc.getFontSize(), 0);
assertEquals("Times New Roman", rtrRc.getFontFamily());
@@ -182,6 +185,7 @@ public final class TestRichTextRun {
// Now do non rich one
+ assertNotNull(rtr.getFontSize());
assertEquals(44, rtr.getFontSize(), 0);
assertEquals(defaultFont, rtr.getFontFamily());
assertEquals(1, ss.getFontCollection().getChildRecords().length); // Default
@@ -213,7 +217,7 @@ public final class TestRichTextRun {
HSLFSlide slideOne = h.getSlides().get(0);
List<List<HSLFTextParagraph>> textParass = slideOne.getTextParagraphs();
HSLFTextRun rtr = textParass.get(0).get(0).getTextRuns().get(0);
-
+
rtr.setBold(true);
rtr.setFontSize(18d);
rtr.setFontFamily("Courier");
@@ -221,6 +225,7 @@ public final class TestRichTextRun {
// Check it took those
assertTrue(rtr.isBold());
+ assertNotNull(rtr.getFontSize());
assertEquals(18., rtr.getFontSize(), 0);
assertEquals("Courier", rtr.getFontFamily());
@@ -245,6 +250,7 @@ public final class TestRichTextRun {
HSLFTextRun rtrRRa = textParassRR.get(0).get(0).getTextRuns().get(0);
assertTrue(rtrRRa.isBold());
+ assertNotNull(rtrRRa.getFontSize());
assertEquals(18., rtrRRa.getFontSize(), 0);
assertEquals("Courier", rtrRRa.getFontFamily());
readS.close();
@@ -361,7 +367,6 @@ public final class TestRichTextRun {
* SlideListWithText out, and compares it to the write
* out of the supplied SlideShow. Also compares the
* contents.
- * @param s
*/
private void assertMatchesSLTWC(HSLFSlideShow s) throws IOException {
// Grab a new copy of slideshow C
@@ -409,11 +414,11 @@ public final class TestRichTextRun {
is = fs.createDocumentInputStream(HSLFSlideShow.POWERPOINT_DOCUMENT);
byte[] raw_ss = IOUtils.toByteArray(is);
is.close();
- fs.close();
-
+ fs.close();
+
// different paragraph mask, because of sanitizing
raw_ss[169030] = 0x0a;
-
+
// Ensure they're the same
assertArrayEquals(raw_file, raw_ss);
}
@@ -441,57 +446,58 @@ public final class TestRichTextRun {
@Test
public void testReadParagraphStyles() throws Exception {
- HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("bullets.ppt");
- assertTrue("No Exceptions while reading file", true);
-
- HSLFTextParagraph rt;
- List<List<HSLFTextParagraph>> txt;
- List<HSLFSlide> slide = ppt.getSlides();
- assertEquals(2, slide.size());
-
- txt = slide.get(0).getTextParagraphs();
- assertEquals(2, txt.size());
-
- assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
- assertEquals(1, txt.get(0).size());
- rt = txt.get(0).get(0);
- assertFalse(rt.isBullet());
-
- String expected =
- "This is a text placeholder that \r" +
- "follows the design pattern\r" +
- "Defined in the slide master\r" +
- "and has bullets by default";
- assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
- assertEquals(4, txt.get(1).size());
- rt = txt.get(1).get(0);
- assertEquals('\u2022', (char)rt.getBulletChar());
- assertTrue(rt.isBullet());
-
-
- txt = slide.get(1).getTextParagraphs();
- assertEquals(2, txt.size());
-
- expected =
- "I\u2019m a text box\r" +
- "With bullets\r" +
- "That follow the design pattern\r" +
- "From the slide master";
- assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(0)));
- assertEquals(4, txt.get(0).size());
- rt = txt.get(0).get(0);
- assertTrue(rt.isBullet());
- assertEquals('\u2022', (char)rt.getBulletChar());
-
- expected =
- "I\u2019m a text box with user-defined\r" +
- "bullet character";
- assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
- assertEquals(2, txt.get(1).size());
- rt = txt.get(1).get(0);
- assertTrue(rt.isBullet());
- assertEquals('\u263A', (char)rt.getBulletChar());
- ppt.close();
+ try (HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("bullets.ppt")) {
+ HSLFTextParagraph rt;
+ List<List<HSLFTextParagraph>> txt;
+ List<HSLFSlide> slide = ppt.getSlides();
+ assertEquals(2, slide.size());
+
+ txt = slide.get(0).getTextParagraphs();
+ assertEquals(2, txt.size());
+
+ assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
+ assertEquals(1, txt.get(0).size());
+ rt = txt.get(0).get(0);
+ assertFalse(rt.isBullet());
+
+ String expected =
+ "This is a text placeholder that \r" +
+ "follows the design pattern\r" +
+ "Defined in the slide master\r" +
+ "and has bullets by default";
+ assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
+ assertEquals(4, txt.get(1).size());
+ rt = txt.get(1).get(0);
+ assertNotNull(rt.getBulletChar());
+ assertEquals('\u2022', (char) rt.getBulletChar());
+ assertTrue(rt.isBullet());
+
+
+ txt = slide.get(1).getTextParagraphs();
+ assertEquals(2, txt.size());
+
+ expected =
+ "I\u2019m a text box\r" +
+ "With bullets\r" +
+ "That follow the design pattern\r" +
+ "From the slide master";
+ assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(0)));
+ assertEquals(4, txt.get(0).size());
+ rt = txt.get(0).get(0);
+ assertTrue(rt.isBullet());
+ assertNotNull(rt.getBulletChar());
+ assertEquals('\u2022', (char) rt.getBulletChar());
+
+ expected =
+ "I\u2019m a text box with user-defined\r" +
+ "bullet character";
+ assertEquals(expected, HSLFTextParagraph.getRawText(txt.get(1)));
+ assertEquals(2, txt.get(1).size());
+ rt = txt.get(1).get(0);
+ assertTrue(rt.isBullet());
+ assertNotNull(rt.getBulletChar());
+ assertEquals('\u263A', (char) rt.getBulletChar());
+ }
}
@Test
@@ -514,10 +520,14 @@ public final class TestRichTextRun {
rt.setBulletChar('\u263A');
slide.addShape(shape);
+ assertNotNull(tr.getFontSize());
assertEquals(42.0, tr.getFontSize(), 0);
assertTrue(rt.isBullet());
+ assertNotNull(rt.getLeftMargin());
assertEquals(50.0, rt.getLeftMargin(), 0);
+ assertNotNull(rt.getIndent());
assertEquals(0, rt.getIndent(), 0);
+ assertNotNull(rt.getBulletChar());
assertEquals('\u263A', (char)rt.getBulletChar());
shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));
@@ -529,10 +539,14 @@ public final class TestRichTextRun {
shape = (HSLFTextBox)slide.getShapes().get(0);
rt = shape.getTextParagraphs().get(0);
tr = rt.getTextRuns().get(0);
+ assertNotNull(tr.getFontSize());
assertEquals(42.0, tr.getFontSize(), 0);
assertTrue(rt.isBullet());
+ assertNotNull(rt.getLeftMargin());
assertEquals(50.0, rt.getLeftMargin(), 0);
+ assertNotNull(rt.getIndent());
assertEquals(0, rt.getIndent(), 0);
+ assertNotNull(rt.getBulletChar());
assertEquals('\u263A', (char)rt.getBulletChar());
ppt2.close();
ppt1.close();
@@ -540,80 +554,79 @@ public final class TestRichTextRun {
@Test
public void testAddText() throws Exception {
- HSLFSlideShow ppt1 = HSLFTestDataSamples.getSlideShow("bullets.ppt");
- assertTrue("No Exceptions while reading file", true);
-
- HSLFTextParagraph rt;
- HSLFTextRun tr;
- List<List<HSLFTextParagraph>> txt;
- List<HSLFSlide> slides = ppt1.getSlides();
-
- assertEquals(2, slides.size());
- txt = slides.get(0).getTextParagraphs();
- assertEquals(2, txt.size());
-
- assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
- assertEquals(1, txt.get(0).size());
- rt = txt.get(0).get(0);
- assertFalse(rt.isBullet());
-
- // Add some new text
- HSLFTextParagraph.appendText(txt.get(0), "Foo! I'm new!", true);
- assertEquals(2, txt.get(0).size());
+ try (HSLFSlideShow ppt1 = HSLFTestDataSamples.getSlideShow("bullets.ppt")) {
- rt = txt.get(0).get(0);
- tr = rt.getTextRuns().get(0);
- assertFalse(tr.isBold());
- assertEquals("Title text\r", tr.getRawText());
- rt = txt.get(0).get(1);
- tr = rt.getTextRuns().get(0);
- assertFalse(tr.isBold());
- assertEquals("Foo! I'm new!", tr.getRawText());
- tr.setBold(true);
- HSLFTextParagraph.storeText(txt.get(0));
-
- // And some more, attributes will be copied from previous run
- HSLFTextParagraph.appendText(txt.get(0), "Me too!", true);
- HSLFTextParagraph.storeText(txt.get(0));
- assertEquals(3, txt.get(0).size());
- rt = txt.get(0).get(0);
- tr = rt.getTextRuns().get(0);
- assertFalse(tr.isBold());
- assertEquals("Title text\r", tr.getRawText());
- rt = txt.get(0).get(1);
- tr = rt.getTextRuns().get(0);
- assertTrue(tr.isBold());
- assertEquals("Foo! I'm new!\r", tr.getRawText());
- rt = txt.get(0).get(2);
- tr = rt.getTextRuns().get(0);
- assertTrue(tr.isBold());
- assertEquals("Me too!", tr.getRawText());
-
- // Save and re-open
- HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1);
- slides = ppt2.getSlides();
-
- assertEquals(2, slides.size());
-
- txt = slides.get(0).getTextParagraphs();
- assertEquals(2, txt.size());
- assertEquals(3, txt.get(0).size());
- rt = txt.get(0).get(0);
- tr = rt.getTextRuns().get(0);
- assertFalse(tr.isBold());
- assertEquals("Title text\r", tr.getRawText());
- rt = txt.get(0).get(1);
- tr = rt.getTextRuns().get(0);
- assertTrue(tr.isBold());
- assertEquals("Foo! I'm new!\r", tr.getRawText());
- rt = txt.get(0).get(2);
- tr = rt.getTextRuns().get(0);
- assertTrue(tr.isBold());
- assertEquals("Me too!", tr.getRawText());
- ppt2.close();
- ppt1.close();
+ HSLFTextParagraph rt;
+ HSLFTextRun tr;
+ List<List<HSLFTextParagraph>> txt;
+ List<HSLFSlide> slides = ppt1.getSlides();
+
+ assertEquals(2, slides.size());
+ txt = slides.get(0).getTextParagraphs();
+ assertEquals(2, txt.size());
+
+ assertEquals("Title text", HSLFTextParagraph.getRawText(txt.get(0)));
+ assertEquals(1, txt.get(0).size());
+ rt = txt.get(0).get(0);
+ assertFalse(rt.isBullet());
+
+ // Add some new text
+ HSLFTextParagraph.appendText(txt.get(0), "Foo! I'm new!", true);
+ assertEquals(2, txt.get(0).size());
+
+ rt = txt.get(0).get(0);
+ tr = rt.getTextRuns().get(0);
+ assertFalse(tr.isBold());
+ assertEquals("Title text\r", tr.getRawText());
+ rt = txt.get(0).get(1);
+ tr = rt.getTextRuns().get(0);
+ assertFalse(tr.isBold());
+ assertEquals("Foo! I'm new!", tr.getRawText());
+ tr.setBold(true);
+ HSLFTextParagraph.storeText(txt.get(0));
+
+ // And some more, attributes will be copied from previous run
+ HSLFTextParagraph.appendText(txt.get(0), "Me too!", true);
+ HSLFTextParagraph.storeText(txt.get(0));
+ assertEquals(3, txt.get(0).size());
+ rt = txt.get(0).get(0);
+ tr = rt.getTextRuns().get(0);
+ assertFalse(tr.isBold());
+ assertEquals("Title text\r", tr.getRawText());
+ rt = txt.get(0).get(1);
+ tr = rt.getTextRuns().get(0);
+ assertTrue(tr.isBold());
+ assertEquals("Foo! I'm new!\r", tr.getRawText());
+ rt = txt.get(0).get(2);
+ tr = rt.getTextRuns().get(0);
+ assertTrue(tr.isBold());
+ assertEquals("Me too!", tr.getRawText());
+
+ // Save and re-open
+ try (HSLFSlideShow ppt2 = HSLFTestDataSamples.writeOutAndReadBack(ppt1)) {
+ slides = ppt2.getSlides();
+
+ assertEquals(2, slides.size());
+
+ txt = slides.get(0).getTextParagraphs();
+ assertEquals(2, txt.size());
+ assertEquals(3, txt.get(0).size());
+ rt = txt.get(0).get(0);
+ tr = rt.getTextRuns().get(0);
+ assertFalse(tr.isBold());
+ assertEquals("Title text\r", tr.getRawText());
+ rt = txt.get(0).get(1);
+ tr = rt.getTextRuns().get(0);
+ assertTrue(tr.isBold());
+ assertEquals("Foo! I'm new!\r", tr.getRawText());
+ rt = txt.get(0).get(2);
+ tr = rt.getTextRuns().get(0);
+ assertTrue(tr.isBold());
+ assertEquals("Me too!", tr.getRawText());
+ }
+ }
}
-
+
@Test
public void testChineseParagraphs() {
List<HSLFTextRun> rts;
@@ -623,27 +636,27 @@ public final class TestRichTextRun {
// One slide
assertEquals(1, slides.size());
-
+
// One block of text within that
txt = slides.get(0).getTextParagraphs();
assertEquals(1, txt.size());
-
+
// One rich block of text in that - text is all the same style
// TODO Is this completely correct?
rts = txt.get(0).get(0).getTextRuns();
assertEquals(1, rts.size());
rt = rts.get(0);
-
+
// Check we can get the english text out of that
String text = rt.getRawText();
assertContains(text, "Single byte");
// And the chinese
assertContains(txt.get(0).get(3).getTextRuns().get(0).getRawText(), "\uff8a\uff9d\uff76\uff78");
-
+
// It isn't bold or italic
assertFalse(rt.isBold());
assertFalse(rt.isItalic());
-
+
// Font is Calibri
assertEquals("Calibri", rt.getFontFamily());
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java Thu Dec 24 18:42:29 2020
@@ -17,15 +17,15 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.List;
import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that SlideShow returns Sheets which have the right text in them
@@ -34,16 +34,16 @@ public final class TestSheetText {
// SlideShow primed on the test data
private HSLFSlideShow ss;
- @Before
+ @BeforeEach
public void init() throws IOException {
ss = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt");
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
ss.close();
}
-
+
@Test
public void testSheetOne() {
HSLFSheet slideOne = ss.getSlides().get(0);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java Thu Dec 24 18:42:29 2020
@@ -17,15 +17,15 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.List;
import org.apache.poi.hslf.HSLFTestDataSamples;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests that SlideShow returns Sheets in the right order
@@ -36,13 +36,13 @@ public final class TestSlideOrdering {
// Complex slideshow, record order doesn't match slide order
private HSLFSlideShow ssB;
- @Before
+ @BeforeEach
public void init() throws IOException {
ssA = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt");
ssB = HSLFTestDataSamples.getSlideShow("incorrect_slide_order.ppt");
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
ssA.close();
ssB.close();
@@ -91,7 +91,7 @@ public final class TestSlideOrdering {
assertEquals(titles.length, slide.size());
for (int i = 0; i < slide.size(); i++) {
String title = slide.get(i).getTitle();
- assertEquals("Wrong slide title in " + filename, titles[i], title);
+ assertEquals(titles[i], title, "Wrong slide title in " + filename);
}
ppt.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.hslf.usermodel;
-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 org.apache.poi.hslf.HSLFTestDataSamples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test reading sound data from a ppt
@@ -38,7 +38,7 @@ public final class TestSoundData {
HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("sound.ppt");
HSLFSoundData[] sound = ppt.getSoundData();
- assertEquals("Expected 1 sound", 1, sound.length);
+ assertEquals(1, sound.length, "Expected 1 sound");
assertArrayEquals(ref_data, sound[0].getData());
ppt.close();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java Thu Dec 24 18:42:29 2020
@@ -19,10 +19,10 @@
package org.apache.poi.hslf.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.awt.Color;
import java.awt.geom.Rectangle2D;
@@ -34,7 +34,7 @@ import java.util.List;
import org.apache.poi.hslf.HSLFTestDataSamples;
import org.apache.poi.sl.draw.DrawTableShape;
import org.apache.poi.sl.usermodel.StrokeStyle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -50,6 +50,7 @@ public class TestTable {
for (int row=0; row<rows; row++) {
for (int col=0; col<cols; col++) {
HSLFTableCell c = table.getCell(row, col);
+ assertNotNull(c);
c.setText("r"+row+"c"+col);
}
}
@@ -59,20 +60,20 @@ public class TestTable {
table.setAnchor(new Rectangle2D.Double(100, 100, 400, 400));
Rectangle2D rectExp = new Rectangle2D.Double(420,366.625,80,133.375);
- Rectangle2D rectAct = table.getCell(rows-1, cols-1).getAnchor();
+ HSLFTableCell c = table.getCell(rows - 1, cols - 1);
+ assertNotNull(c);
+ Rectangle2D rectAct = c.getAnchor();
assertEquals(rectExp, rectAct);
ppt.close();
}
@Test
public void testTable() throws IOException {
- HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("54111.ppt");
- assertTrue("No Exceptions while reading file", true);
-
- List<HSLFSlide> slides = ppt.getSlides();
- assertEquals(1, slides.size());
- checkSlide(slides.get(0));
- ppt.close();
+ try (HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("54111.ppt")) {
+ List<HSLFSlide> slides = ppt.getSlides();
+ assertEquals(1, slides.size());
+ checkSlide(slides.get(0));
+ }
}
private void checkSlide(final HSLFSlide s) {
@@ -94,9 +95,13 @@ public class TestTable {
assertEquals(4, table.getNumberOfColumns());
assertEquals(6, table.getNumberOfRows());
for (int x = 0; x < 4; x ++) {
- assertEquals("TH Cell " + (x + 1), HSLFTextParagraph.getRawText(table.getCell(0, x).getTextParagraphs()));
+ HSLFTableCell c = table.getCell(0, x);
+ assertNotNull(c);
+ assertEquals("TH Cell " + (x + 1), HSLFTextParagraph.getRawText(c.getTextParagraphs()));
for (int y = 1; y < 6; y++) {
- assertEquals("Row " + y + ", Cell " + (x + 1), table.getCell(y, x).getText());
+ c = table.getCell(y, x);
+ assertNotNull(c);
+ assertEquals("Row " + y + ", Cell " + (x + 1), c.getText());
}
}
}
@@ -112,6 +117,7 @@ public class TestTable {
for (int row=0; row<rows; row++) {
for (int col=0; col<cols; col++) {
HSLFTableCell c = tab.getCell(row, col);
+ assertNotNull(c);
c.setText("r"+(row+1)+"c"+(col+1));
}
}
@@ -130,6 +136,7 @@ public class TestTable {
for (int row=0; row<rows; row++) {
for (int col=0; col<cols; col++) {
HSLFTableCell c = tab.getCell(row, col);
+ assertNotNull(c);
c.setText(c.getText()+"...");
}
}
@@ -148,6 +155,7 @@ public class TestTable {
for (int row=0; row<rows; row++) {
for (int col=0; col<cols; col++) {
HSLFTableCell c = tab.getCell(row, col);
+ assertNotNull(c);
assertEquals("r"+(row+1)+"c"+(col+1)+"...", c.getText());
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java Thu Dec 24 18:42:29 2020
@@ -18,12 +18,12 @@
package org.apache.poi.hslf.usermodel;
import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Color;
import java.io.IOException;
@@ -34,9 +34,9 @@ import org.apache.poi.hslf.model.textpro
import org.apache.poi.hslf.record.TextBytesAtom;
import org.apache.poi.hslf.record.TextCharsAtom;
import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests for TextRuns
@@ -47,7 +47,7 @@ public final class TestTextRun {
private HSLFSlideShow ss;
private HSLFSlideShow ssRich;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
// Basic (non rich) test file
ss = HSLFTestDataSamples.getSlideShow("basic_test_ppt_file.ppt");
@@ -56,7 +56,7 @@ public final class TestTextRun {
ssRich = HSLFTestDataSamples.getSlideShow("Single_Coloured_Page.ppt");
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
ssRich.close();
ss.close();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.hslf.usermodel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ import java.util.Map;
import org.apache.poi.hslf.HSLFTestDataSamples;
import org.apache.poi.sl.usermodel.ShapeType;
import org.apache.poi.sl.usermodel.TextShape.TextPlaceholder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify behavior of <code>TextShape</code> and its sub-classes
@@ -77,7 +77,7 @@ public final class TestTextShape {
List<String> lst1 = new ArrayList<>();
HSLFSlide slide = ppt.getSlides().get(0);
for (HSLFShape shape : slide.getShapes()) {
- assertTrue("Expected TextShape but found " + shape.getClass().getName(), shape instanceof HSLFTextShape);
+ assertTrue(shape instanceof HSLFTextShape, "Expected TextShape but found " + shape.getClass().getName());
HSLFTextShape tx = (HSLFTextShape)shape;
List<HSLFTextParagraph> paras = tx.getTextParagraphs();
assertNotNull(paras);
@@ -196,7 +196,7 @@ public final class TestTextShape {
assertEquals(28.34, tx.getRightInset(), 0.01);
assertEquals(3.6, tx.getTopInset(), 0);
assertEquals(3.6, tx.getBottomInset(), 0);
-
+
ppt.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java Thu Dec 24 18:42:29 2020
@@ -18,15 +18,15 @@
package org.apache.poi.hslf.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import org.apache.poi.util.LocaleUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests that SystemTimeUtils works properly.
@@ -49,8 +49,8 @@ public final class TestSystemTimeUtils {
};
private static SimpleDateFormat sdf;
-
- @BeforeClass
+
+ @BeforeAll
public static void initDateFormat() {
sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.ROOT);
sdf.setTimeZone(LocaleUtil.getUserTimeZone());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hsmf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import org.apache.poi.POIDataSamples;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify if code page for general properties like subject,
@@ -40,7 +40,7 @@ public final class Test7BitCodepage {
/**
* Initialize this test, load up the messages.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
ascii_cp1251_lcid1049 = new MAPIMessage(samples.openResourceAsStream("ASCII_CP1251_LCID1049.msg"));
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java Thu Dec 24 18:42:29 2020
@@ -19,18 +19,18 @@ package org.apache.poi.hsmf;
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.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that we can perform basic opperations on
@@ -49,7 +49,7 @@ public final class TestBasics {
/**
* Initialize this test, load up the blank.msg mapi message.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
simple = new MAPIMessage(samples.openResourceAsStream("simple_test_msg.msg"));
@@ -105,16 +105,10 @@ public final class TestBasics {
assertStartsWith(simple.getHeaders()[25], "X-Antivirus-Scanner: Clean");
// Quick doesn't have them
- try {
- quick.getHeaders();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {}
+ assertThrows(ChunkNotFoundException.class, quick::getHeaders);
// Attachments doesn't have them
- try {
- attachments.getHeaders();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {}
+ assertThrows(ChunkNotFoundException.class, attachments::getHeaders);
// Outlook30 has some
assertEquals(33, outlook30.getHeaders().length);
@@ -165,26 +159,14 @@ public final class TestBasics {
@Test
public void testMissingChunks() throws Exception {
assertFalse(attachments.isReturnNullOnMissingChunk());
-
- try {
- attachments.getHtmlBody();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {
- // Good
- }
+ assertThrows(ChunkNotFoundException.class, attachments::getHtmlBody);
attachments.setReturnNullOnMissingChunk(true);
assertNull(attachments.getHtmlBody());
attachments.setReturnNullOnMissingChunk(false);
-
- try {
- attachments.getHtmlBody();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {
- // Good
- }
+ assertThrows(ChunkNotFoundException.class, attachments::getHtmlBody);
}
/**
@@ -194,19 +176,8 @@ public final class TestBasics {
@Test
public void testMissingAddressChunk() throws Exception {
assertFalse(noRecipientAddress.isReturnNullOnMissingChunk());
-
- try {
- noRecipientAddress.getRecipientEmailAddress();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {
- // Good
- }
- try {
- noRecipientAddress.getRecipientEmailAddressList();
- fail("expected ChunkNotFoundException");
- } catch(ChunkNotFoundException e) {
- // Good
- }
+ assertThrows(ChunkNotFoundException.class, noRecipientAddress::getRecipientEmailAddress);
+ assertThrows(ChunkNotFoundException.class, noRecipientAddress::getRecipientEmailAddressList);
noRecipientAddress.setReturnNullOnMissingChunk(true);
@@ -258,13 +229,10 @@ public final class TestBasics {
// Check with a file that has no headers
- try {
- chinese.getHeaders();
- fail("File doesn't have headers!");
- } catch(ChunkNotFoundException e) {}
+ assertThrows(ChunkNotFoundException.class, chinese::getHeaders, "File doesn't have headers!");
String html = chinese.getHtmlBody();
- assertTrue("Charset not found:\n" + html, html.contains("text/html; charset=big5"));
+ assertTrue(html.contains("text/html; charset=big5"), "Charset not found:\n" + html);
// Defaults to CP1251
assertEquals("CP1252", chinese.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,15 @@
package org.apache.poi.hsmf;
-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.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
@@ -36,7 +37,7 @@ public final class TestBlankFileRead {
/**
* Initialize this test, load up the blank.msg mapi message.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
mapiMessage = new MAPIMessage(samples.openResourceAsStream("blank.msg"));
@@ -45,9 +46,9 @@ public final class TestBlankFileRead {
/**
* Check if we can read the body of the blank message, we expect "".
*/
- @Test(expected = ChunkNotFoundException.class)
- public void testReadBody() throws ChunkNotFoundException {
- mapiMessage.getTextBody();
+ @Test
+ public void testReadBody() {
+ assertThrows(ChunkNotFoundException.class, mapiMessage::getTextBody);
}
@@ -76,9 +77,9 @@ public final class TestBlankFileRead {
/**
* Test to see if we can read the FROM Chunk.
*/
- @Test(expected = ChunkNotFoundException.class)
- public void testReadDisplayFrom() throws ChunkNotFoundException {
- mapiMessage.getDisplayFrom();
+ @Test
+ public void testReadDisplayFrom() {
+ assertThrows(ChunkNotFoundException.class, mapiMessage::getDisplayFrom);
}
/**
@@ -106,8 +107,8 @@ public final class TestBlankFileRead {
/**
* Check if we can read the subject line of the blank message, we expect ""
*/
- @Test(expected = ChunkNotFoundException.class)
- public void testReadConversationTopic() throws ChunkNotFoundException {
- mapiMessage.getConversationTopic();
+ @Test
+ public void testReadConversationTopic() {
+ assertThrows(ChunkNotFoundException.class, mapiMessage::getConversationTopic);
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java Thu Dec 24 18:42:29 2020
@@ -17,8 +17,8 @@
package org.apache.poi.hsmf;
-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;
@@ -45,9 +45,9 @@ import org.apache.poi.poifs.filesystem.E
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class TestExtractEmbeddedMSG {
private static MAPIMessage pdfMsgAttachments;
@@ -57,13 +57,13 @@ public class TestExtractEmbeddedMSG {
*
* @throws Exception
*/
- @BeforeClass
+ @BeforeAll
public static void setUp() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
pdfMsgAttachments = new MAPIMessage(samples.openResourceAsStream("attachment_msg_pdf.msg"));
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws IOException {
pdfMsgAttachments.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java Thu Dec 24 18:42:29 2020
@@ -17,19 +17,19 @@
package org.apache.poi.hsmf;
-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.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.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.datatypes.AttachmentChunks;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that we can read attachments from msg file
@@ -42,7 +42,7 @@ public class TestFileWithAttachmentsRead
/**
* Initialize this test, load up the attachment_test_msg.msg mapi message.
*/
- @BeforeClass
+ @BeforeAll
public static void setUp() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
twoSimpleAttachments = new MAPIMessage(samples.openResourceAsStream("attachment_test_msg.msg"));
@@ -50,7 +50,7 @@ public class TestFileWithAttachmentsRead
inlineImgMsgAttachments = new MAPIMessage(samples.openResourceAsStream("attachment_msg_inlineImg.msg"));
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws IOException {
twoSimpleAttachments.close();
pdfMsgAttachments.close();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java Thu Dec 24 18:42:29 2020
@@ -18,10 +18,10 @@
package org.apache.poi.hsmf;
import static org.apache.poi.POITestCase.assertContains;
-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.ByteArrayOutputStream;
import java.io.IOException;
@@ -45,9 +45,9 @@ import org.apache.poi.hsmf.dev.HSMFDump;
import org.apache.poi.hsmf.extractor.OutlookTextExtractor;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests that we can read fixed sized properties, as well as variable
@@ -66,7 +66,7 @@ public final class TestFixedSizedPropert
/**
* Initialize this test, load up the messages.
*/
- @BeforeClass
+ @BeforeAll
public static void initMapi() throws Exception {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
fsMessageSucceeds = new POIFSFileSystem(samples.getFile(messageSucceeds));
@@ -83,7 +83,7 @@ public final class TestFixedSizedPropert
}
- @AfterClass
+ @AfterAll
public static void closeFS() throws Exception {
LocaleUtil.setUserTimeZone(userTimeZone);
fsMessageSucceeds.close();
@@ -99,10 +99,10 @@ public final class TestFixedSizedPropert
Map<MAPIProperty,List<PropertyValue>> props;
props = mapiMessageSucceeds.getMainChunks().getProperties();
- assertTrue(props.toString(), props.size() > 10);
+ assertTrue(props.size() > 10, props.toString());
props = mapiMessageFails.getMainChunks().getProperties();
- assertTrue(props.toString(), props.size() > 10);
+ assertTrue(props.size() > 10, props.toString());
}
/**
@@ -121,20 +121,20 @@ public final class TestFixedSizedPropert
seenTypes.add(pv.getClass());
}
}
- assertTrue(seenTypes.toString(), seenTypes.size() > 3);
- assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
- assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
- assertFalse(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
+ assertTrue(seenTypes.size() > 3, seenTypes.toString());
+ assertTrue(seenTypes.contains(LongPropertyValue.class), seenTypes.toString());
+ assertTrue(seenTypes.contains(TimePropertyValue.class), seenTypes.toString());
+ assertFalse(seenTypes.contains(ChunkBasedPropertyValue.class), seenTypes.toString());
// Ask for the raw values
seenTypes.clear();
for (PropertyValue pv : mainChunks.getRawProperties().values()) {
seenTypes.add(pv.getClass());
}
- assertTrue(seenTypes.toString(), seenTypes.size() > 3);
- assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
- assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
- assertTrue(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
+ assertTrue(seenTypes.size() > 3, seenTypes.toString());
+ assertTrue(seenTypes.contains(LongPropertyValue.class), seenTypes.toString());
+ assertTrue(seenTypes.contains(TimePropertyValue.class), seenTypes.toString());
+ assertTrue(seenTypes.contains(ChunkBasedPropertyValue.class), seenTypes.toString());
}
/**
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hsmf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.util.Calendar;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public final class TestMessageSubmissionChunk {
@@ -36,7 +36,7 @@ public final class TestMessageSubmission
/**
* Initialise this test, load up the test messages.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
this.mapiMessageExtraHyphenSubmissionChunk = new MAPIMessage(samples.openResourceAsStream("message_extra_hyphen_submission_chunk.msg"));
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java Thu Dec 24 18:42:29 2020
@@ -17,15 +17,15 @@
package org.apache.poi.hsmf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.Calendar;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public final class TestMessageSubmissionChunkY2KRead {
@@ -36,7 +36,7 @@ public final class TestMessageSubmission
/**
* Initialise this test, load up the three test messages.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
mapiMessage1979 = new MAPIMessage(samples.openResourceAsStream("message_1979.msg"));
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java Thu Dec 24 18:42:29 2020
@@ -19,17 +19,17 @@ package org.apache.poi.hsmf;
import static org.apache.poi.hsmf.datatypes.NameIdChunks.PredefinedPropertySet.PSETID_COMMON;
import static org.apache.poi.hsmf.datatypes.NameIdChunks.PropertySetType.PS_PUBLIC_STRINGS;
-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 java.io.InputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.datatypes.StringChunk;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that we can read properties identified by name or id in property sets.
@@ -40,7 +40,7 @@ public class TestNameIdChunks {
/**
* Initialize this test, load up the keywords.msg mapi message.
*/
- @BeforeClass
+ @BeforeAll
public static void setUp() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
try (InputStream is = samples.openResourceAsStream("keywords.msg")) {
@@ -48,7 +48,7 @@ public class TestNameIdChunks {
}
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws IOException {
keywordsMsg.close();
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java Thu Dec 24 18:42:29 2020
@@ -17,16 +17,16 @@
package org.apache.poi.hsmf;
-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.IOException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that we can still work on the newer Outlook 3.0 files.
@@ -37,7 +37,7 @@ public final class TestOutlook30FileRead
/**
* Initialize this test, load up the blank.msg mapi message.
*/
- @Before
+ @BeforeEach
public void setup() throws IOException {
POIDataSamples samples = POIDataSamples.getHSMFInstance();
this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("outlook_30_msg.msg"));
@@ -135,7 +135,7 @@ public final class TestOutlook30FileRead
assertNotNull(html);
assertNotNull(rtf);
- assertTrue("Wrong text:\n" + html, html.startsWith("<!DOCTYPE"));
- assertTrue("Wrong text:\n" + rtf, rtf.startsWith("{\\rtf1"));
+ assertTrue( html.startsWith("<!DOCTYPE"), "Wrong text:\n" + html );
+ assertTrue( rtf.startsWith("{\\rtf1"), "Wrong text:\n" + rtf );
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hsmf;
-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 org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that we can read a simple msg file, that is in plain/text
@@ -142,8 +142,7 @@ public final class TestSimpleFileRead {
try (MAPIMessage mapiMessage = new MAPIMessage(
POIDataSamples.getHSMFInstance().getFile("msgClass" + messageClass + ".msg"))) {
MAPIMessage.MESSAGE_CLASS mc = mapiMessage.getMessageClassEnum();
- assertTrue(mc + " but expected " + messageClass,
- messageClass.equalsIgnoreCase(mc.toString().replaceAll("_", "")));
+ assertTrue( messageClass.equalsIgnoreCase(mc.toString().replaceAll("_", "")), mc + " but expected " + messageClass );
}
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hsmf.datatypes;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verifies that the Chunks class is actually setup properly and hasn't been changed in ways
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java Thu Dec 24 18:42:29 2020
@@ -17,14 +17,14 @@
package org.apache.poi.hsmf.datatypes;
-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.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.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks various MAPIProperty related logic
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java Thu Dec 24 18:42:29 2020
@@ -17,13 +17,13 @@
package org.apache.poi.hsmf.datatypes;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import org.apache.poi.hsmf.datatypes.AttachmentChunks.AttachmentChunksSorter;
import org.apache.poi.hsmf.datatypes.RecipientChunks.RecipientChunksSorter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Checks that the sorters on the chunk groups order chunks properly.
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java Thu Dec 24 18:42:29 2020
@@ -17,9 +17,9 @@
package org.apache.poi.hsmf.datatypes;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verifies that the Types class is behaving properly.
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java Thu Dec 24 18:42:29 2020
@@ -19,7 +19,7 @@ package org.apache.poi.hsmf.extractor;
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertNotContained;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.FileInputStream;
import java.text.SimpleDateFormat;
@@ -31,9 +31,9 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.hsmf.MAPIMessage;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LocaleUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that the text extractor works
@@ -43,13 +43,13 @@ public final class TestOutlookTextExtrac
private static TimeZone userTZ;
- @BeforeClass
+ @BeforeAll
public static void initTimeZone() {
userTZ = LocaleUtil.getUserTimeZone();
LocaleUtil.setUserTimeZone(LocaleUtil.TIMEZONE_UTC);
}
- @AfterClass
+ @AfterAll
public static void resetTimeZone() {
LocaleUtil.setUserTimeZone(userTZ);
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.hsmf.parsers;
-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.IOException;
import java.nio.charset.StandardCharsets;
@@ -42,7 +42,7 @@ import org.apache.poi.hsmf.datatypes.Typ
import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LocaleUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests to verify that the chunk parser works properly
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java Thu Dec 24 18:42:29 2020
@@ -16,13 +16,15 @@
==================================================================== */
package org.apache.poi.hssf.converter;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -32,39 +34,34 @@ import javax.xml.transform.stream.Stream
import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
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 TestExcelConverterSuite
{
/**
* YK: a quick hack to exclude failing documents from the suite.
*/
@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
- private static List<String> failingFiles = Arrays.asList(
+ private static final List<String> failingFiles = Arrays.asList(
/* not failing, but requires more memory */
"ex45698-22488.xls" );
- @Parameterized.Parameters(name="{index}: {0}")
- public static Iterable<Object[]> files() {
- List<Object[]> files = new ArrayList<>();
+ public static Stream<Arguments> files() {
+ List<Arguments> files = new ArrayList<>();
File directory = POIDataSamples.getDocumentInstance().getFile(
"../spreadsheet" );
- for ( final File child : directory.listFiles((dir,name) -> name.endsWith( ".xls" ) && !failingFiles.contains( name ))) {
- files.add(new Object[] { child });
+ for ( final File child : Objects.requireNonNull(directory.listFiles((dir, name) -> name.endsWith(".xls") && !failingFiles.contains(name)))) {
+ files.add(Arguments.of(child));
}
- return files;
+ return files.stream();
}
-
- @Parameterized.Parameter
- public File child;
-
- @Test
- public void testFo() throws Exception
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testFo(File child) throws Exception
{
HSSFWorkbook workbook;
try {
@@ -88,8 +85,9 @@ public class TestExcelConverterSuite
assertNotNull(stringWriter.toString());
}
- @Test
- public void testHtml() throws Exception
+ @ParameterizedTest
+ @MethodSource("files")
+ public void testHtml(File child) throws Exception
{
HSSFWorkbook workbook;
try {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java Thu Dec 24 18:42:29 2020
@@ -18,7 +18,8 @@
package org.apache.poi.hwmf;
import static org.apache.poi.POITestCase.assertContains;
-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.File;
import java.io.FileInputStream;
@@ -36,8 +37,8 @@ import org.apache.poi.hwmf.record.HwmfTe
import org.apache.poi.hwmf.usermodel.HwmfPicture;
import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.RecordFormatException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class TestHwmfParsing {
@@ -56,16 +57,16 @@ public class TestHwmfParsing {
}
}
- @Test(expected = RecordFormatException.class)
+ @Test
public void testInfiniteLoop() throws Exception {
try (InputStream is = samples.openResourceAsStream("61338.wmf")) {
- new HwmfPicture(is);
+ assertThrows(RecordFormatException.class, () -> new HwmfPicture(is));
}
}
@Test
- @Ignore("If we decide we can use common crawl file specified, we can turn this back on")
+ @Disabled("If we decide we can use common crawl file specified, we can turn this back on")
public void testCyrillic() throws Exception {
//TODO: move test file to framework and fix this
File dir = new File("C:/somethingOrOther");
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hwmf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwmf.record.HwmfTernaryRasterOp;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestRasterOp {
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java Thu Dec 24 18:42:29 2020
@@ -21,13 +21,13 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public abstract class HWPFTestCase {
protected HWPFDocFixture _hWPFDocFixture;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
/** @todo verify the constructors */
_hWPFDocFixture = new HWPFDocFixture(this, getTestFile());
@@ -39,7 +39,7 @@ public abstract class HWPFTestCase {
return HWPFDocFixture.DEFAULT_TEST_FILE;
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (_hWPFDocFixture != null) {
_hWPFDocFixture.tearDown();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java Thu Dec 24 18:42:29 2020
@@ -19,7 +19,7 @@
package org.apache.poi.hwpf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
@@ -27,7 +27,7 @@ import org.apache.poi.hwpf.model.FieldsD
import org.apache.poi.hwpf.model.FieldsTables;
import org.apache.poi.hwpf.model.FileInformationBlock;
import org.apache.poi.hwpf.model.PlexOfField;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test case for the fields tables, this test is based on the test-fields.doc
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java Thu Dec 24 18:42:29 2020
@@ -17,10 +17,10 @@
package org.apache.poi.hwpf;
-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 java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
@@ -32,8 +32,8 @@ import javax.imageio.ImageIO;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.model.PicturesTable;
import org.apache.poi.hwpf.usermodel.Picture;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test picture support in HWPF
@@ -49,7 +49,7 @@ public final class TestHWPFPictures {
private String imgCFile;
private String imgDFile;
- @Before
+ @BeforeEach
public void setUp() {
docAFile = "testPictures.doc";
docBFile = "two_images.doc";
@@ -63,8 +63,7 @@ public final class TestHWPFPictures {
// we use ImageIO in one of the tests here so we should ensure that the temporary directory is created correctly
File tempDir = new File(System.getProperty("java.io.tmpdir"));
- assertTrue("Could not create temporary directory " + tempDir.getAbsolutePath() + ": " + tempDir.exists() + "/" + tempDir.isDirectory(),
- tempDir.exists() || tempDir.mkdirs());
+ assertTrue( tempDir.exists() || tempDir.mkdirs(), "Could not create temporary directory " + tempDir.getAbsolutePath() + ": " + tempDir.exists() + "/" + tempDir.isDirectory() );
}
/**
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java?rev=1884783&r1=1884782&r2=1884783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java Thu Dec 24 18:42:29 2020
@@ -17,11 +17,11 @@
package org.apache.poi.hwpf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.poi.hwpf.usermodel.Range;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test that we pull out the right bits of a file into the different ranges
@@ -94,7 +94,7 @@ public final class TestHWPFRangeParts {
*/
private HWPFDocument docUnicode;
- @Before
+ @BeforeEach
public void setUp() {
docUnicode = HWPFTestDataSamples.openSampleFile("HeaderFooterUnicode.doc");
docAscii = HWPFTestDataSamples.openSampleFile("ThreeColHeadFoot.doc");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org