diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-04 16:29:21 +0200 |
---|---|---|
committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-17 17:43:31 +0200 |
commit | 48b0af54ccabf715f1ead0a5c281984bbdc04237 (patch) | |
tree | fccfee5a468762e66008a459cf97d4d3dd0f34cc | |
parent | 859eac4936884b2b44e153e43180f3cb15bb8cdb (diff) | |
download | toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.zip toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.tar.gz toolchain_jack-48b0af54ccabf715f1ead0a5c281984bbdc04237.tar.bz2 |
Adapt ResourceTests to support CaseInsesitiveFS
Bug: 21486756
Change-Id: I3f0e0b7d6a2511b08129bff4bc34a0ba54aead4e
(cherry picked from commit 973a373d8fc030c0ea3e8f6113caa29be3776454)
-rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java | 4 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/classpath/ClasspathTests.java | 2 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/ResourceTests.java | 234 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A (renamed from jack-tests/tests/com/android/jack/resource/test003/jack/A.txt) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A.txt | 11 | ||||
-rw-r--r-- | jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java | 4 | ||||
-rw-r--r-- | jack/src/com/android/jack/library/InputJackLibraryCodec.java | 1 |
7 files changed, 152 insertions, 104 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java index 934bca3..e0dbf2c 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java +++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java @@ -647,7 +647,7 @@ public abstract class AbstractTestTools { /** * The returned {@link InputJackLibrary} must be closed. */ - public static InputJackLibrary getInputJackLibraryFromDir(@Nonnull File dir) { - return new InputJackLibraryCodec().parseString(new CodecContext(), dir.getPath()); + public static InputJackLibrary getInputJackLibrary(@Nonnull File dirOrZip) { + return new InputJackLibraryCodec().parseString(new CodecContext(), dirOrZip.getPath()); } } diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java index e570611..c69991d 100644 --- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java +++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java @@ -128,7 +128,7 @@ public class ClasspathTests { { // delete unused inner in classpath and check we can still compile with it - InputJackLibrary lib = AbstractTestTools.getInputJackLibraryFromDir(libOut); + InputJackLibrary lib = AbstractTestTools.getInputJackLibrary(libOut); lib.getFile(FileType.JAYCE, new VPath("com/android/jack/classpath/test003/lib/HasInnersClasses$InnerToDelete", '/')) .delete(); diff --git a/jack-tests/tests/com/android/jack/resource/ResourceTests.java b/jack-tests/tests/com/android/jack/resource/ResourceTests.java index d0e8220..7098d91 100644 --- a/jack-tests/tests/com/android/jack/resource/ResourceTests.java +++ b/jack-tests/tests/com/android/jack/resource/ResourceTests.java @@ -17,23 +17,24 @@ package com.android.jack.resource; import com.android.jack.library.FileType; +import com.android.jack.library.FileTypeDoesNotExistException; +import com.android.jack.library.InputJackLibrary; import com.android.jack.shrob.obfuscation.NameProviderFactory; import com.android.jack.test.category.KnownBugs; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.JackBasedToolchain; -import com.android.sched.util.stream.ByteStreamSucker; +import com.android.sched.vfs.InputVFile; +import com.android.sched.vfs.VPath; import junit.framework.Assert; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -85,10 +86,10 @@ public class ResourceTests { toolchain.libToExe(jackAr, dexDir, /* zipFile = */ false); // check that resources are contained in dex dir - checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ false); + checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4"); } @Test @@ -103,10 +104,10 @@ public class ResourceTests { // check that resources are contained in dex archive ZipFile zipFile = new ZipFile(dexAr); - checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ false); + checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4"); } @Test @@ -128,10 +129,10 @@ public class ResourceTests { // check that resources are contained in dex archive ZipFile zipFile = new ZipFile(dexAr); - checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ false); - checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ false); + checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4"); } @Test @@ -148,11 +149,18 @@ public class ResourceTests { toolchain.libToLib(jackAr, shrobbedJackAr, /* zipFiles = */ true); // check that resources are contained in dex archive - ZipFile zipFile = new ZipFile(shrobbedJackAr); - checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ true); + InputJackLibrary shrobbedLib = null; + try { + shrobbedLib = AbstractTestTools.getInputJackLibrary(shrobbedJackAr); + checkResourceContentFromLib(shrobbedLib, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromLib(shrobbedLib, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromLib(shrobbedLib, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromLib(shrobbedLib, RESOURCE4_SHORTPATH, "Res4"); + } finally { + if (shrobbedLib != null) { + shrobbedLib.close(); + } + } } @Test @@ -176,15 +184,21 @@ public class ResourceTests { toolchain.libToLib(jackFolder, shrobbedJackAr, /* zipFiles = */ true); // check that resources are contained in Jack archive - ZipFile zipFile = new ZipFile(shrobbedJackAr); - checkResourceContentFromZip(zipFile, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ true); - checkResourceContentFromZip(zipFile, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ true); + InputJackLibrary shrobbedLib = null; + try { + shrobbedLib = AbstractTestTools.getInputJackLibrary(shrobbedJackAr); + checkResourceContentFromLib(shrobbedLib, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromLib(shrobbedLib, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromLib(shrobbedLib, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromLib(shrobbedLib, RESOURCE4_SHORTPATH, "Res4"); + } finally { + if (shrobbedLib != null) { + shrobbedLib.close(); + } + } } @Test - @Ignore public void testJackArchiveToJackDir() throws Exception { // compile source file to a Jack archive and add resources File jackAr = createJackArchiveWithResources(); @@ -197,15 +211,21 @@ public class ResourceTests { toolchain.libToLib(jackAr, shrobbedJackDir, /* zipFiles = */ false); // check that resources are contained in Jack dir - checkResourceContentFromDir(shrobbedJackDir, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ true); - + InputJackLibrary shrobbedLib = null; + try { + shrobbedLib = AbstractTestTools.getInputJackLibrary(shrobbedJackDir); + checkResourceContentFromLib(shrobbedLib, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromLib(shrobbedLib, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromLib(shrobbedLib, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromLib(shrobbedLib, RESOURCE4_SHORTPATH, "Res4"); + } finally { + if (shrobbedLib != null) { + shrobbedLib.close(); + } + } } @Test - @Ignore public void testJackDirToJackDir() throws Exception { // compile source file to a Jack dir File jackFolder = AbstractTestTools.createTempDir(); @@ -225,10 +245,18 @@ public class ResourceTests { toolchain.libToLib(jackFolder, shrobbedJackDir, /* zipFiles = */ false); // check that resources are contained in Jack dir - checkResourceContentFromDir(shrobbedJackDir, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ true); - checkResourceContentFromDir(shrobbedJackDir, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ true); + InputJackLibrary shrobbedLib = null; + try { + shrobbedLib = AbstractTestTools.getInputJackLibrary(shrobbedJackDir); + checkResourceContentFromLib(shrobbedLib, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromLib(shrobbedLib, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromLib(shrobbedLib, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromLib(shrobbedLib, RESOURCE4_SHORTPATH, "Res4"); + } finally { + if (shrobbedLib != null) { + shrobbedLib.close(); + } + } } @Test @@ -249,10 +277,10 @@ public class ResourceTests { toolchain.libToExe(jackFolder, dexDir, /* zipFile = */ false); // check that resources are contained in dex dir - checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ false); + checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4"); } @Test @@ -273,10 +301,10 @@ public class ResourceTests { .libToExe(jackFolder, dexDir, /* zipFile = */ false); // check that resources are contained in dex dir - checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3", /*isLib*/ false); - checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4", /*isLib*/ false); + checkResourceContentFromDir(dexDir, RESOURCE1_SHORTPATH, "Res1"); + checkResourceContentFromDir(dexDir, RESOURCE2_SHORTPATH, "Res2"); + checkResourceContentFromDir(dexDir, RESOURCE3_SHORTPATH, "Res3"); + checkResourceContentFromDir(dexDir, RESOURCE4_SHORTPATH, "Res4"); } @Test @@ -286,20 +314,32 @@ public class ResourceTests { File jackOutputFolder = AbstractTestTools.createTempDir(); //String testName = "resource/test003"; File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.resource.test003"); - File jackTestFolder = AbstractTestTools.getTestRootDir("com.android.jack.resource.test003.jack"); - JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + File jackTestFolder = + AbstractTestTools.getTestRootDir("com.android.jack.resource.test003.jack"); + File rscFolder = new File(jackTestFolder, "rsc"); + String resource1LongPath = "com/android/jack/resource/test003/jack/A"; + String resource2LongPath = "com/android/jack/resource/test003/jack/A.txt"; + JackBasedToolchain toolchain = + AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + toolchain.addResource(rscFolder).addToClasspath(toolchain.getDefaultBootClasspath()) .srcToLib( jackOutputFolder, /* zipFiles = */ false, testFolder); - String resource1LongPath = "com/android/jack/resource/test003/jack/A"; - String resource2LongPath = "com/android/jack/resource/test003/jack/A.txt"; - - // add resources to Jack dir - copyFileToDir(new File(jackTestFolder, "A.txt"), resource1LongPath, jackOutputFolder); - copyFileToDir(new File(jackTestFolder, "A.txt"), resource2LongPath, jackOutputFolder); + // check that resources are contained in Jack dir and check their contents + InputJackLibrary lib = null; + try { + lib = AbstractTestTools.getInputJackLibrary(jackOutputFolder); + InputVFile candidateFile1 = lib.getFile(FileType.RSC, new VPath(resource1LongPath, '/')); + InputVFile candidateFile2 = lib.getFile(FileType.RSC, new VPath(resource2LongPath, '/')); + checkResourceContent(candidateFile1, new File(rscFolder, resource1LongPath)); + checkResourceContent(candidateFile2, new File(rscFolder, resource2LongPath)); + } finally { + if (lib != null) { + lib.close(); + } + } toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13"); @@ -308,11 +348,21 @@ public class ResourceTests { toolchain.libToLib(jackOutputFolder, shrobbedJackDir, /* zipFiles = */ false); // check that resources are contained in Jack dir and check their contents - File referenceFileContent = new File(testFolder, "refs/A.txt"); - checkResourceContent(new File(shrobbedJackDir, "pcz/nbqfcvq/wnpx/frgcifpr/hrgh003/wnpx/A"), - referenceFileContent); - checkResourceContent(new File(shrobbedJackDir, "pcz/nbqfcvq/wnpx/frgcifpr/hrgh003/wnpx/N.txt"), - referenceFileContent); + InputJackLibrary shrobbedLib = null; + try { + shrobbedLib = AbstractTestTools.getInputJackLibrary(shrobbedJackDir); + File referenceFile = new File(testFolder, "refs/A.txt"); + InputVFile candidateFile1 = shrobbedLib.getFile(FileType.RSC, + new VPath("pcz/nbqfcvq/wnpx/frgcifpr/hrgh003/wnpx/A", '/')); + InputVFile candidateFile2 = shrobbedLib.getFile(FileType.RSC, + new VPath("pcz/nbqfcvq/wnpx/frgcifpr/hrgh003/wnpx/N.txt", '/')); + checkResourceContent(candidateFile1, referenceFile); + checkResourceContent(candidateFile2, referenceFile); + } finally { + if (shrobbedLib != null) { + shrobbedLib.close(); + } + } } @Nonnull @@ -331,8 +381,8 @@ public class ResourceTests { } private void checkResourceContentFromZip(@Nonnull ZipFile zipFile, @Nonnull String entryName, - @Nonnull String expectedContent, boolean isLib) throws IOException { - ZipEntry entry = zipFile.getEntry((isLib ? FileType.RSC.getPrefix() + '/' : "") + entryName); + @Nonnull String expectedContent) throws IOException { + ZipEntry entry = zipFile.getEntry(entryName); Assert.assertNotNull(entry); BufferedReader candidateReader = null; BufferedReader referenceReader = null; @@ -351,10 +401,29 @@ public class ResourceTests { } } + private void checkResourceContentFromLib(@Nonnull InputJackLibrary lib, @Nonnull String path, + @Nonnull String expectedContent) throws IOException, FileTypeDoesNotExistException { + InputVFile rescFile = lib.getFile(FileType.RSC, new VPath(path, '/')); + BufferedReader candidateReader = null; + BufferedReader referenceReader = null; + try { + candidateReader = new BufferedReader(new InputStreamReader(rescFile.getInputStream())); + referenceReader = new BufferedReader(new StringReader(expectedContent)); + compareReadLines(referenceReader, candidateReader); + } finally { + if (candidateReader != null) { + candidateReader.close(); + } + if (referenceReader != null) { + referenceReader.close(); + } + } + } + private void checkResourceContentFromDir(@Nonnull File dir, @Nonnull String path, - @Nonnull String expectedContent, boolean isLib) throws IOException { + @Nonnull String expectedContent) throws IOException { assert dir.isDirectory(); - File file = new File(isLib ? new File(dir, FileType.RSC.getPrefix()) : dir, path); + File file = new File(dir, path); Assert.assertTrue(file.exists()); BufferedReader candidateReader = null; BufferedReader referenceReader = null; @@ -374,14 +443,14 @@ public class ResourceTests { } - private void checkResourceContent(@Nonnull File candidateFileContent, - @Nonnull File referenceFileContent) throws IOException { - Assert.assertTrue(candidateFileContent.exists()); + private void checkResourceContent(@Nonnull InputVFile candidateFile, + @Nonnull File referenceFile) throws IOException { BufferedReader candidateReader = null; BufferedReader referenceReader = null; try { - candidateReader = new BufferedReader(new InputStreamReader(new FileInputStream(candidateFileContent))); - referenceReader = new BufferedReader(new InputStreamReader(new FileInputStream(referenceFileContent))); + candidateReader = new BufferedReader(new InputStreamReader(candidateFile.getInputStream())); + referenceReader = + new BufferedReader(new InputStreamReader(new FileInputStream(referenceFile))); compareReadLines(referenceReader, candidateReader); } finally { if (candidateReader != null) { @@ -403,35 +472,4 @@ public class ResourceTests { } Assert.assertNull(candidateReader.readLine()); } - - private void copyFileToDir(@Nonnull File fileToCopy, @Nonnull String relativePath, - @Nonnull File dir) throws IOException { - FileOutputStream fos = null; - FileInputStream fis = null; - try { - fis = new FileInputStream(fileToCopy); - File copiedFile = new File(dir, relativePath); - File parentDir = copiedFile.getParentFile(); - if (!parentDir.exists()) { - boolean res = parentDir.mkdirs(); - if (!res) { - throw new AssertionError(); - } - } - try { - fos = new FileOutputStream(copiedFile); - ByteStreamSucker sucker = new ByteStreamSucker(fis, fos); - sucker.suck(); - } finally { - if (fos != null) { - fos.close(); - } - } - } finally { - if (fis != null) { - fis.close(); - } - } - } - } diff --git a/jack-tests/tests/com/android/jack/resource/test003/jack/A.txt b/jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A index a6beffa..a6beffa 100644 --- a/jack-tests/tests/com/android/jack/resource/test003/jack/A.txt +++ b/jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A diff --git a/jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A.txt b/jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A.txt new file mode 100644 index 0000000..a6beffa --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test003/jack/rsc/com/android/jack/resource/test003/jack/A.txt @@ -0,0 +1,11 @@ +com.android.jack.resource.test003.jack.A +Lcom.android.jack.resource.test003.jack.A; +com/android/jack/resource/test003/jack/A +Lcom/android/jack/resource/test003/jack/A; +A +fddfcom.android.jack.resource.test003.jack.A +fgjgLcom.android.jack.resource.test003.jack.A; +sddtcom/android/jack/resource/test003/jack/A +fdhdhLcom/android/jack/resource/test003/jack/A; +estsrtA + com.android.jack.resource.test003.jack.A Lcom.android.jack.resource.test003.jack.A; com/android/jack/resource/test003/jack/A Lcom/android/jack/resource/test003/jack/A; A
\ No newline at end of file diff --git a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java index 2400b55..8b9e3ad 100644 --- a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java +++ b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java @@ -258,8 +258,8 @@ public class JayceClassOrInterfaceLoader extends AbstractClassOrInterfaceLoader TypePackageAndMethodFormatter lookupFormatter = Jack.getLookupFormatter(); String expectedSignature = lookupFormatter.getName(enclosingPackage, simpleName); if (!signature.equals(expectedSignature)) { - throw new AssertionError("Wrong type in '" + source + "', found '" - + signature + "' while expecting '" + expectedSignature + "'"); + throw new AssertionError("Wrong type in '" + source.getLocation().getDescription() + + "', found '" + signature + "' while expecting '" + expectedSignature + "'"); } return true; } diff --git a/jack/src/com/android/jack/library/InputJackLibraryCodec.java b/jack/src/com/android/jack/library/InputJackLibraryCodec.java index 2b81b0a..4dbc3f9 100644 --- a/jack/src/com/android/jack/library/InputJackLibraryCodec.java +++ b/jack/src/com/android/jack/library/InputJackLibraryCodec.java @@ -94,7 +94,6 @@ public class InputJackLibraryCodec implements StringCodec<InputJackLibrary> { } } else { RunnableHooks hooks = context.getRunnableHooks(); - assert hooks != null; vfs = new ReadZipFS(new InputZipFile(workingDirectory, string, hooks, Existence.MUST_EXIST, ChangePermission.NOCHANGE)); } |