diff options
12 files changed, 33 insertions, 32 deletions
diff --git a/jack-tests/tests/com/android/jack/annotation/test006/dx/Tests.java b/jack-tests/tests/com/android/jack/annotation/test006/dx/Tests.java index 60309bb..1ce4b8b 100644 --- a/jack-tests/tests/com/android/jack/annotation/test006/dx/Tests.java +++ b/jack-tests/tests/com/android/jack/annotation/test006/dx/Tests.java @@ -50,7 +50,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 1); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); String declaredClasses = stringifyTypeArray(testClass.getDeclaredClasses()); boolean testDeclaredClasses = declaredClasses.contains("[2]"); testDeclaredClasses = testDeclaredClasses && declaredClasses.contains("class com.android.jack.annotation.test006.jack.ReflectAnnotationsTest$InnerClass"); @@ -86,7 +86,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertEquals("public java.lang.Object com.android.jack.annotation.test006.jack.ReflectAnnotationsTest.getLocal(int)", testClass.getEnclosingMethod().toString()); Assert.assertEquals(testClass.getModifiers(), 0); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getClasses())); Assert.assertFalse(testClass.isAnnotation()); @@ -114,7 +114,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 1); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getClasses())); Assert.assertFalse(testClass.isAnnotation()); @@ -142,7 +142,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 9); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getClasses())); Assert.assertFalse(testClass.isAnnotation()); @@ -176,7 +176,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 1); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); String declaredClasses = stringifyTypeArray(testClass.getDeclaredClasses()); boolean testDeclared = declaredClasses.contains("[2]"); testDeclared = testDeclared && declaredClasses.contains("com.android.jack.annotation.test006.jack.ReflectAnnotationsTest2$Generic2"); @@ -209,7 +209,7 @@ public class Tests { Assert.assertEquals("public com.android.jack.annotation.test006.jack.ReflectAnnotationsTest2()", testClass.getEnclosingConstructor().toString()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 0); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getClasses())); Assert.assertFalse(testClass.isAnnotation()); @@ -237,7 +237,7 @@ public class Tests { Assert.assertNull(testClass.getEnclosingConstructor()); Assert.assertNull(testClass.getEnclosingMethod()); Assert.assertEquals(testClass.getModifiers(), 2); - Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jayce", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); String memberClasses = stringifyTypeArray(testClass.getClasses()); boolean testMemberClasses = memberClasses.contains("java.util.AbstractMap$SimpleEntry"); diff --git a/jack/Android.mk b/jack/Android.mk index 1e8e794..cb96c4d 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -180,9 +180,9 @@ test-jack-unit-all: $(LIB_JACK_UNIT_TESTS) $(LOCAL_PATH)/run-jack-unit-tests $(l .PHONY: clean-jack-files clean-jack-files: - $(hide) find $(OUT_DIR) -name "*.jack" | xargs rm -f + $(hide) find $(OUT_DIR) -name "*.jayce" | xargs rm -f $(hide) for i in `find $(OUT_DIR) -name "*.jar"` ; do ((unzip -l $$i 2> /dev/null | \ - grep -q "\.jack$$" && rm -f $$i) || continue ) ; done + grep -q "\.jayce$$" && rm -f $$i) || continue ) ; done @echo "All jack files and archives containing jack files have been removed." .PHONY: clean-dex-files diff --git a/jack/src/com/android/jack/backend/jayce/JayceFileImporter.java b/jack/src/com/android/jack/backend/jayce/JayceFileImporter.java index 6c8b9b7..1b21c90 100644 --- a/jack/src/com/android/jack/backend/jayce/JayceFileImporter.java +++ b/jack/src/com/android/jack/backend/jayce/JayceFileImporter.java @@ -52,7 +52,7 @@ import javax.annotation.Nonnull; public class JayceFileImporter { @Nonnull - public static final String JAYCE_FILE_EXTENSION = ".jack"; + public static final String JAYCE_FILE_EXTENSION = ".jayce"; public static final int JACK_EXTENSION_LENGTH = JAYCE_FILE_EXTENSION.length(); diff --git a/jack/src/com/android/jack/jayce/JaycePackageLoader.java b/jack/src/com/android/jack/jayce/JaycePackageLoader.java index fff8ebb..be00bad 100644 --- a/jack/src/com/android/jack/jayce/JaycePackageLoader.java +++ b/jack/src/com/android/jack/jayce/JaycePackageLoader.java @@ -82,7 +82,8 @@ public class JaycePackageLoader implements PackageLoader { for (InputVElement sub : dir.list()) { String fileName = sub.getName(); if (!sub.isVDir() && JayceFileImporter.isJackFileName(fileName)) { - subs.add(fileName.substring(0, fileName.length() - 5)); + subs.add( + fileName.substring(0, fileName.length() - JayceFileImporter.JACK_EXTENSION_LENGTH)); } } return subs; diff --git a/jack/tests/com/android/jack/ClasspathTest.java b/jack/tests/com/android/jack/ClasspathTest.java index dc521c9..324bff7 100644 --- a/jack/tests/com/android/jack/ClasspathTest.java +++ b/jack/tests/com/android/jack/ClasspathTest.java @@ -115,7 +115,7 @@ public class ClasspathTest { // delete unused inner in classpath and check we can still compile with it boolean deleted = new File(libOut, - "com/android/jack/classpath/test003/lib/HasInnersClasses$InnerToDelete.jack") + "com/android/jack/classpath/test003/lib/HasInnersClasses$InnerToDelete.jayce") .delete(); Assert.assertTrue(deleted); File testOut = TestTools.createTempDir("ClasspathTest", "test"); diff --git a/jack/tests/com/android/jack/FileConflictTest.java b/jack/tests/com/android/jack/FileConflictTest.java index 1f2f555..f5b115d 100644 --- a/jack/tests/com/android/jack/FileConflictTest.java +++ b/jack/tests/com/android/jack/FileConflictTest.java @@ -54,15 +54,15 @@ public class FileConflictTest { @Nonnull private static final String COMMON_PATH_002 = "com/android/jack/fileconflict/test002/jack/"; @Nonnull - private static final String JACK_FILE_PATH_1 = COMMON_PATH_001 + "MyClass.jack"; + private static final String JACK_FILE_PATH_1 = COMMON_PATH_001 + "MyClass.jayce"; @Nonnull - private static final String JACK_FILE_PATH_2 = COMMON_PATH_001 + "MyClass2.jack"; + private static final String JACK_FILE_PATH_2 = COMMON_PATH_001 + "MyClass2.jayce"; @Nonnull - private static final String JACK_FILE_PATH_3 = COMMON_PATH_001 + "MyClass3.jack"; + private static final String JACK_FILE_PATH_3 = COMMON_PATH_001 + "MyClass3.jayce"; @Nonnull - private static final String JACK_FILE_PATH_002_1 = COMMON_PATH_002 + "IrrelevantForTest.jack"; + private static final String JACK_FILE_PATH_002_1 = COMMON_PATH_002 + "IrrelevantForTest.jayce"; @Nonnull - private static final String JACK_FILE_PATH_002_2 = COMMON_PATH_002 + "IrrelevantForTest2.jack"; + private static final String JACK_FILE_PATH_002_2 = COMMON_PATH_002 + "IrrelevantForTest2.jayce"; @Nonnull private static final String RESOURCE1_SHORTPATH = "Resource1"; @Nonnull @@ -241,7 +241,7 @@ public class FileConflictTest { TestTools.getDefaultBootclasspathString(), tempJackFolder, false /* non-zipped */); // get paths for Jack files - String jackFilePath = "com/android/jack/fileconflict/test003/jack/MyClass.jack"; + String jackFilePath = "com/android/jack/fileconflict/test003/jack/MyClass.jayce"; File myClass1 = new File(tempJackFolder, jackFilePath); // create Jack dirs to import @@ -277,7 +277,7 @@ public class FileConflictTest { TestTools.getDefaultBootclasspathString(), tempJackFolder, false /* non-zipped */); // get paths for Jack files - String jackFilePath = "com/android/jack/fileconflict/test003/jack/MyClass.jack"; + String jackFilePath = "com/android/jack/fileconflict/test003/jack/MyClass.jayce"; File myClass1 = new File(tempJackFolder, jackFilePath); // create Jack dirs to import @@ -320,7 +320,7 @@ public class FileConflictTest { TestTools.getDefaultBootclasspathString(), tempJackFolder, false /* non-zipped */); // get paths for Jack files - String jackFilePath = "com/android/jack/fileconflict/test004/jack/MyClass.jack"; + String jackFilePath = "com/android/jack/fileconflict/test004/jack/MyClass.jayce"; File myClass1 = new File(tempJackFolder, jackFilePath); // create Jack dirs to import diff --git a/jack/tests/com/android/jack/ResourceTest.java b/jack/tests/com/android/jack/ResourceTest.java index 0affaaa..1f01e0a 100644 --- a/jack/tests/com/android/jack/ResourceTest.java +++ b/jack/tests/com/android/jack/ResourceTest.java @@ -48,7 +48,7 @@ public class ResourceTest { @Nonnull private static final String COMMON_PATH = "com/android/jack/resource/test001/jack/"; @Nonnull - private static final String JACK_FILE_PATH = COMMON_PATH + "IrrelevantForTest.jack"; + private static final String JACK_FILE_PATH = COMMON_PATH + "IrrelevantForTest.jayce"; @Nonnull private static final String RESOURCE1_SHORTPATH = "Resource1"; @Nonnull diff --git a/jack/tests/com/android/jack/SwitchesTest.java b/jack/tests/com/android/jack/SwitchesTest.java index f29b918..7e92046 100644 --- a/jack/tests/com/android/jack/SwitchesTest.java +++ b/jack/tests/com/android/jack/SwitchesTest.java @@ -62,7 +62,7 @@ public class SwitchesTest { @Test public void testCompile2AsJackThenDex() throws Exception { - File outJackTmp = TestTools.createTempDir("switchstatement2", ".jack"); + File outJackTmp = TestTools.createTempDir("switchstatement2", ".jayce"); try { { diff --git a/jack/tests/com/android/jack/WithPhantomTest.java b/jack/tests/com/android/jack/WithPhantomTest.java index 6016350..3affdad 100644 --- a/jack/tests/com/android/jack/WithPhantomTest.java +++ b/jack/tests/com/android/jack/WithPhantomTest.java @@ -53,7 +53,7 @@ public class WithPhantomTest { TestTools.getJackTestsWithJackFolder(TEST001), BOOTCLASSPATH, tempJackFolder, false /* non-zipped */); boolean deleted = new File(tempJackFolder, - fixPath("com/android/jack/withphantom/test001/jack/A.jack")).delete(); + fixPath("com/android/jack/withphantom/test001/jack/A.jayce")).delete(); Assert.assertTrue(deleted); File testFolder = TestTools.getJackTestFolder(TEST001); @@ -106,7 +106,7 @@ public class WithPhantomTest { TestTools.getJackTestsWithJackFolder(TEST001), BOOTCLASSPATH, tempJackFolder, false /* non-zipped */); boolean deleted = new File(tempJackFolder, - fixPath("com/android/jack/withphantom/test001/jack/A$Inner1.jack")).delete(); + fixPath("com/android/jack/withphantom/test001/jack/A$Inner1.jayce")).delete(); Assert.assertTrue(deleted); File testFolder = TestTools.getJackTestFolder(TEST001); @@ -193,7 +193,7 @@ public class WithPhantomTest { TestTools.getJackTestsWithJackFolder(TEST002), BOOTCLASSPATH, tempJackFolder, false /* non-zipped */); boolean deleted = new File(tempJackFolder, - fixPath("com/android/jack/withphantom/test002/jack/A.jack")).delete(); + fixPath("com/android/jack/withphantom/test002/jack/A.jayce")).delete(); Assert.assertTrue(deleted); File testFolder = TestTools.getJackTestFolder(TEST002); diff --git a/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java b/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java index a40ad62..feeea5d 100644 --- a/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java +++ b/jack/tests/com/android/jack/errorhandling/JackFormatErrorTest.java @@ -51,7 +51,7 @@ public class JackFormatErrorTest { public void testJackFormatError001() throws Exception { TestingEnvironment ite = new TestingEnvironment(); - ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jack", + ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jayce", "jayce(" + JayceWriter.DEFAULT_MAJOR_VERSION + "." + Version.CURRENT_MINOR + ")Corrupted"); ite.addFile(ite.getSourceFolder(),"jack.incremental", "B.java", @@ -84,7 +84,7 @@ public class JackFormatErrorTest { public void testJackFormatError002() throws Exception { TestingEnvironment ite = new TestingEnvironment(); - ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jack", + ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jayce", "jayce()"); ite.addFile(ite.getSourceFolder(),"jack.incremental", "B.java", @@ -117,7 +117,7 @@ public class JackFormatErrorTest { public void testJackFormatError003() throws Exception { TestingEnvironment ite = new TestingEnvironment(); - ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jack", + ite.addFile(ite.getJackFolder(), "jack.incremental", "A.jayce", "jayce(0.0)"); ite.addFile(ite.getSourceFolder(),"jack.incremental", "B.java", diff --git a/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java b/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java index 2463a52..35a326a 100644 --- a/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java +++ b/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java @@ -188,7 +188,7 @@ public class IncrementalTestingEnvironment extends TestTools { Long previousDate = fileModificationDate.get(jackFile.getAbsolutePath()); if (previousDate == null || jackFile.lastModified() > previousDate.longValue()) { String jackFileName = jackFile.getAbsolutePath(); - String binaryTypeName = jackFileName.substring(0, jackFileName.indexOf(".jack")); + String binaryTypeName = jackFileName.substring(0, jackFileName.indexOf(".jayce")); binaryTypeName = binaryTypeName.substring(jackFolder.getAbsolutePath().length() + 1); fqnOfRebuiltTypes.add(binaryTypeName.replace(File.separatorChar,'.')); } diff --git a/jack/tests/com/android/jack/frontend/MissingClassTest.java b/jack/tests/com/android/jack/frontend/MissingClassTest.java index 8aacd6b..2d697ac 100644 --- a/jack/tests/com/android/jack/frontend/MissingClassTest.java +++ b/jack/tests/com/android/jack/frontend/MissingClassTest.java @@ -30,9 +30,9 @@ public class MissingClassTest { @Test @Category(KnownBugs.class) public void test001() throws Exception { - File outJackTmpMissing = TestTools.createTempDir("MissingClassTest001-missing", ".jack"); - File outJackTmpSuper = TestTools.createTempDir("MissingClassTest001-super", ".jack"); - File outJackTmpTest = TestTools.createTempDir("MissingClassTest001-test", ".jack"); + File outJackTmpMissing = TestTools.createTempDir("MissingClassTest001-missing", ".jayce"); + File outJackTmpSuper = TestTools.createTempDir("MissingClassTest001-super", ".jayce"); + File outJackTmpTest = TestTools.createTempDir("MissingClassTest001-test", ".jayce"); TestTools.compileSourceToJack(new Options(), new File(TestTools.getJackTestsWithJackFolder("frontend/test001"), "missing"), |