Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c am: 79aba3b995 am: 7213f34055

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810

Change-Id: I2651a6e6817c811080dbee496f9beefc972cb7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 21 insertions, 72 deletions

diff --git a/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java b/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java
index d718aaa..af520e1 100644
--- a/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java
+++ b/dexmaker-tests/src/androidTest/java/com/android/dx/DexMakerTest.java
@@ -172,26 +172,6 @@ public final class DexMakerTest {
     }
 
     @Test
-    public void testLoadDeferredClassConstant() throws Exception {
-        /*
-         * public static String call() {
-         *   Class clazz = Generated.class;
-         *   return clazz.getSimpleName();
-         * }
-         */
-        MethodId<?, String> methodId = GENERATED.getMethod(TypeId.STRING, "call");
-        Code code = dexMaker.declare(methodId, PUBLIC | STATIC);
-        Local<Class> clazz = code.newLocal(TypeId.get(Class.class));
-        Local<String> retValue = code.newLocal(TypeId.STRING);
-        code.loadDeferredClassConstant(clazz, GENERATED);
-        MethodId<Class, String> getSimpleName = TypeId.get(Class.class).getMethod(TypeId.STRING, "getSimpleName");
-        code.invokeVirtual(getSimpleName, retValue, clazz);
-        code.returnValue(retValue);
-
-        assertEquals("Generated", getMethod().invoke(null));
-    }
-
-    @Test
     public void testCreateLocalMethodAsNull() throws Exception {
         /*
          * public void call(int value) {
@@ -501,58 +481,6 @@ public final class DexMakerTest {
     }
 
     @Test
-    public void testDeclareNativeMethod() throws Exception {
-        /*
-         * class Generated {
-         *   public Generated() {
-         *   }
-         *   public native void nativeMethod();
-         * }
-         */
-
-        addDefaultConstructor();
-        String nativeMethodName = "nativeMethod";
-        MethodId<?, Void> nativeMethodToGenerate = GENERATED.getMethod(TypeId.VOID, nativeMethodName);
-        dexMaker.declare(nativeMethodToGenerate, java.lang.reflect.Modifier.PUBLIC | java.lang.reflect.Modifier.NATIVE);
-
-        Class<?> generatedClass = generateAndLoad();
-        Object instance = generatedClass.getConstructor().newInstance();
-        Method nativeMethod = instance.getClass().getMethod(nativeMethodName);
-
-        assertTrue((nativeMethod.getModifiers() & NATIVE) != 0);
-        assertTrue((nativeMethod.getModifiers() & PUBLIC) != 0);
-        assertEquals(void.class, nativeMethod.getReturnType());
-        assertEquals(nativeMethodName, nativeMethod.getName());
-        assertEquals(nativeMethod.getParameterTypes().length, 0);
-    }
-
-    @Test
-    public void testDeclareAbstractClassWithAbstractMethod() throws Exception {
-        /*
-         * public abstract class AbstractClass {
-         *   public abstract void abstractMethod();
-         * }
-         */
-
-        dexMaker = new DexMaker();
-        dexMaker.declare(GENERATED, "AbstractClass.java", PUBLIC, TypeId.OBJECT);
-
-        String abstractMethodName = "abstractMethod";
-        MethodId<?, Void> nativeMethodToGenerate = GENERATED.getMethod(TypeId.VOID, abstractMethodName);
-        dexMaker.declare(nativeMethodToGenerate, java.lang.reflect.Modifier.PUBLIC | ABSTRACT);
-
-        Class<?> generatedClass = generateAndLoad();
-        Method nativeMethod = generatedClass.getMethod(abstractMethodName);
-
-        assertTrue((nativeMethod.getModifiers() & ABSTRACT) != 0);
-        assertTrue((nativeMethod.getModifiers() & PUBLIC) != 0);
-        assertEquals(void.class, nativeMethod.getReturnType());
-        assertEquals(abstractMethodName, nativeMethod.getName());
-        assertEquals(nativeMethod.getParameterTypes().length, 0);
-
-    }
-
-    @Test
     public void testReturnType() throws Exception {
         testReturnType(boolean.class, true);
         testReturnType(byte.class, (byte) 5);
@@ -2028,6 +1956,26 @@ public final class DexMakerTest {
     }
 
     @Test
+    public void testAbstractMethodsAreUnsupported() {
+        MethodId<?, Void> methodId = GENERATED.getMethod(TypeId.VOID, "call");
+        try {
+            dexMaker.declare(methodId, ABSTRACT);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    @Test
+    public void testNativeMethodsAreUnsupported() {
+        MethodId<?, Void> methodId = GENERATED.getMethod(TypeId.VOID, "call");
+        try {
+            dexMaker.declare(methodId, NATIVE);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    @Test
     public void testSynchronizedFieldsAreUnsupported() {
         try {
             FieldId<?, ?> fieldId = GENERATED.getField(TypeId.OBJECT, "synchronizedField");
@@ -2057,6 +2005,7 @@ public final class DexMakerTest {
     // TODO: don't generate multiple times (?)
     // TODO: test array types
     // TODO: test generating an interface
+    // TODO: declare native method or abstract method
     // TODO: get a thrown exception 'e' into a local
     // TODO: move a primitive or reference