From 3ae9aa12e111d9e266bd605c37f94c2273f1bab9 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 3 Apr 2015 21:13:50 +0000 Subject: Automated [] rollback of []. *** Reason for rollback *** New ZipCombiner creates malformed output ZIP files when input ZIP files contain more than 65535 entries, the maximum amount for non-64-bit ZIP files. *** Original change description *** Rewrite of ZipCombiner to improve performance and maintainability. Added devtools/build/zip to allow reading and writing of ZIP files without requiring decompressing file data to manipulate them. ZipCombiner API has some changes. ZipCombiner#addZip takes a File instead of InputStream. ZipCombiner#addFile takes a ZipFileEntry instead of DirectoryEntryInfo -- MOS_MIGRATED_REVID=90279976 --- .../devtools/build/zip/ZipFileEntryTest.java | 193 --------------------- 1 file changed, 193 deletions(-) delete mode 100644 src/java_tools/singlejar/javatests/com/google/devtools/build/zip/ZipFileEntryTest.java (limited to 'src/java_tools/singlejar/javatests/com/google/devtools/build/zip/ZipFileEntryTest.java') diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/ZipFileEntryTest.java b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/ZipFileEntryTest.java deleted file mode 100644 index de05c4a6e8..0000000000 --- a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/ZipFileEntryTest.java +++ /dev/null @@ -1,193 +0,0 @@ -// Copyright 2015 Google Inc. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.devtools.build.zip; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.common.testing.NullPointerTester; -import com.google.devtools.build.zip.ZipFileEntry.Compression; -import com.google.devtools.build.zip.ZipFileEntry.Flag; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -@RunWith(JUnit4.class) -public class ZipFileEntryTest { - @Rule public ExpectedException thrown = ExpectedException.none(); - - @Test public void testNulls() { - NullPointerTester tester = new NullPointerTester(); - tester.testAllPublicConstructors(ZipFileEntry.class); - tester.testAllPublicInstanceMethods(new ZipFileEntry("foo")); - } - - @Test public void testCrc() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setCrc(32); - } - - @Test public void testCrc_Negative() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry crc-32"); - foo.setCrc(-1); - } - - @Test public void testCrc_Large() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry crc-32"); - foo.setCrc(0x100000000L); - } - - @Test public void testSize() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setSize(32); - } - - @Test public void testSize_Negative() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry size"); - foo.setSize(-1); - } - - @Test public void testSize_Large() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry size"); - foo.setSize(0x100000000L); - } - - @Test public void testCompressedSize() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setCompressedSize(32); - } - - @Test public void testCompressedSize_Negative() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry size"); - foo.setCompressedSize(-1); - } - - @Test public void testCompressedSize_Large() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid entry size"); - foo.setCompressedSize(0x100000000L); - } - - @Test public void testMinVersion_MethodUpdated() { - ZipFileEntry foo = new ZipFileEntry("foo"); - assertThat(foo.getVersion()).isEqualTo((short) -1); - foo.setMethod(Compression.STORED); - assertThat(foo.getVersion()).isEqualTo((short) 0x0a); - } - - @Test public void testMinVersion_Update() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setMethod(Compression.STORED); - foo.setVersion((short) 0x14); - assertThat(foo.getVersion()).isEqualTo((short) 0x14); - } - - @Test public void testMinVersion_BelowRequired() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setMethod(Compression.STORED); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("The minimum allowable version for method STORED is 0x0a."); - foo.setVersion((short) 0); - } - - @Test public void testMinVersionNeeded_MethodUpdated() { - ZipFileEntry foo = new ZipFileEntry("foo"); - assertThat(foo.getVersionNeeded()).isEqualTo((short) -1); - foo.setMethod(Compression.DEFLATED); - assertThat(foo.getVersionNeeded()).isEqualTo((short) 0x14); - } - - @Test public void testMinVersionNeeded_Update() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setMethod(Compression.STORED); - foo.setVersionNeeded((short) 0x28); - assertThat(foo.getVersionNeeded()).isEqualTo((short) 0x28); - } - - @Test public void testMinVersionNeeded_BelowRequired() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setMethod(Compression.DEFLATED); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("The minimum allowable version for method DEFLATED is 0x14."); - foo.setVersionNeeded((short) 0x0a); - } - - @Test public void testSetFlag() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setFlag(Flag.DATA_DESCRIPTOR, true); - assertThat(foo.getFlags()).isEqualTo((short) 0x08); - foo.setFlag(Flag.DATA_DESCRIPTOR, true); - assertThat(foo.getFlags()).isEqualTo((short) 0x08); - foo.setFlag(Flag.DATA_DESCRIPTOR, false); - assertThat(foo.getFlags()).isEqualTo((short) 0x00); - foo.setFlag(Flag.DATA_DESCRIPTOR, false); - assertThat(foo.getFlags()).isEqualTo((short) 0x00); - } - - @Test public void testLocalHeaderOffset() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setLocalHeaderOffset(32); - } - - @Test public void testLocalHeaderOffset_Negative() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid local header offset"); - foo.setLocalHeaderOffset(-1); - } - - @Test public void testLocalHeaderOffset_Large() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid local header offset"); - foo.setLocalHeaderOffset(0x100000000L); - } - - @Test public void testExtra() { - ZipFileEntry foo = new ZipFileEntry("foo"); - foo.setExtra(new byte[32]); - } - - @Test public void testExtra_Large() { - ZipFileEntry foo = new ZipFileEntry("foo"); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("invalid extra field length"); - foo.setExtra(new byte[0x10000]); - } - - @Test public void testExtraData() { - ZipFileEntry foo = new ZipFileEntry("foo"); - ExtraData[] extra = new ExtraData[] { - new ExtraData((short) 0xCAFE, new byte[] { 0x01, 0x02 }), - new ExtraData((short) 0xADDE, new byte[] { (byte) 0xBE, (byte) 0xEF }) }; - foo.setExtra(extra); - assertThat(foo.getExtra()).isEqualTo(new byte[] { - (byte) 0xFE, (byte) 0xCA, 0x02, 0x00, 0x01, 0x02, - (byte) 0xDE, (byte) 0xAD, 0x02, 0x00, (byte) 0xBE, (byte) 0xEF }); - } -} -- cgit v1.2.3