Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java?rev=1872041&r1=1872040&r2=1872041&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java Fri Dec 27 23:00:13 2019 @@ -17,46 +17,48 @@ package org.apache.poi.hssf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; + import org.apache.poi.ddf.EscherClientAnchorRecord; import org.apache.poi.hssf.model.ConvertAnchor; +import org.junit.Test; /** * Various tests for HSSFClientAnchor. - * - * @author Glen Stampoultzis (glens at apache.org) - * @author Yegor Kozlov (yegor at apache.org) */ -public final class TestHSSFClientAnchor extends TestCase { - public void testGetAnchorHeightInPoints() { - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet("test"); - HSSFClientAnchor a = new HSSFClientAnchor(0,0,1023,255,(short)0,0,(short)0,0); - float p = a.getAnchorHeightInPoints(sheet); - assertEquals(12.7,p,0.001); - - sheet.createRow(0).setHeightInPoints(14); - a = new HSSFClientAnchor(0,0,1023,255,(short)0,0,(short)0,0); - p = a.getAnchorHeightInPoints(sheet); - assertEquals(13.945,p,0.001); - - a = new HSSFClientAnchor(0,0,1023,127,(short)0,0,(short)0,0); - p = a.getAnchorHeightInPoints(sheet); - assertEquals(6.945,p,0.001); - - a = new HSSFClientAnchor(0,126,1023,127,(short)0,0,(short)0,0); - p = a.getAnchorHeightInPoints(sheet); - assertEquals(0.054,p,0.001); - - a = new HSSFClientAnchor(0,0,1023,0,(short)0,0,(short)0,1); - p = a.getAnchorHeightInPoints(sheet); - assertEquals(14.0,p,0.001); - - sheet.createRow(0).setHeightInPoints(12); - a = new HSSFClientAnchor(0,127,1023,127,(short)0,0,(short)0,1); - p = a.getAnchorHeightInPoints(sheet); - assertEquals(12.372,p,0.001); - +public final class TestHSSFClientAnchor { + @Test + public void testGetAnchorHeightInPoints() throws IOException { + try (HSSFWorkbook wb = new HSSFWorkbook()) { + HSSFSheet sheet = wb.createSheet("test"); + HSSFClientAnchor a = new HSSFClientAnchor(0, 0, 1023, 255, (short) 0, 0, (short) 0, 0); + float p = a.getAnchorHeightInPoints(sheet); + assertEquals(12.7, p, 0.001); + + sheet.createRow(0).setHeightInPoints(14); + a = new HSSFClientAnchor(0, 0, 1023, 255, (short) 0, 0, (short) 0, 0); + p = a.getAnchorHeightInPoints(sheet); + assertEquals(13.945, p, 0.001); + + a = new HSSFClientAnchor(0, 0, 1023, 127, (short) 0, 0, (short) 0, 0); + p = a.getAnchorHeightInPoints(sheet); + assertEquals(6.945, p, 0.001); + + a = new HSSFClientAnchor(0, 126, 1023, 127, (short) 0, 0, (short) 0, 0); + p = a.getAnchorHeightInPoints(sheet); + assertEquals(0.054, p, 0.001); + + a = new HSSFClientAnchor(0, 0, 1023, 0, (short) 0, 0, (short) 0, 1); + p = a.getAnchorHeightInPoints(sheet); + assertEquals(14.0, p, 0.001); + + sheet.createRow(0).setHeightInPoints(12); + a = new HSSFClientAnchor(0, 127, 1023, 127, (short) 0, 0, (short) 0, 1); + p = a.getAnchorHeightInPoints(sheet); + assertEquals(12.372, p, 0.001); + } } /** @@ -64,6 +66,7 @@ public final class TestHSSFClientAnchor * check that dx1, dx2, dy1 and dy2 are written "as is". * (Bug 42999 reported that dx1 and dx2 are swapped if dx1>dx2. It doesn't make sense for client anchors.) */ + @Test public void testConvertAnchor() { HSSFClientAnchor[] anchors = { new HSSFClientAnchor( 0 , 0 , 0 , 0 ,(short)0, 1,(short)1,3), @@ -83,26 +86,29 @@ public final class TestHSSFClientAnchor } } - public void testAnchorHeightInPoints(){ - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet(); - - HSSFClientAnchor[] anchor = { - new HSSFClientAnchor( 0 , 0, 0 , 0 ,(short)0, 1,(short)1, 3), - new HSSFClientAnchor( 0 , 254 , 0 , 126 ,(short)0, 1,(short)1, 3), - new HSSFClientAnchor( 0 , 128 , 0 , 128 ,(short)0, 1,(short)1, 3), - new HSSFClientAnchor( 0 , 0 , 0 , 128 ,(short)0, 1,(short)1, 3), - }; - float[] ref = {25.5f, 19.125f, 25.5f, 31.875f}; - for (int i = 0; i < anchor.length; i++) { - float height = anchor[i].getAnchorHeightInPoints(sheet); - assertEquals(ref[i], height, 0); + @Test + public void testAnchorHeightInPoints() throws IOException { + try (HSSFWorkbook wb = new HSSFWorkbook()) { + HSSFSheet sheet = wb.createSheet(); + + HSSFClientAnchor[] anchor = { + new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 1, (short) 1, 3), + new HSSFClientAnchor(0, 254, 0, 126, (short) 0, 1, (short) 1, 3), + new HSSFClientAnchor(0, 128, 0, 128, (short) 0, 1, (short) 1, 3), + new HSSFClientAnchor(0, 0, 0, 128, (short) 0, 1, (short) 1, 3), + }; + float[] ref = {25.5f, 19.125f, 25.5f, 31.875f}; + for (int i = 0; i < anchor.length; i++) { + float height = anchor[i].getAnchorHeightInPoints(sheet); + assertEquals(ref[i], height, 0); + } } } /** * Check {@link HSSFClientAnchor} constructor does not treat 32768 as -32768. */ + @Test public void testCanHaveRowGreaterThan32767() { // Maximum permitted row number should be 65535. HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 32768, (short) 0, 32768); @@ -114,6 +120,7 @@ public final class TestHSSFClientAnchor /** * Check the maximum is not set at 255*256 instead of 256*256 - 1. */ + @Test public void testCanHaveRowUpTo65535() { HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65535, (short) 0, 65535); @@ -121,18 +128,15 @@ public final class TestHSSFClientAnchor assertEquals(65535, anchor.getRow2()); } + @Test(expected = IllegalArgumentException.class) public void testCannotHaveRowGreaterThan65535() { - try { - new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65536, (short) 0, 65536); - fail("Expected IllegalArgumentException to be thrown"); - } catch (IllegalArgumentException ex) { - // pass - } + new HSSFClientAnchor(0, 0, 0, 0, (short) 0, 65536, (short) 0, 65536); } /** * Check the same maximum value enforced when using {@link HSSFClientAnchor#setRow1}. */ + @Test public void testCanSetRowUpTo65535() { HSSFClientAnchor anchor = new HSSFClientAnchor(); anchor.setRow1(65535); @@ -142,20 +146,13 @@ public final class TestHSSFClientAnchor assertEquals(65535, anchor.getRow2()); } + @Test(expected = IllegalArgumentException.class) public void testCannotSetRow1GreaterThan65535() { - try { - new HSSFClientAnchor().setRow1(65536); - fail("Expected IllegalArgumentException to be thrown"); - } catch (IllegalArgumentException ex) { - // pass - } + new HSSFClientAnchor().setRow1(65536); } + + @Test(expected = IllegalArgumentException.class) public void testCannotSetRow2GreaterThan65535() { - try { - new HSSFClientAnchor().setRow2(65536); - fail("Expected IllegalArgumentException to be thrown"); - } catch (IllegalArgumentException ex) { - // pass - } + new HSSFClientAnchor().setRow2(65536); } }
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java?rev=1872041&r1=1872040&r2=1872041&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java Fri Dec 27 23:00:13 2019 @@ -17,34 +17,36 @@ package org.apache.poi.hssf.usermodel; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; +import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleWorkbook; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; import org.apache.poi.hssf.HSSFTestDataSamples; +import org.junit.Test; /** * Tests for {@link HSSFHeader} / {@link HSSFFooter} - * - * @author Shawn Laubach (slaubach at apache dot com) */ -public final class TestHSSFHeaderFooter extends TestCase { +public final class TestHSSFHeaderFooter { /** * Tests that get header retrieves the proper values. - * - * @author Shawn Laubach (slaubach at apache dot org) */ - public void testRetrieveCorrectHeader() { + @Test + public void testRetrieveCorrectHeader() throws IOException { - HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls"); - HSSFSheet s = wb.getSheetAt( 0 ); - HSSFHeader head = s.getHeader(); - - assertEquals("Top Left", head.getLeft()); - assertEquals("Top Center", head.getCenter()); - assertEquals("Top Right", head.getRight()); + try (HSSFWorkbook wb = openSampleWorkbook("EmbeddedChartHeaderTest.xls")) { + HSSFSheet s = wb.getSheetAt(0); + HSSFHeader head = s.getHeader(); + + assertEquals("Top Left", head.getLeft()); + assertEquals("Top Center", head.getCenter()); + assertEquals("Top Right", head.getRight()); + } } + @Test public void testSpecialChars() { assertEquals("&U", HSSFHeader.startUnderline()); assertEquals("&U", HSSFHeader.endUnderline()); @@ -54,7 +56,8 @@ public final class TestHSSFHeaderFooter assertEquals("&\"Arial,bold\"", HSSFFooter.font("Arial", "bold")); } - public void testStripFields() { + @Test + public void testStripFields() throws IOException { String simple = "I am a test header"; String withPage = "I am a&P test header"; String withLots = "I&A am&N a&P test&T header&U"; @@ -70,117 +73,123 @@ public final class TestHSSFHeaderFooter assertEquals(simple + "&a&b", HSSFHeader.stripFields(withOtherAnds2)); // Now test the default strip flag - HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls"); - HSSFSheet s = wb.getSheetAt( 0 ); - HSSFHeader head = s.getHeader(); - - assertEquals("Top Left", head.getLeft()); - assertEquals("Top Center", head.getCenter()); - assertEquals("Top Right", head.getRight()); - - head.setLeft("Top &P&F&D Left"); - assertEquals("Top &P&F&D Left", head.getLeft()); - - assertEquals("Top Left", HeaderFooter.stripFields(head.getLeft())); - - // Now even more complex - head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&G&X END"); - assertEquals("HEADER TEXT END", HeaderFooter.stripFields(head.getCenter())); + try (HSSFWorkbook wb = openSampleWorkbook("EmbeddedChartHeaderTest.xls")) { + HSSFSheet s = wb.getSheetAt(0); + HSSFHeader head = s.getHeader(); + + assertEquals("Top Left", head.getLeft()); + assertEquals("Top Center", head.getCenter()); + assertEquals("Top Right", head.getRight()); + + head.setLeft("Top &P&F&D Left"); + assertEquals("Top &P&F&D Left", head.getLeft()); + + assertEquals("Top Left", HeaderFooter.stripFields(head.getLeft())); + + // Now even more complex + head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&G&X END"); + assertEquals("HEADER TEXT END", HeaderFooter.stripFields(head.getCenter())); + } } /** * Tests that get header retrieves the proper values. - * - * @author Shawn Laubach (slaubach at apache dot org) */ - public void testRetrieveCorrectFooter() { - - HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("EmbeddedChartHeaderTest.xls"); - HSSFSheet s = wb.getSheetAt(0); - HSSFFooter foot = s.getFooter(); - - assertEquals("Bottom Left", foot.getLeft()); - assertEquals("Bottom Center", foot.getCenter()); - assertEquals("Bottom Right", foot.getRight()); + @Test + public void testRetrieveCorrectFooter() throws IOException { + try (HSSFWorkbook wb = openSampleWorkbook("EmbeddedChartHeaderTest.xls")) { + HSSFSheet s = wb.getSheetAt(0); + HSSFFooter foot = s.getFooter(); + + assertEquals("Bottom Left", foot.getLeft()); + assertEquals("Bottom Center", foot.getCenter()); + assertEquals("Bottom Right", foot.getRight()); + } } /** * Testcase for Bug 17039 HSSFHeader does not support DBCS */ - public void testHeaderHas16bitCharacter() { - HSSFWorkbook b = new HSSFWorkbook(); - HSSFSheet s = b.createSheet("Test"); - HSSFHeader h = s.getHeader(); - h.setLeft("\u0391"); - h.setCenter("\u0392"); - h.setRight("\u0393"); - - HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b); - HSSFHeader h2 = b2.getSheet("Test").getHeader(); - - assertEquals(h2.getLeft(),"\u0391"); - assertEquals(h2.getCenter(),"\u0392"); - assertEquals(h2.getRight(),"\u0393"); + @Test + public void testHeaderHas16bitCharacter() throws IOException { + try (HSSFWorkbook b = new HSSFWorkbook()) { + HSSFSheet s = b.createSheet("Test"); + HSSFHeader h = s.getHeader(); + h.setLeft("\u0391"); + h.setCenter("\u0392"); + h.setRight("\u0393"); + + try (HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b)) { + HSSFHeader h2 = b2.getSheet("Test").getHeader(); + + assertEquals(h2.getLeft(), "\u0391"); + assertEquals(h2.getCenter(), "\u0392"); + assertEquals(h2.getRight(), "\u0393"); + } + } } /** * Testcase for Bug 17039 HSSFFooter does not support DBCS */ - public void testFooterHas16bitCharacter() { - HSSFWorkbook b = new HSSFWorkbook(); - HSSFSheet s = b.createSheet("Test"); - HSSFFooter f = s.getFooter(); - f.setLeft("\u0391"); - f.setCenter("\u0392"); - f.setRight("\u0393"); - - HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b); - HSSFFooter f2 = b2.getSheet("Test").getFooter(); - - assertEquals(f2.getLeft(),"\u0391"); - assertEquals(f2.getCenter(),"\u0392"); - assertEquals(f2.getRight(),"\u0393"); - } - - public void testReadDBCSHeaderFooter() { - HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("DBCSHeader.xls"); - HSSFSheet s = wb.getSheetAt(0); - HSSFHeader h = s.getHeader(); - assertEquals("Header Left " ,h.getLeft(),"\u090f\u0915"); - assertEquals("Header Center " ,h.getCenter(),"\u0939\u094b\u0917\u093e"); - assertEquals("Header Right " ,h.getRight(),"\u091c\u093e"); - - HSSFFooter f = s.getFooter(); - assertEquals("Footer Left " ,f.getLeft(),"\u091c\u093e"); - assertEquals("Footer Center " ,f.getCenter(),"\u091c\u093e"); - assertEquals("Footer Right " ,f.getRight(),"\u091c\u093e"); + @Test + public void testFooterHas16bitCharacter() throws IOException { + try (HSSFWorkbook b = new HSSFWorkbook()) { + HSSFSheet s = b.createSheet("Test"); + HSSFFooter f = s.getFooter(); + f.setLeft("\u0391"); + f.setCenter("\u0392"); + f.setRight("\u0393"); + + try (HSSFWorkbook b2 = HSSFTestDataSamples.writeOutAndReadBack(b)) { + HSSFFooter f2 = b2.getSheet("Test").getFooter(); + + assertEquals(f2.getLeft(), "\u0391"); + assertEquals(f2.getCenter(), "\u0392"); + assertEquals(f2.getRight(), "\u0393"); + } + } + } + + @Test + public void testReadDBCSHeaderFooter() throws IOException { + try (HSSFWorkbook wb = openSampleWorkbook("DBCSHeader.xls")) { + HSSFSheet s = wb.getSheetAt(0); + HSSFHeader h = s.getHeader(); + assertEquals("Header Left ", h.getLeft(), "\u090f\u0915"); + assertEquals("Header Center ", h.getCenter(), "\u0939\u094b\u0917\u093e"); + assertEquals("Header Right ", h.getRight(), "\u091c\u093e"); + + HSSFFooter f = s.getFooter(); + assertEquals("Footer Left ", f.getLeft(), "\u091c\u093e"); + assertEquals("Footer Center ", f.getCenter(), "\u091c\u093e"); + assertEquals("Footer Right ", f.getRight(), "\u091c\u093e"); + } } /** * Excel tolerates files with missing HEADER/FOOTER records. POI should do the same. */ - public void testMissingHeaderFooterRecord_bug47244() { + @Test + public void testMissingHeaderFooterRecord_bug47244() throws IOException { // noHeaderFooter47244.xls was created by a slightly modified POI // which omitted the HEADER/FOOTER records - HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("noHeaderFooter47244.xls"); - HSSFSheet sheet = wb.getSheetAt(0); - HSSFFooter footer; - try { - footer = sheet.getFooter(); - } catch (NullPointerException e) { - throw new AssertionFailedError("Identified bug 47244a"); - } - assertEquals("", footer.getRawText()); - HSSFHeader header = sheet.getHeader(); - assertEquals("", header.getRawText()); - - // make sure header / footer is properly linked to underlying data - HSSFHeader header2 = sheet.getHeader(); - header.setCenter("foo"); - assertEquals("foo", header2.getCenter()); - - HSSFFooter footer2 = sheet.getFooter(); - footer.setCenter("bar"); - assertEquals("bar", footer2.getCenter()); + try (HSSFWorkbook wb = openSampleWorkbook("noHeaderFooter47244.xls")) { + HSSFSheet sheet = wb.getSheetAt(0); + // bug 47244a - NullPointerException + HSSFFooter footer = sheet.getFooter(); + assertEquals("", footer.getRawText()); + HSSFHeader header = sheet.getHeader(); + assertEquals("", header.getRawText()); + + // make sure header / footer is properly linked to underlying data + HSSFHeader header2 = sheet.getHeader(); + header.setCenter("foo"); + assertEquals("foo", header2.getCenter()); + + HSSFFooter footer2 = sheet.getFooter(); + footer.setCenter("bar"); + assertEquals("bar", footer2.getCenter()); + } } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java?rev=1872041&r1=1872040&r2=1872041&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java Fri Dec 27 23:00:13 2019 @@ -17,53 +17,48 @@ package org.apache.poi.hssf.usermodel; -import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType; - -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; +import static org.junit.Assert.assertNotNull; -/** - * @author Josh Micich - */ -public final class TestHSSFPatriarch extends TestCase { +import java.io.IOException; - public void testBasic() { +import org.apache.poi.hssf.HSSFTestDataSamples; +import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType; +import org.junit.Test; - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet(); +public final class TestHSSFPatriarch { - HSSFPatriarch patr = sheet.createDrawingPatriarch(); - assertNotNull(patr); + @Test + public void testBasic() throws IOException { + try (HSSFWorkbook wb = new HSSFWorkbook()) { + HSSFSheet sheet = wb.createSheet(); - // assert something more interesting + HSSFPatriarch patr = sheet.createDrawingPatriarch(); + assertNotNull(patr); + } } - public void test44916() { - - HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet(); + @Test + public void test44916() throws IOException { + try (HSSFWorkbook wb = new HSSFWorkbook()) { + HSSFSheet sheet = wb.createSheet(); + + // 1. Create drawing patriarch + HSSFPatriarch patr = sheet.createDrawingPatriarch(); + + // 2. Try to re-get the patriarch + // bug 44916 - NullPointerException + HSSFPatriarch existingPatr = sheet.getDrawingPatriarch(); + + // 3. Use patriarch + HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 600, 245, (short) 1, 1, (short) 1, 2); + anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE); + byte[] pictureData = HSSFTestDataSamples.getTestDataFileContent("logoKarmokar4.png"); + int idx1 = wb.addPicture(pictureData, HSSFWorkbook.PICTURE_TYPE_PNG); + patr.createPicture(anchor, idx1); - // 1. Create drawing patriarch - HSSFPatriarch patr = sheet.createDrawingPatriarch(); - - // 2. Try to re-get the patriarch - HSSFPatriarch existingPatr; - try { + // 4. Try to re-use patriarch later existingPatr = sheet.getDrawingPatriarch(); - } catch (NullPointerException e) { - throw new AssertionFailedError("Identified bug 44916"); + assertNotNull(existingPatr); } - - // 3. Use patriarch - HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 600, 245, (short) 1, 1, (short) 1, 2); - anchor.setAnchorType(AnchorType.DONT_MOVE_AND_RESIZE); - byte[] pictureData = HSSFTestDataSamples.getTestDataFileContent("logoKarmokar4.png"); - int idx1 = wb.addPicture(pictureData, HSSFWorkbook.PICTURE_TYPE_PNG); - patr.createPicture(anchor, idx1); - - // 4. Try to re-use patriarch later - existingPatr = sheet.getDrawingPatriarch(); - assertNotNull(existingPatr); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java?rev=1872041&r1=1872040&r2=1872041&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java Fri Dec 27 23:00:13 2019 @@ -17,6 +17,10 @@ package org.apache.poi.hssf.usermodel; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.File; @@ -26,18 +30,15 @@ import java.util.List; import javax.imageio.IIOException; import javax.imageio.ImageIO; -import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; import org.junit.BeforeClass; +import org.junit.Test; /** * Test <code>HSSFPictureData</code>. * The code to retrieve images from a workbook provided by Trejkaz (trejkaz at trypticon dot org) in Bug 41223. - * - * @author Yegor Kozlov (yegor at apache dot org) - * @author Trejkaz (trejkaz at trypticon dot org) */ -public final class TestHSSFPictureData extends TestCase{ +public final class TestHSSFPictureData { @BeforeClass public static void setUpClass() { final String tmpDirProperty = System.getProperty("java.io.tmpdir"); @@ -52,6 +53,7 @@ public final class TestHSSFPictureData e ImageIO.setCacheDirectory(tmpDir); } + @Test public void testPictures() throws IOException { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithImages.xls"); @@ -88,6 +90,7 @@ public final class TestHSSFPictureData e } } + @Test public void testMacPicture() throws IOException { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("53446.xls"); @@ -112,6 +115,7 @@ public final class TestHSSFPictureData e } } + @Test public void testNotNullPictures() { HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls"); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java?rev=1872041&r1=1872040&r2=1872041&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java Fri Dec 27 23:00:13 2019 @@ -17,11 +17,13 @@ package org.apache.poi.hssf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -public final class TestHSSFRichTextString extends TestCase { - public void testApplyFont() { +import org.junit.Test; +public final class TestHSSFRichTextString { + @Test + public void testApplyFont() { HSSFRichTextString r = new HSSFRichTextString("testing"); assertEquals(0,r.numFormattingRuns()); r.applyFont(2,4, new HSSFFont((short)1, null)); @@ -59,11 +61,10 @@ public final class TestHSSFRichTextStrin assertEquals(1, r.getFontAtIndex(4)); assertEquals(1, r.getFontAtIndex(5)); assertEquals(1, r.getFontAtIndex(6)); - } + @Test public void testClearFormatting() { - HSSFRichTextString r = new HSSFRichTextString("testing"); assertEquals(0, r.numFormattingRuns()); r.applyFont(2, 4, new HSSFFont( (short) 1, null)); @@ -76,8 +77,8 @@ public final class TestHSSFRichTextStrin /** * Test case proposed in Bug 40520: formated twice => will format whole String */ + @Test public void test40520_1() { - short font = 3; HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890"); @@ -93,8 +94,8 @@ public final class TestHSSFRichTextStrin /** * Test case proposed in Bug 40520: overlapped range => will format whole String */ + @Test public void test40520_2() { - short font = 3; HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890"); @@ -110,8 +111,8 @@ public final class TestHSSFRichTextStrin /** * Test case proposed in Bug 40520: formated twice => will format whole String */ + @Test public void test40520_3() { - short font = 3; HSSFRichTextString r = new HSSFRichTextString("f0_123456789012345678901234567890123456789012345678901234567890"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
