diff options
author | Jean-Marie Hénaff <jmhenaff@google.com> | 2014-10-10 12:19:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-10 12:19:43 +0000 |
commit | 1bf9bfce642a0578be5d6b523a951e0cc4c171d9 (patch) | |
tree | eb3bb8429ecdf1a76fd279b53d17b947ee76f72e /jack-tests | |
parent | 9b14523bf40258cdec9caa48d47c42194a4245a3 (diff) | |
parent | d3edf83a84dd8a358965ab5258644448a87a8394 (diff) | |
download | toolchain_jack-1bf9bfce642a0578be5d6b523a951e0cc4c171d9.zip toolchain_jack-1bf9bfce642a0578be5d6b523a951e0cc4c171d9.tar.gz toolchain_jack-1bf9bfce642a0578be5d6b523a951e0cc4c171d9.tar.bz2 |
Merge "Revert "Change jack files extension from .jack to .jayce"" into ub-jack
Diffstat (limited to 'jack-tests')
-rw-r--r-- | jack-tests/tests/com/android/jack/annotation/test006/dx/Tests.java | 14 |
1 files changed, 7 insertions, 7 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 1ce4b8b..60309bb 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", 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.jayce", testClass.getPackage().toString()); + Assert.assertEquals("package com.android.jack.annotation.test006.jack", testClass.getPackage().toString()); Assert.assertEquals("[0]", stringifyTypeArray(testClass.getDeclaredClasses())); String memberClasses = stringifyTypeArray(testClass.getClasses()); boolean testMemberClasses = memberClasses.contains("java.util.AbstractMap$SimpleEntry"); |