diff options
Diffstat (limited to 'src/test/java/com/android')
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/sign/FullApkSignTest.java (renamed from src/test/java/com/android/apkzlib/sign/FullApkSignTest.java) | 18 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/sign/JarSigningTest.java (renamed from src/test/java/com/android/apkzlib/sign/JarSigningTest.java) | 10 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/sign/ManifestGenerationTest.java (renamed from src/test/java/com/android/apkzlib/sign/ManifestGenerationTest.java) | 8 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/sign/SignatureTestUtils.java (renamed from src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/utils/ApkZFileTestUtils.java (renamed from src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/utils/CachedFileContentsTest.java (renamed from src/test/java/com/android/apkzlib/utils/CachedFileContentsTest.java) | 6 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/utils/CachedSupplierTest.java (renamed from src/test/java/com/android/apkzlib/utils/CachedSupplierTest.java) | 5 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zfile/ApkAlignmentTest.java (renamed from src/test/java/com/android/apkzlib/zfile/ApkAlignmentTest.java) | 10 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/AlignmentTest.java (renamed from src/test/java/com/android/apkzlib/zip/AlignmentTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/EncodeUtilsTest.java (renamed from src/test/java/com/android/apkzlib/zip/EncodeUtilsTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ExtraFieldTest.java (renamed from src/test/java/com/android/apkzlib/zip/ExtraFieldTest.java) | 16 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/FileUseMapTest.java (renamed from src/test/java/com/android/apkzlib/zip/FileUseMapTest.java) | 8 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/OldApkReadTest.java (renamed from src/test/java/com/android/apkzlib/zip/OldApkReadTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java (renamed from src/test/java/com/android/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZFileNotificationTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java) | 6 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZFileReadOnlyTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZFileReadOnlyTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZFileSortTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZFileSortTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZFileTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZFileTest.java) | 10 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZFileTestConstants.java (renamed from src/test/java/com/android/apkzlib/zip/ZFileTestConstants.java) | 2 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZipMergeTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZipMergeTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZipTestUtils.java (renamed from src/test/java/com/android/apkzlib/zip/ZipTestUtils.java) | 4 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/ZipToolsTest.java (renamed from src/test/java/com/android/apkzlib/zip/ZipToolsTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/compress/MultiCompressorTest.java (renamed from src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java) | 14 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/utils/LittleEndianUtilsTest.java (renamed from src/test/java/com/android/apkzlib/zip/utils/LittleEndianUtilsTest.java) | 5 | ||||
-rw-r--r-- | src/test/java/com/android/tools/build/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java (renamed from src/test/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java) | 5 |
25 files changed, 75 insertions, 84 deletions
diff --git a/src/test/java/com/android/apkzlib/sign/FullApkSignTest.java b/src/test/java/com/android/tools/build/apkzlib/sign/FullApkSignTest.java index f72f63c..7514bb7 100644 --- a/src/test/java/com/android/apkzlib/sign/FullApkSignTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/sign/FullApkSignTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.apkzlib.sign; +package com.android.tools.build.apkzlib.sign; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNotNull; -import com.android.apkzlib.utils.ApkZLibPair; -import com.android.apkzlib.zip.AlignmentRule; -import com.android.apkzlib.zip.AlignmentRules; -import com.android.apkzlib.zip.StoredEntry; -import com.android.apkzlib.zip.ZFile; -import com.android.apkzlib.zip.ZFileOptions; -import com.android.apkzlib.zip.ZFileTestConstants; -import com.android.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZLibPair; +import com.android.tools.build.apkzlib.zip.AlignmentRule; +import com.android.tools.build.apkzlib.zip.AlignmentRules; +import com.android.tools.build.apkzlib.zip.StoredEntry; +import com.android.tools.build.apkzlib.zip.ZFile; +import com.android.tools.build.apkzlib.zip.ZFileOptions; +import com.android.tools.build.apkzlib.zip.ZFileTestConstants; import java.io.ByteArrayInputStream; import java.io.File; import java.security.PrivateKey; diff --git a/src/test/java/com/android/apkzlib/sign/JarSigningTest.java b/src/test/java/com/android/tools/build/apkzlib/sign/JarSigningTest.java index 35aeeaf..359686c 100644 --- a/src/test/java/com/android/apkzlib/sign/JarSigningTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/sign/JarSigningTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.apkzlib.sign; +package com.android.tools.build.apkzlib.sign; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; -import com.android.apkzlib.utils.ApkZFileTestUtils; -import com.android.apkzlib.utils.ApkZLibPair; -import com.android.apkzlib.zip.StoredEntry; -import com.android.apkzlib.zip.ZFile; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZLibPair; +import com.android.tools.build.apkzlib.zip.StoredEntry; +import com.android.tools.build.apkzlib.zip.ZFile; import com.google.common.base.Charsets; import com.google.common.hash.Hashing; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/android/apkzlib/sign/ManifestGenerationTest.java b/src/test/java/com/android/tools/build/apkzlib/sign/ManifestGenerationTest.java index f0817d0..963903e 100644 --- a/src/test/java/com/android/apkzlib/sign/ManifestGenerationTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/sign/ManifestGenerationTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.apkzlib.sign; +package com.android.tools.build.apkzlib.sign; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.utils.ApkZFileTestUtils; -import com.android.apkzlib.zip.StoredEntry; -import com.android.apkzlib.zip.ZFile; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.zip.StoredEntry; +import com.android.tools.build.apkzlib.zip.ZFile; import com.google.common.base.Charsets; import com.google.common.io.Closer; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java b/src/test/java/com/android/tools/build/apkzlib/sign/SignatureTestUtils.java index fb1d322..5f1d7e1 100644 --- a/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java +++ b/src/test/java/com/android/tools/build/apkzlib/sign/SignatureTestUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.apkzlib.sign; +package com.android.tools.build.apkzlib.sign; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import com.android.apkzlib.utils.ApkZLibPair; +import com.android.tools.build.apkzlib.utils.ApkZLibPair; import java.math.BigInteger; import java.security.KeyPair; import java.security.KeyPairGenerator; diff --git a/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java b/src/test/java/com/android/tools/build/apkzlib/utils/ApkZFileTestUtils.java index 1ef087f..217d3a1 100644 --- a/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java +++ b/src/test/java/com/android/tools/build/apkzlib/utils/ApkZFileTestUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.apkzlib.utils; +package com.android.tools.build.apkzlib.utils; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.zip.ZFile; import com.android.testutils.TestResources; +import com.android.tools.build.apkzlib.zip.ZFile; import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; import com.google.common.io.Resources; diff --git a/src/test/java/com/android/apkzlib/utils/CachedFileContentsTest.java b/src/test/java/com/android/tools/build/apkzlib/utils/CachedFileContentsTest.java index f9654d7..dc28a0f 100644 --- a/src/test/java/com/android/apkzlib/utils/CachedFileContentsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/utils/CachedFileContentsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.utils; +package com.android.tools.build.apkzlib.utils; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -23,13 +23,11 @@ import static org.junit.Assert.assertTrue; import com.google.common.base.Charsets; import com.google.common.io.Files; - +import java.io.File; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; - public class CachedFileContentsTest { @Rule public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); diff --git a/src/test/java/com/android/apkzlib/utils/CachedSupplierTest.java b/src/test/java/com/android/tools/build/apkzlib/utils/CachedSupplierTest.java index e687bf3..cd082dc 100644 --- a/src/test/java/com/android/apkzlib/utils/CachedSupplierTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/utils/CachedSupplierTest.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package com.android.apkzlib.utils; +package com.android.tools.build.apkzlib.utils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.junit.Test; - import java.util.function.Supplier; +import org.junit.Test; public class CachedSupplierTest { diff --git a/src/test/java/com/android/apkzlib/zfile/ApkAlignmentTest.java b/src/test/java/com/android/tools/build/apkzlib/zfile/ApkAlignmentTest.java index 1731ba9..eee979a 100644 --- a/src/test/java/com/android/apkzlib/zfile/ApkAlignmentTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zfile/ApkAlignmentTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.apkzlib.zfile; +package com.android.tools.build.apkzlib.zfile; 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 com.android.apkzlib.zip.CompressionMethod; -import com.android.apkzlib.zip.StoredEntry; -import com.android.apkzlib.zip.ZFile; -import com.android.apkzlib.zip.ZFileOptions; +import com.android.tools.build.apkzlib.zip.CompressionMethod; +import com.android.tools.build.apkzlib.zip.StoredEntry; +import com.android.tools.build.apkzlib.zip.ZFile; +import com.android.tools.build.apkzlib.zip.ZFileOptions; import java.io.ByteArrayInputStream; import java.io.File; import java.nio.file.Files; diff --git a/src/test/java/com/android/apkzlib/zip/AlignmentTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/AlignmentTest.java index e94a876..4f54b3e 100644 --- a/src/test/java/com/android/apkzlib/zip/AlignmentTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/AlignmentTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; -import static com.android.apkzlib.utils.ApkZFileTestUtils.readSegment; +import static com.android.tools.build.apkzlib.utils.ApkZFileTestUtils.readSegment; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/com/android/apkzlib/zip/EncodeUtilsTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/EncodeUtilsTest.java index 8648aa0..adae865 100644 --- a/src/test/java/com/android/apkzlib/zip/EncodeUtilsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/EncodeUtilsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/android/apkzlib/zip/ExtraFieldTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ExtraFieldTest.java index 2371849..a173dc4 100644 --- a/src/test/java/com/android/apkzlib/zip/ExtraFieldTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ExtraFieldTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -22,14 +22,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; @@ -39,6 +31,12 @@ import java.util.function.BiConsumer; import java.util.function.Function; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * Test setting, removing and updating the extra field of zip entries. diff --git a/src/test/java/com/android/apkzlib/zip/FileUseMapTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/FileUseMapTest.java index 0ee0129..363a993 100644 --- a/src/test/java/com/android/apkzlib/zip/FileUseMapTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/FileUseMapTest.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.google.common.base.Stopwatch; - -import org.junit.Ignore; -import org.junit.Test; - import java.text.DecimalFormat; import java.util.Random; import java.util.concurrent.TimeUnit; +import org.junit.Ignore; +import org.junit.Test; /** * Tests for {@link FileUseMap}. diff --git a/src/test/java/com/android/apkzlib/zip/OldApkReadTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/OldApkReadTest.java index 61a08d7..95ccc0e 100644 --- a/src/test/java/com/android/apkzlib/zip/OldApkReadTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/OldApkReadTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; import java.io.File; import org.junit.Test; diff --git a/src/test/java/com/android/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java index 4301710..48c3e76 100644 --- a/src/test/java/com/android/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; import java.io.File; import org.junit.Test; diff --git a/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileNotificationTest.java index 84be460..4e08f2c 100644 --- a/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileNotificationTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; 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 com.android.apkzlib.utils.ApkZLibPair; -import com.android.apkzlib.utils.IOExceptionRunnable; +import com.android.tools.build.apkzlib.utils.ApkZLibPair; +import com.android.tools.build.apkzlib.utils.IOExceptionRunnable; import com.google.common.collect.Lists; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/src/test/java/com/android/apkzlib/zip/ZFileReadOnlyTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileReadOnlyTest.java index a030a83..b0dd5f7 100644 --- a/src/test/java/com/android/apkzlib/zip/ZFileReadOnlyTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileReadOnlyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileSortTest.java index 869f73a..dd75811 100644 --- a/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileSortTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/android/apkzlib/zip/ZFileTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileTest.java index b7f2979..fa69f5d 100644 --- a/src/test/java/com/android/apkzlib/zip/ZFileTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; -import static com.android.apkzlib.utils.ApkZFileTestUtils.readSegment; +import static com.android.tools.build.apkzlib.utils.ApkZFileTestUtils.readSegment; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,9 +28,9 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.android.apkzlib.zip.compress.DeflateExecutionCompressor; -import com.android.apkzlib.zip.utils.CloseableByteSource; -import com.android.apkzlib.zip.utils.RandomAccessFileUtils; +import com.android.tools.build.apkzlib.zip.compress.DeflateExecutionCompressor; +import com.android.tools.build.apkzlib.zip.utils.CloseableByteSource; +import com.android.tools.build.apkzlib.zip.utils.RandomAccessFileUtils; import com.google.common.base.Charsets; import com.google.common.base.Strings; import com.google.common.base.Throwables; diff --git a/src/test/java/com/android/apkzlib/zip/ZFileTestConstants.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileTestConstants.java index fbf5739..85b9a76 100644 --- a/src/test/java/com/android/apkzlib/zip/ZFileTestConstants.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZFileTestConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; /** * Constants used in tests. diff --git a/src/test/java/com/android/apkzlib/zip/ZipMergeTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZipMergeTest.java index 0090bc7..cd1b246 100644 --- a/src/test/java/com/android/apkzlib/zip/ZipMergeTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZipMergeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.utils.CachedFileContents; +import com.android.tools.build.apkzlib.utils.CachedFileContents; import com.google.common.base.Charsets; import com.google.common.hash.Hashing; import com.google.common.io.ByteStreams; diff --git a/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZipTestUtils.java index aaff18b..d6e31a2 100644 --- a/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZipTestUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertFalse; -import com.android.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; import com.google.common.io.Files; import java.io.File; import java.io.IOException; diff --git a/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/ZipToolsTest.java index e45f117..d5108fe 100644 --- a/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/ZipToolsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.apkzlib.zip; +package com.android.tools.build.apkzlib.zip; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/compress/MultiCompressorTest.java index 4f2eaf0..ee42eaa 100644 --- a/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/compress/MultiCompressorTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.apkzlib.zip.compress; +package com.android.tools.build.apkzlib.zip.compress; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.android.apkzlib.utils.ApkZFileTestUtils; -import com.android.apkzlib.zip.CentralDirectoryHeaderCompressInfo; -import com.android.apkzlib.zip.CompressionMethod; -import com.android.apkzlib.zip.StoredEntry; -import com.android.apkzlib.zip.ZFile; -import com.android.apkzlib.zip.ZFileOptions; +import com.android.tools.build.apkzlib.utils.ApkZFileTestUtils; +import com.android.tools.build.apkzlib.zip.CentralDirectoryHeaderCompressInfo; +import com.android.tools.build.apkzlib.zip.CompressionMethod; +import com.android.tools.build.apkzlib.zip.StoredEntry; +import com.android.tools.build.apkzlib.zip.ZFile; +import com.android.tools.build.apkzlib.zip.ZFileOptions; import com.google.common.util.concurrent.MoreExecutors; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/src/test/java/com/android/apkzlib/zip/utils/LittleEndianUtilsTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/utils/LittleEndianUtilsTest.java index 3264290..3ba856f 100644 --- a/src/test/java/com/android/apkzlib/zip/utils/LittleEndianUtilsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/utils/LittleEndianUtilsTest.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package com.android.apkzlib.zip.utils; +package com.android.tools.build.apkzlib.zip.utils; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertArrayEquals; -import org.junit.Test; - import java.nio.ByteBuffer; import java.util.Random; +import org.junit.Test; public class LittleEndianUtilsTest { @Test diff --git a/src/test/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java b/src/test/java/com/android/tools/build/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java index 012d587..953e9de 100644 --- a/src/test/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java +++ b/src/test/java/com/android/tools/build/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.android.apkzlib.zip.utils; +package com.android.tools.build.apkzlib.zip.utils; import static org.junit.Assert.assertEquals; -import org.junit.Test; - import java.util.Calendar; +import org.junit.Test; public class MsDosDateTimeUtilsTest { @Test |