diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-08 15:25:35 +0200 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-08 17:33:13 +0200 |
commit | 812f071d491be0c0b3bc3b4654b01428018fe77f (patch) | |
tree | c4359004e1a1e1602c33dea314be63013b3bcd7c /jack/tests | |
parent | 1f63e0e92d2452758466dc64ba5f638eddf2fe84 (diff) | |
download | toolchain_jack-812f071d491be0c0b3bc3b4654b01428018fe77f.zip toolchain_jack-812f071d491be0c0b3bc3b4654b01428018fe77f.tar.gz toolchain_jack-812f071d491be0c0b3bc3b4654b01428018fe77f.tar.bz2 |
Change jack files extension from .jack to .jayce
Change-Id: Id517fe37307b7bec0a0199c9d5b2b0c098624a4f
Diffstat (limited to 'jack/tests')
8 files changed, 21 insertions, 21 deletions
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"), |