Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java Thu Apr 16 22:11:16 2020 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.Arrays; import java.util.List; import org.apache.poi.util.HexRead; @@ -77,8 +78,7 @@ public final class TestObjRecord { byte [] recordBytes = record.serialize(); assertEquals(26, recordBytes.length - 4); - byte[] subData = new byte[recdata.length]; - System.arraycopy(recordBytes, 4, subData, 0, subData.length); + byte[] subData = Arrays.copyOfRange(recordBytes, 4, 4+recdata.length); assertArrayEquals(recdata, subData); } @@ -99,8 +99,7 @@ public final class TestObjRecord { //serialize and read again byte [] recordBytes = record.serialize(); //cut off the record header - byte [] bytes = new byte[recordBytes.length-4]; - System.arraycopy(recordBytes, 4, bytes, 0, bytes.length); + byte [] bytes = Arrays.copyOfRange(recordBytes, 4, recordBytes.length); record = new ObjRecord(TestcaseRecordInputStream.create(ObjRecord.sid, bytes)); List<SubRecord> subrecords = record.getSubRecords();
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=1876640&r1=1876639&r2=1876640&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 Thu Apr 16 22:11:16 2020 @@ -24,6 +24,8 @@ import static org.junit.Assert.assertArr import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import java.util.Arrays; + import org.apache.poi.util.HexRead; import org.apache.poi.util.LittleEndian; import org.junit.Test; @@ -130,11 +132,10 @@ public final class TestSubRecord { ); final int LBS_START_POS = 0x002E; final int WRONG_LBS_SIZE = 0x1FEE; - assertEquals(0x0013, LittleEndian.getShort(data, LBS_START_POS+0)); + assertEquals(0x0013, LittleEndian.getShort(data, LBS_START_POS)); assertEquals(WRONG_LBS_SIZE, LittleEndian.getShort(data, LBS_START_POS+2)); int wrongTotalSize = LBS_START_POS + 4 + WRONG_LBS_SIZE; - byte[] wrongData = new byte[wrongTotalSize]; - System.arraycopy(data, 0, wrongData, 0, data.length); + byte[] wrongData = Arrays.copyOf(data, wrongTotalSize); // wrongData has the ObjRecord data as would have been written by v3.1 RecordInputStream in = TestcaseRecordInputStream.create(ObjRecord.sid, wrongData); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java Thu Apr 16 22:11:16 2020 @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.util.Arrays; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianByteArrayInputStream; @@ -95,9 +96,6 @@ public final class TestcaseRecordInputSt } public static byte[] cut(byte[] data, int fromInclusive, int toExclusive) { - int length = toExclusive - fromInclusive; - byte[] result = new byte[length]; - System.arraycopy( data, fromInclusive, result, 0, length); - return result; + return Arrays.copyOfRange(data, fromInclusive, toExclusive); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java Thu Apr 16 22:11:16 2020 @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; import org.apache.poi.hssf.record.ContinueRecord; import org.apache.poi.hssf.record.RecordInputStream; @@ -258,11 +259,8 @@ public final class TestUnicodeString { // Load in again and re-test - byte[] data = new byte[14]; - System.arraycopy(b, 4, data, 0, data.length); - LittleEndianInputStream inp = new LittleEndianInputStream( - new ByteArrayInputStream(data) - ); + byte[] data = Arrays.copyOfRange(b, 4, 4+14); + LittleEndianInputStream inp = new LittleEndianInputStream(new ByteArrayInputStream(data)); ext = new ExtRst(inp, data.length); assertEquals(0, ext.getNumberOfRuns()); 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=1876640&r1=1876639&r2=1876640&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 Thu Apr 16 22:11:16 2020 @@ -21,6 +21,7 @@ import static org.junit.Assert.assertArr import static org.junit.Assert.assertEquals; import java.io.IOException; +import java.util.Arrays; import java.util.List; import org.apache.poi.POIDataSamples; @@ -279,8 +280,7 @@ public final class TestHSSFPicture exten byte[] pictureDataOut = wb2.getAllPictures().get(0).getData(); assertArrayEquals(pictureDataEmf, pictureDataOut); - byte[] wmfNoHeader = new byte[pictureDataWmf.length - 22]; - System.arraycopy(pictureDataWmf, 22, wmfNoHeader, 0, pictureDataWmf.length - 22); + byte[] wmfNoHeader = Arrays.copyOfRange(pictureDataWmf, 22, pictureDataWmf.length); pictureDataOut = wb2.getAllPictures().get(2).getData(); assertArrayEquals(wmfNoHeader, pictureDataOut); } Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java Thu Apr 16 22:11:16 2020 @@ -56,8 +56,7 @@ public final class TestDocumentInputStre } // Now create the POIFS Version - byte[] _workbook_data_only = new byte[_workbook_size]; - System.arraycopy(_workbook_data, 0, _workbook_data_only, 0, _workbook_size); + byte[] _workbook_data_only = Arrays.copyOf(_workbook_data, _workbook_size); POIFSFileSystem poifs = new POIFSFileSystem(); // Make it easy when debugging to see what isn't the doc Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java Thu Apr 16 22:11:16 2020 @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.junit.Test; @@ -93,8 +94,7 @@ public final class TestDocumentOutputStr @Test public void testWrite3() throws IOException { byte[] input = data(50); - byte[] expected = new byte[25]; - System.arraycopy(input, 1, expected, 0, 25); + byte[] expected = Arrays.copyOfRange(input, 1, 1+25); POIFSWriterListener l = (event) -> { DocumentOutputStream dstream = event.getStream(); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java Thu Apr 16 22:11:16 2020 @@ -23,6 +23,8 @@ import static org.junit.Assert.assertNot import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import java.util.Arrays; + import org.junit.Test; /** @@ -49,9 +51,7 @@ public final class TestPOIFSDocumentPath String[] components = {"foo", "bar", "foobar", "fubar"}; for (int j = 0; j < components.length; j++) { - String[] params = new String[ j ]; - - System.arraycopy(components, 0, params, 0, j); + String[] params = Arrays.copyOf(components, j); POIFSDocumentPath path = new POIFSDocumentPath(params); assertEquals(j, path.length()); @@ -91,16 +91,12 @@ public final class TestPOIFSDocumentPath String[] initialComponents = {"a", "b", "c"}; for (int n = 0; n < initialComponents.length; n++) { - String[] initialParams = new String[ n ]; - - System.arraycopy(initialComponents, 0, initialParams, 0, n); + String[] initialParams = Arrays.copyOf(initialComponents, n); POIFSDocumentPath base = new POIFSDocumentPath(initialParams); String[] components = {"foo", "bar", "foobar", "fubar"}; for (int j = 0; j < components.length; j++) { - String[] params = new String[ j ]; - - System.arraycopy(components, 0, params, 0, j); + String[] params = Arrays.copyOf(components, j); POIFSDocumentPath path = new POIFSDocumentPath(base, params); assertEquals(j + n, path.length()); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java Thu Apr 16 22:11:16 2020 @@ -282,9 +282,7 @@ public final class TestDirectoryProperty private static void verifyReadingProperty(int index, byte[] input, int offset, String name) { DirectoryProperty property = new DirectoryProperty(index, input, offset); ByteArrayOutputStream stream = new ByteArrayOutputStream(128); - byte[] expected = new byte[128]; - - System.arraycopy(input, offset, expected, 0, 128); + byte[] expected = Arrays.copyOfRange(input, offset, offset+128); try { property.writeData(stream); } catch (IOException e) { Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java Thu Apr 16 22:11:16 2020 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; import org.apache.poi.hpsf.DocumentSummaryInformation; import org.apache.poi.hpsf.SummaryInformation; @@ -82,9 +83,7 @@ public final class TestDocumentProperty DocumentProperty property = new DocumentProperty(index, input, offset); ByteArrayOutputStream stream = new ByteArrayOutputStream(128); - byte[] expected = new byte[ 128 ]; - - System.arraycopy(input, offset, expected, 0, 128); + byte[] expected = Arrays.copyOfRange(input, offset, offset+128); property.writeData(stream); byte[] output = stream.toByteArray(); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java Thu Apr 16 22:11:16 2020 @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTru import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.poi.poifs.storage.RawDataUtil; @@ -68,8 +69,7 @@ public final class TestPropertyFactory { for (int readBytes; (readBytes = stream.read(buf)) != -1; ) { byte[] bbuf = buf; if (readBytes < 512) { - bbuf = new byte[readBytes]; - System.arraycopy(buf, 0, bbuf, 0, readBytes); + bbuf = Arrays.copyOf(buf, readBytes); } PropertyFactory.convertToProperties(bbuf, properties); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java Thu Apr 16 22:11:16 2020 @@ -19,10 +19,10 @@ package org.apache.poi.poifs.property; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.storage.RawDataUtil; @@ -116,9 +116,7 @@ public final class TestRootProperty { String sClsId) { RootProperty property = new RootProperty(index, input, offset); ByteArrayOutputStream stream = new ByteArrayOutputStream(128); - byte[] expected = new byte[128]; - - System.arraycopy(input, offset, expected, 0, 128); + byte[] expected = Arrays.copyOfRange(input, offset, offset+128); try { property.writeData(stream); } catch (IOException e) { Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java Thu Apr 16 22:11:16 2020 @@ -22,6 +22,7 @@ import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.Arrays; import org.junit.Test; @@ -56,11 +57,9 @@ public final class TestHeaderBlockReadin assertEquals(-2, block.getPropertyStart()); // verify we can't read a short block - byte[] shortblock = new byte[511]; - - System.arraycopy(content, 0, shortblock, 0, 511); + byte[] shortblock = Arrays.copyOf(content, 511); try { - block = new HeaderBlock(new ByteArrayInputStream(shortblock)); + new HeaderBlock(new ByteArrayInputStream(shortblock)); fail("Should have caught IOException reading a short block"); } catch (IOException ignored) { @@ -71,7 +70,7 @@ public final class TestHeaderBlockReadin for (int index = 0; index < 8; index++) { content[index] = (byte) (content[index] - 1); try { - block = new HeaderBlock(new ByteArrayInputStream(content)); + new HeaderBlock(new ByteArrayInputStream(content)); fail("Should have caught IOException corrupting byte " + index); } catch (IOException ignored) { Modified: poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java?rev=1876640&r1=1876639&r2=1876640&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java (original) +++ poi/trunk/src/testcases/org/apache/poi/util/TestByteField.java Thu Apr 16 22:11:16 2020 @@ -116,12 +116,9 @@ public final class TestByteField { @Test public void testReadFromStream() throws IOException { ByteField field = new ByteField(0); - byte[] buffer = new byte[ _test_array.length ]; + ByteArrayInputStream stream = new ByteArrayInputStream(_test_array.clone()); - System.arraycopy(_test_array, 0, buffer, 0, buffer.length); - ByteArrayInputStream stream = new ByteArrayInputStream(buffer); - - for (int j = 0; j < buffer.length; j++) { + for (int j = 0; j < _test_array.length; j++) { field.readFromStream(stream); assertEquals("Testing " + j, _test_array[ j ], field.get()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
