Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java Fri May 16 13:25:45 2014 @@ -17,11 +17,12 @@ package org.apache.poi.hssf.record; +import static org.junit.Assert.assertArrayEquals; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -200,7 +201,7 @@ public final class TestRecordFactory ext byte[] ser = out.toByteArray(); assertEquals(data.length, ser.length); - assertTrue(Arrays.equals(data, ser)); + assertArrayEquals(data, ser); } public void testNonZeroPadding_bug46987() {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java Fri May 16 13:25:45 2014 @@ -17,11 +17,10 @@ package org.apache.poi.hssf.record; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; -import java.util.Arrays; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; @@ -152,7 +151,7 @@ public final class TestRecordFactoryInpu private void confirmReadInitialRecords(RecordFactoryInputStream rfis) { assertEquals(BOFRecord.class, rfis.nextRecord().getClass()); WindowOneRecord rec1 = (WindowOneRecord) rfis.nextRecord(); - assertTrue(Arrays.equals(HexRead.readFromString(SAMPLE_WINDOW1),rec1.serialize())); + assertArrayEquals(HexRead.readFromString(SAMPLE_WINDOW1),rec1.serialize()); } private static RecordFactoryInputStream createRFIS(byte[] data) { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java Fri May 16 13:25:45 2014 @@ -17,6 +17,8 @@ package org.apache.poi.hssf.record; +import static org.junit.Assert.assertArrayEquals; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -96,7 +98,7 @@ public final class TestSSTRecord extends assertEquals( 688, record.getNumUniqueStrings() ); assertEquals( 688, record.countStrings() ); ser_output = record.serialize(); - assertTrue(Arrays.equals(origData, ser_output)); + assertArrayEquals(origData, ser_output); // testing based on new bug report origData = concatHexDumps("BigSSTRecord2", "BigSSTRecord2CR1", "BigSSTRecord2CR2", "BigSSTRecord2CR3", @@ -120,7 +122,7 @@ public final class TestSSTRecord extends // TODO - trivial differences in ContinueRecord break locations // Sample data should be checked against what most recent Excel version produces. // maybe tweaks are required in ContinuableRecordOutput - assertTrue(Arrays.equals(origData, ser_output)); + assertArrayEquals(origData, ser_output); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java Fri May 16 13:25:45 2014 @@ -19,8 +19,7 @@ package org.apache.poi.hssf.record; -import java.util.Arrays; - +import static org.junit.Assert.assertArrayEquals; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -81,7 +80,7 @@ public final class TestSubRecord extends throw new AssertionFailedError("Identified bug 45778"); } assertEquals(74, data2.length); - assertTrue(Arrays.equals(dataAutoFilter, data2)); + assertArrayEquals(dataAutoFilter, data2); } public void testReadManualComboWithFormula() { @@ -108,7 +107,7 @@ public final class TestSubRecord extends throw new AssertionFailedError("Encoded data differs at index " + i); } } - assertTrue(Arrays.equals(data, data2)); + assertArrayEquals(data, data2); } /** Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java Fri May 16 13:25:45 2014 @@ -17,14 +17,15 @@ package org.apache.poi.hssf.record; +import static org.junit.Assert.assertArrayEquals; + import java.io.ByteArrayInputStream; -import java.util.Arrays; import junit.framework.TestCase; +import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.ss.formula.ptg.RefPtg; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; @@ -73,7 +74,7 @@ public final class TestTextObjectRecord byte [] ser = record.serialize(); assertEquals(ser.length , simpleData.length); - assertTrue(Arrays.equals(simpleData, ser)); + assertArrayEquals(simpleData, ser); //read again RecordInputStream is = TestcaseRecordInputStream.create(simpleData); @@ -147,7 +148,7 @@ public final class TestTextObjectRecord //finally check that the serialized data is the same byte[] src = obj.serialize(); byte[] cln = cloned.serialize(); - assertTrue(Arrays.equals(src, cln)); + assertArrayEquals(src, cln); } /** similar to {@link #simpleData} but with link formula at end of TXO rec*/ @@ -189,6 +190,6 @@ public final class TestTextObjectRecord byte [] data2 = rec.serialize(); assertEquals(linkData.length, data2.length); - assertTrue(Arrays.equals(linkData, data2)); + assertArrayEquals(linkData, data2); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java Fri May 16 13:25:45 2014 @@ -17,14 +17,16 @@ package org.apache.poi.hssf.record.aggregates; +import static org.junit.Assert.assertArrayEquals; + import java.util.Arrays; import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; -import org.apache.poi.hssf.model.RecordStream; import org.apache.poi.hssf.model.InternalSheet; +import org.apache.poi.hssf.model.RecordStream; import org.apache.poi.hssf.record.*; import org.apache.poi.hssf.usermodel.HSSFPrintSetup; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -299,7 +301,7 @@ public final class TestPageSettingsBlock Record[] outRecs = rc.getRecords(); // records were assembled in standard order, so this simple check is OK - assertTrue(Arrays.equals(recs, outRecs)); + assertArrayEquals(recs, outRecs); } public void testDuplicateHeaderFooter_bug48026() { @@ -368,14 +370,14 @@ public final class TestPageSettingsBlock } HeaderFooterRecord hd1 = (HeaderFooterRecord)expectedRecs[4]; //GUID is zero - assertTrue(Arrays.equals(new byte[16], hd1.getGuid())); + assertArrayEquals(new byte[16], hd1.getGuid()); assertTrue(hd1.isCurrentSheet()); UserSViewBegin svb = (UserSViewBegin)expectedRecs[7]; HeaderFooterRecord hd2 = (HeaderFooterRecord)expectedRecs[9]; assertFalse(hd2.isCurrentSheet()); //GUIDs of HeaderFooterRecord and UserSViewBegin must be the same - assertTrue(Arrays.equals(svb.getGuid(), hd2.getGuid())); + assertArrayEquals(svb.getGuid(), hd2.getGuid()); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java Fri May 16 13:25:45 2014 @@ -17,10 +17,11 @@ package org.apache.poi.hssf.record.aggregates; +import static org.junit.Assert.assertArrayEquals; + import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.zip.CRC32; @@ -185,7 +186,7 @@ public final class TestValueRecordsAggre valueRecord.visitCellsForRow(1, sv); valueRecord.visitCellsForRow(2, sv); assertEquals(actualArray.length, sv.getWriteIndex()); - assertTrue(Arrays.equals(expectedArray, actualArray)); + assertArrayEquals(expectedArray, actualArray); } private static BlankRecord newBlankRecord() { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java Fri May 16 13:25:45 2014 @@ -17,15 +17,14 @@ package org.apache.poi.hssf.record.chart; -import java.util.Arrays; +import static org.junit.Assert.assertArrayEquals; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.TestcaseRecordInputStream; import org.apache.poi.util.HexRead; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - /** * Tests for {@link ChartFormatRecord} Test data taken directly from a real * Excel file. @@ -56,6 +55,6 @@ public final class TestChartFormatRecord assertEquals(24, record.getRecordSize()); byte[] data2 = record.serialize(); - assertTrue(Arrays.equals(data, data2)); + assertArrayEquals(data, data2); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java Fri May 16 13:25:45 2014 @@ -17,6 +17,11 @@ package org.apache.poi.hssf.usermodel; +import static org.junit.Assert.assertArrayEquals; + +import java.io.IOException; +import java.util.Arrays; + import junit.framework.TestCase; import org.apache.poi.ddf.EscherDgRecord; @@ -24,9 +29,6 @@ import org.apache.poi.ddf.EscherSpRecord import org.apache.poi.hssf.record.EscherAggregate; import org.apache.poi.ss.util.CellRangeAddress; -import java.io.IOException; -import java.util.Arrays; - /** * Test the ability to clone a sheet. * If adding new records that belong to a sheet (as opposed to a book) @@ -104,7 +106,7 @@ public final class TestCloneSheet extend assertEquals(agg1.serialize().length, agg2.serialize().length); assertEquals(agg1.toXml(""), agg2.toXml("")); - assertTrue(Arrays.equals(agg1.serialize(), agg2.serialize())); + assertArrayEquals(agg1.serialize(), agg2.serialize()); } public void testCloneComment() throws IOException { @@ -120,15 +122,15 @@ public final class TestCloneSheet extend HSSFPatriarch p2 = sh2.getDrawingPatriarch(); HSSFComment c2 = (HSSFComment) p2.getChildren().get(0); - assertTrue(Arrays.equals(c2.getTextObjectRecord().serialize(), c.getTextObjectRecord().serialize())); - assertTrue(Arrays.equals(c2.getObjRecord().serialize(), c.getObjRecord().serialize())); - assertTrue(Arrays.equals(c2.getNoteRecord().serialize(), c.getNoteRecord().serialize())); + assertArrayEquals(c2.getTextObjectRecord().serialize(), c.getTextObjectRecord().serialize()); + assertArrayEquals(c2.getObjRecord().serialize(), c.getObjRecord().serialize()); + assertArrayEquals(c2.getNoteRecord().serialize(), c.getNoteRecord().serialize()); //everything except spRecord.shapeId must be the same assertFalse(Arrays.equals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize())); EscherSpRecord sp = (EscherSpRecord) c2.getEscherContainer().getChild(0); sp.setShapeId(1025); - assertTrue(Arrays.equals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize())); + assertArrayEquals(c2.getEscherContainer().serialize(), c.getEscherContainer().serialize()); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java Fri May 16 13:25:45 2014 @@ -17,7 +17,8 @@ package org.apache.poi.hssf.usermodel; -import java.util.Arrays; +import static org.junit.Assert.assertArrayEquals; + import java.util.Iterator; import java.util.Map; @@ -141,46 +142,34 @@ public final class TestHSSFPalette exten HSSFPalette p = book.getCustomPalette(); /* first test the defaults */ - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 255, (short) 255, (short) 0}, // not [204, 255, 255] p.findSimilarColor((byte) 204, (byte) 255, (byte) 0).getTriplet() - ) ); - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 153, (short) 204, (short) 0}, // not [128, 0, 0] p.findSimilarColor((byte) 128, (byte) 255, (byte) 0).getTriplet() - ) ); - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 0, (short) 255, (short) 0}, // not [0, 51, 102] p.findSimilarColor((byte) 0, (byte) 255, (byte) 102).getTriplet() - ) ); - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 0, (short) 102, (short) 204}, // not [255, 102, 0] p.findSimilarColor((byte) 0, (byte) 102, (byte) 255).getTriplet() - ) ); - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 255, (short) 0, (short) 255}, // not [128, 0, 0] p.findSimilarColor((byte) 128, (byte) 0, (byte) 255).getTriplet() - ) ); - assertTrue( - Arrays.equals( + assertArrayEquals( new short[] {(short) 255, (short) 0, (short) 255}, // not [255, 255, 153] p.findSimilarColor((byte) 255, (byte) 0, (byte) 153).getTriplet() - ) ); @@ -238,6 +227,7 @@ public final class TestHSSFPalette exten */ public void testGnumericStrings() { compareToDefaults(new ColorComparator() { + @Override public void compare(HSSFColor expected, HSSFColor palette) { assertEquals(expected.getHexString(), palette.getHexString()); @@ -256,6 +246,7 @@ public final class TestHSSFPalette exten //should still match defaults; compareToDefaults(new ColorComparator() { + @Override public void compare(HSSFColor expected, HSSFColor palette) { short[] s1 = expected.getTriplet(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java Fri May 16 13:25:45 2014 @@ -17,10 +17,9 @@ package org.apache.poi.hssf.usermodel; -import java.io.FileInputStream; -import java.io.FileOutputStream; +import static org.junit.Assert.assertArrayEquals; + import java.io.IOException; -import java.util.Arrays; import java.util.List; import org.apache.poi.POIDataSamples; @@ -77,7 +76,7 @@ public final class TestHSSFPicture exten int idx1 = wb.addPicture(data1, Workbook.PICTURE_TYPE_JPEG); assertEquals(1, idx1); HSSFPicture p1 = dr.createPicture(anchor, idx1); - assertTrue(Arrays.equals(data1, p1.getPictureData().getData())); + assertArrayEquals(data1, p1.getPictureData().getData()); // register another one byte[] data2 = new byte[]{4, 5, 6}; @@ -85,25 +84,25 @@ public final class TestHSSFPicture exten assertEquals(2, idx2); HSSFPicture p2 = dr.createPicture(anchor, idx2); assertEquals(2, dr.getChildren().size()); - assertTrue(Arrays.equals(data2, p2.getPictureData().getData())); + assertArrayEquals(data2, p2.getPictureData().getData()); // confirm that HSSFPatriarch.getChildren() returns two picture shapes - assertTrue(Arrays.equals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData())); - assertTrue(Arrays.equals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData())); + assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData()); // write, read back and verify that our pictures are there wb = HSSFTestDataSamples.writeOutAndReadBack(wb); List<? extends PictureData> lst2 = wb.getAllPictures(); assertEquals(2, lst2.size()); - assertTrue(Arrays.equals(data1, lst2.get(0).getData())); - assertTrue(Arrays.equals(data2, lst2.get(1).getData())); + assertArrayEquals(data1, lst2.get(0).getData()); + assertArrayEquals(data2, lst2.get(1).getData()); // confirm that the pictures are in the Sheet's drawing sh = wb.getSheet("Pictures"); dr = sh.createDrawingPatriarch(); assertEquals(2, dr.getChildren().size()); - assertTrue(Arrays.equals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData())); - assertTrue(Arrays.equals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData())); + assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData()); // add a third picture byte[] data3 = new byte[]{7, 8, 9}; @@ -111,20 +110,20 @@ public final class TestHSSFPicture exten int idx3 = wb.addPicture(data3, Workbook.PICTURE_TYPE_JPEG); assertEquals(3, idx3); HSSFPicture p3 = dr.createPicture(anchor, idx3); - assertTrue(Arrays.equals(data3, p3.getPictureData().getData())); + assertArrayEquals(data3, p3.getPictureData().getData()); assertEquals(3, dr.getChildren().size()); - assertTrue(Arrays.equals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData())); - assertTrue(Arrays.equals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData())); - assertTrue(Arrays.equals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData())); + assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData()); + assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData()); // write and read again wb = HSSFTestDataSamples.writeOutAndReadBack(wb); List<? extends PictureData> lst3 = wb.getAllPictures(); // all three should be there assertEquals(3, lst3.size()); - assertTrue(Arrays.equals(data1, lst3.get(0).getData())); - assertTrue(Arrays.equals(data2, lst3.get(1).getData())); - assertTrue(Arrays.equals(data3, lst3.get(2).getData())); + assertArrayEquals(data1, lst3.get(0).getData()); + assertArrayEquals(data2, lst3.get(1).getData()); + assertArrayEquals(data3, lst3.get(2).getData()); sh = wb.getSheet("Pictures"); dr = sh.createDrawingPatriarch(); @@ -136,25 +135,25 @@ public final class TestHSSFPicture exten assertEquals(4, idx4); dr.createPicture(anchor, idx4); assertEquals(4, dr.getChildren().size()); - assertTrue(Arrays.equals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData())); - assertTrue(Arrays.equals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData())); - assertTrue(Arrays.equals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData())); - assertTrue(Arrays.equals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData())); + assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData()); + assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData()); + assertArrayEquals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData()); wb = HSSFTestDataSamples.writeOutAndReadBack(wb); List<? extends PictureData> lst4 = wb.getAllPictures(); assertEquals(4, lst4.size()); - assertTrue(Arrays.equals(data1, lst4.get(0).getData())); - assertTrue(Arrays.equals(data2, lst4.get(1).getData())); - assertTrue(Arrays.equals(data3, lst4.get(2).getData())); - assertTrue(Arrays.equals(data4, lst4.get(3).getData())); + assertArrayEquals(data1, lst4.get(0).getData()); + assertArrayEquals(data2, lst4.get(1).getData()); + assertArrayEquals(data3, lst4.get(2).getData()); + assertArrayEquals(data4, lst4.get(3).getData()); sh = wb.getSheet("Pictures"); dr = sh.createDrawingPatriarch(); assertEquals(4, dr.getChildren().size()); - assertTrue(Arrays.equals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData())); - assertTrue(Arrays.equals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData())); - assertTrue(Arrays.equals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData())); - assertTrue(Arrays.equals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData())); + assertArrayEquals(data1, ((HSSFPicture)dr.getChildren().get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((HSSFPicture)dr.getChildren().get(1)).getPictureData().getData()); + assertArrayEquals(data3, ((HSSFPicture)dr.getChildren().get(2)).getPictureData().getData()); + assertArrayEquals(data4, ((HSSFPicture)dr.getChildren().get(3)).getPictureData().getData()); } public void testBSEPictureRef(){ @@ -256,12 +255,12 @@ public final class TestHSSFPicture exten wb = HSSFTestDataSamples.writeOutAndReadBack(wb); byte pictureDataOut[] = wb.getAllPictures().get(0).getData(); - assertTrue(Arrays.equals(pictureDataEmf, pictureDataOut)); + assertArrayEquals(pictureDataEmf, pictureDataOut); byte wmfNoHeader[] = new byte[pictureDataWmf.length-22]; System.arraycopy(pictureDataWmf, 22, wmfNoHeader, 0, pictureDataWmf.length-22); pictureDataOut = wb.getAllPictures().get(2).getData(); - assertTrue(Arrays.equals(wmfNoHeader, pictureDataOut)); + assertArrayEquals(wmfNoHeader, pictureDataOut); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java Fri May 16 13:25:45 2014 @@ -17,12 +17,13 @@ package org.apache.poi.hssf.usermodel; +import static org.junit.Assert.assertArrayEquals; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import java.util.List; import junit.framework.TestCase; @@ -119,17 +120,17 @@ public final class TestOLE2Embeding exte Ole10Native ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory()); bos.reset(); pptPoifs.writeFilesystem(bos); - assertTrue(Arrays.equals(ole10.getDataBuffer(), bos.toByteArray())); + assertArrayEquals(ole10.getDataBuffer(), bos.toByteArray()); od = wb.getAllEmbeddedObjects().get(1); ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory()); bos.reset(); xlsPoifs.writeFilesystem(bos); - assertTrue(Arrays.equals(ole10.getDataBuffer(), bos.toByteArray())); + assertArrayEquals(ole10.getDataBuffer(), bos.toByteArray()); od = wb.getAllEmbeddedObjects().get(2); ole10 = Ole10Native.createFromEmbeddedOleObject((DirectoryNode)od.getDirectory()); - assertTrue(Arrays.equals(ole10.getDataBuffer(), getSampleTXT())); + assertArrayEquals(ole10.getDataBuffer(), getSampleTXT()); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java Fri May 16 13:25:45 2014 @@ -17,7 +17,12 @@ package org.apache.poi.hssf.usermodel; +import static org.junit.Assert.assertArrayEquals; + +import java.io.IOException; + import junit.framework.TestCase; + import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherOptRecord; import org.apache.poi.ddf.EscherProperties; @@ -27,9 +32,6 @@ import org.apache.poi.hssf.model.HSSFTes import org.apache.poi.hssf.model.PolygonShape; import org.apache.poi.hssf.record.ObjRecord; -import java.io.IOException; -import java.util.Arrays; - /** * @author Evgeniy Berlog * @date 28.06.12 @@ -55,19 +57,19 @@ public class TestPolygon extends TestCas byte[] actual = polygon.getEscherContainer().getChild(0).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); expected = polygonShape.getSpContainer().getChild(2).serialize(); actual = polygon.getEscherContainer().getChild(2).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); expected = polygonShape.getSpContainer().getChild(3).serialize(); actual = polygon.getEscherContainer().getChild(3).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); ObjRecord obj = polygon.getObjRecord(); ObjRecord objShape = polygonShape.getObjRecord(); @@ -76,7 +78,7 @@ public class TestPolygon extends TestCas actual = objShape.serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); } public void testPolygonPoints(){ @@ -98,8 +100,8 @@ public class TestPolygon extends TestCas assertEquals(verticesProp1.toXml(""), verticesProp2.toXml("")); polygon.setPoints(new int[]{1,2,3}, new int[] {4,5,6}); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{1, 2, 3})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{4, 5, 6})); + assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3}); + assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6}); polygonShape = HSSFTestModelHelper.createPolygonShape(0, polygon); verticesProp1 = polygon.getOptRecord().lookup(EscherProperties.GEOMETRY__VERTICES); @@ -119,8 +121,8 @@ public class TestPolygon extends TestCas polygon.setPolygonDrawArea( 102, 101 ); polygon.setPoints( new int[]{1,2,3}, new int[]{4,5,6} ); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{1,2,3})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{4, 5, 6})); + assertArrayEquals(polygon.getXPoints(), new int[]{1,2,3}); + assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6}); assertEquals(polygon.getDrawAreaHeight(), 101); assertEquals(polygon.getDrawAreaWidth(), 102); @@ -129,16 +131,16 @@ public class TestPolygon extends TestCas patriarch = sh.getDrawingPatriarch(); polygon = (HSSFPolygon) patriarch.getChildren().get(0); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{1, 2, 3})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{4, 5, 6})); + assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3}); + assertArrayEquals(polygon.getYPoints(), new int[]{4, 5, 6}); assertEquals(polygon.getDrawAreaHeight(), 101); assertEquals(polygon.getDrawAreaWidth(), 102); polygon.setPolygonDrawArea( 1021, 1011 ); polygon.setPoints( new int[]{11,21,31}, new int[]{41,51,61} ); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{11, 21, 31})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{41, 51, 61})); + assertArrayEquals(polygon.getXPoints(), new int[]{11, 21, 31}); + assertArrayEquals(polygon.getYPoints(), new int[]{41, 51, 61}); assertEquals(polygon.getDrawAreaHeight(), 1011); assertEquals(polygon.getDrawAreaWidth(), 1021); @@ -148,8 +150,8 @@ public class TestPolygon extends TestCas polygon = (HSSFPolygon) patriarch.getChildren().get(0); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{11, 21, 31})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{41, 51, 61})); + assertArrayEquals(polygon.getXPoints(), new int[]{11, 21, 31}); + assertArrayEquals(polygon.getYPoints(), new int[]{41, 51, 61}); assertEquals(polygon.getDrawAreaHeight(), 1011); assertEquals(polygon.getDrawAreaWidth(), 1021); } @@ -187,18 +189,18 @@ public class TestPolygon extends TestCas polygon1 = (HSSFPolygon) patriarch.getChildren().get(1); polygon2 = (HSSFPolygon) patriarch.getChildren().get(2); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{1, 2, 3})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{4,5,6})); + assertArrayEquals(polygon.getXPoints(), new int[]{1, 2, 3}); + assertArrayEquals(polygon.getYPoints(), new int[]{4,5,6}); assertEquals(polygon.getDrawAreaHeight(), 101); assertEquals(polygon.getDrawAreaWidth(), 102); - assertTrue(Arrays.equals(polygon1.getXPoints(), new int[]{11,12,13})); - assertTrue(Arrays.equals(polygon1.getYPoints(), new int[]{14,15,16})); + assertArrayEquals(polygon1.getXPoints(), new int[]{11,12,13}); + assertArrayEquals(polygon1.getYPoints(), new int[]{14,15,16}); assertEquals(polygon1.getDrawAreaHeight(), 104); assertEquals(polygon1.getDrawAreaWidth(), 103); - assertTrue(Arrays.equals(polygon2.getXPoints(), new int[]{21,22,23})); - assertTrue(Arrays.equals(polygon2.getYPoints(), new int[]{24,25,26})); + assertArrayEquals(polygon2.getXPoints(), new int[]{21,22,23}); + assertArrayEquals(polygon2.getYPoints(), new int[]{24,25,26}); assertEquals(polygon2.getDrawAreaHeight(), 204); assertEquals(polygon2.getDrawAreaWidth(), 203); } @@ -212,8 +214,8 @@ public class TestPolygon extends TestCas HSSFPolygon polygon = (HSSFPolygon) drawing.getChildren().get(0); assertEquals(polygon.getDrawAreaHeight(), 2466975); assertEquals(polygon.getDrawAreaWidth(), 3686175); - assertTrue(Arrays.equals(polygon.getXPoints(), new int[]{0, 0, 31479, 16159, 19676, 20502})); - assertTrue(Arrays.equals(polygon.getYPoints(), new int[]{0, 0, 36, 56, 34, 18})); + assertArrayEquals(polygon.getXPoints(), new int[]{0, 0, 31479, 16159, 19676, 20502}); + assertArrayEquals(polygon.getYPoints(), new int[]{0, 0, 36, 56, 34, 18}); } public void testPolygonType(){ Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestText.java Fri May 16 13:25:45 2014 @@ -17,15 +17,15 @@ package org.apache.poi.hssf.usermodel; +import static org.junit.Assert.assertArrayEquals; import junit.framework.TestCase; + import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.model.HSSFTestModelHelper; import org.apache.poi.hssf.model.TextboxShape; import org.apache.poi.hssf.record.ObjRecord; import org.apache.poi.hssf.record.TextObjectRecord; -import java.util.Arrays; - /** * @author Evgeniy Berlog * @date 25.06.12 @@ -47,25 +47,25 @@ public class TestText extends TestCase { byte[] actual = textbox.getEscherContainer().getChild(0).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); expected = textboxShape.getSpContainer().getChild(2).serialize(); actual = textbox.getEscherContainer().getChild(2).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); expected = textboxShape.getSpContainer().getChild(3).serialize(); actual = textbox.getEscherContainer().getChild(3).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); expected = textboxShape.getSpContainer().getChild(4).serialize(); actual = textbox.getEscherContainer().getChild(4).serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); ObjRecord obj = textbox.getObjRecord(); ObjRecord objShape = textboxShape.getObjRecord(); @@ -80,7 +80,7 @@ public class TestText extends TestCase { actual = torShape.serialize(); assertEquals(expected.length, actual.length); - assertTrue(Arrays.equals(expected, actual)); + assertArrayEquals(expected, actual); } public void testAddTextToExistingFile() { Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java Fri May 16 13:25:45 2014 @@ -17,8 +17,7 @@ package org.apache.poi.ss.formula.ptg; -import java.util.Arrays; - +import static org.junit.Assert.assertArrayEquals; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -77,7 +76,7 @@ public final class TestArrayPtg extends if(outBuf[0] == 4) { throw new AssertionFailedError("Identified bug 42564b"); } - assertTrue(Arrays.equals(ENCODED_CONSTANT_DATA, outBuf)); + assertArrayEquals(ENCODED_CONSTANT_DATA, outBuf); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java Fri May 16 13:25:45 2014 @@ -17,8 +17,7 @@ package org.apache.poi.ss.formula.ptg; -import java.util.Arrays; - +import static org.junit.Assert.assertArrayEquals; import junit.framework.AssertionFailedError; import org.apache.poi.hssf.record.TestcaseRecordInputStream; @@ -45,6 +44,6 @@ public final class TestAttrPtg extends A } catch (ArrayIndexOutOfBoundsException e) { throw new AssertionFailedError("incorrect re-serialization of tAttrChoose"); } - assertTrue(Arrays.equals(data, data2)); + assertArrayEquals(data, data2); } } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java Fri May 16 13:25:45 2014 @@ -17,8 +17,7 @@ package org.apache.poi.ss.formula.ptg; -import java.util.Arrays; - +import static org.junit.Assert.assertArrayEquals; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -101,7 +100,7 @@ public final class TestReferencePtg exte if (outData[0] == 0x24) { throw new AssertionFailedError("Identified bug 45091"); } - assertTrue(Arrays.equals(tRefN_data, outData)); + assertArrayEquals(tRefN_data, outData); } /** Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java Fri May 16 13:25:45 2014 @@ -17,8 +17,7 @@ package org.apache.poi.ss.usermodel; -import java.util.Arrays; - +import static org.junit.Assert.assertArrayEquals; import junit.framework.TestCase; import org.apache.poi.ss.ITestDataProvider; @@ -179,7 +178,7 @@ public abstract class BaseTestSheetUpdat // remove the formula cells in C4:C6 CellRange<?> dcells = sheet.removeArrayFormula(cr.getTopLeftCell()); // removeArrayFormula should return the same cells as setArrayFormula - assertTrue(Arrays.equals(cr.getFlattenedCells(), dcells.getFlattenedCells())); + assertArrayEquals(cr.getFlattenedCells(), dcells.getFlattenedCells()); for(Cell acell : cr){ assertFalse(acell.isPartOfArrayFormulaGroup()); Modified: poi/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java?rev=1595190&r1=1595189&r2=1595190&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java (original) +++ poi/trunk/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java Fri May 16 13:25:45 2014 @@ -17,9 +17,10 @@ package org.apache.poi.util; +import static org.junit.Assert.assertArrayEquals; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.util.Arrays; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -73,7 +74,7 @@ public final class TestLittleEndianStrea } byte[] expBuf = HexRead.readFromString("77 66 55 44"); - assertTrue(Arrays.equals(actBuf, expBuf)); + assertArrayEquals(actBuf, expBuf); assertEquals(0x33, lei.readUByte()); assertEquals(0, lei.available()); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org