commit f1f395028f32939770392f43f1e0803a5a27be20
author Tamas Kenez <tamaskenez@google.com> Mon Feb 18 22:34:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 18 22:34:35 2019 +0000
tree 96cbc1dced6b940eb47bf7e158124b5f0c1a4157
parent 58bfadb3c105cd3fa7f40f0192fc03252d309a0e
parent 1655e0aae34bee21610855ba0b5240561d2650e7

Merge "Revert "Verify graph information in ServiceLoaderTest""

src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java b/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
index 3728cf5..29e5bcd 100644
--- a/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ServiceLoaderTest.java
@@ -4,8 +4,6 @@
 
 package com.android.tools.r8.shaking;
 
-import static com.android.tools.r8.references.Reference.classFromClass;
-import static com.android.tools.r8.references.Reference.methodFromMethod;
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertEquals;
@@ -13,19 +11,14 @@
 import static org.junit.Assert.assertTrue;
 
 import com.android.tools.r8.DataEntryResource;
-import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.graph.AppServices;
 import com.android.tools.r8.naming.AdaptResourceFileContentsTest.DataResourceConsumerForTesting;
 import com.android.tools.r8.origin.Origin;
-import com.android.tools.r8.references.ClassReference;
-import com.android.tools.r8.references.MethodReference;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
-import com.android.tools.r8.utils.graphinspector.GraphInspector;
-import com.android.tools.r8.utils.graphinspector.GraphInspector.QueryNode;
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -61,7 +54,7 @@
       serviceImplementations.add(WorldGreeter.class.getTypeName());
     }
 
-    R8TestRunResult result =
+    CodeInspector inspector =
         testForR8(backend)
             .addInnerClasses(ServiceLoaderTest.class)
             .addKeepMainRule(TestClass.class)
@@ -76,11 +69,9 @@
                       new DataResourceConsumerForTesting(options.dataResourceConsumer);
                   options.dataResourceConsumer = dataResourceConsumer;
                 })
-            .enableGraphInspector()
             .run(TestClass.class)
-            .assertSuccessWithOutput(expectedOutput);
-
-    CodeInspector inspector = result.inspector();
+            .assertSuccessWithOutput(expectedOutput)
+            .inspector();
 
     ClassSubject greeterSubject = inspector.clazz(Greeter.class);
     assertEquals(includeWorldGreeter, greeterSubject.isPresent());
@@ -101,43 +92,7 @@
       assertEquals(worldGreeterSubject.getFinalName(), lines.get(1));
     }
 
-    verifyGraphInformation(result.graphInspector());
-  }
-
-  private void verifyGraphInformation(GraphInspector graphInspector) throws Exception {
-    assertEquals(1, graphInspector.getRoots().size());
-    QueryNode keepMain = graphInspector.rule(Origin.unknown(), 1, 1).assertRoot();
-
-    MethodReference mainMethod =
-        methodFromMethod(TestClass.class.getDeclaredMethod("main", String[].class));
-    graphInspector.method(mainMethod).assertKeptBy(keepMain);
-
-    ClassReference helloGreeterClass = classFromClass(HelloGreeter.class);
-    MethodReference helloGreeterInitMethod = methodFromMethod(HelloGreeter.class.getConstructor());
-    MethodReference helloGreeterGreetingMethod =
-        methodFromMethod(HelloGreeter.class.getDeclaredMethod("greeting"));
-
-    graphInspector.clazz(helloGreeterClass).assertKeptBy(graphInspector.method(mainMethod));
-    graphInspector.clazz(helloGreeterClass).assertReflectedFrom(mainMethod);
-    graphInspector.method(helloGreeterInitMethod).assertReflectedFrom(mainMethod);
-
-    // TODO(b/124181030): greeting() is called from main()
-    graphInspector.method(helloGreeterGreetingMethod).assertNotInvokedFrom(mainMethod);
-
-    if (includeWorldGreeter) {
-      ClassReference worldGreeterClass = classFromClass(WorldGreeter.class);
-      MethodReference worldGreeterInitMethod =
-          methodFromMethod(WorldGreeter.class.getConstructor());
-      MethodReference worldGreeterGreetingMethod =
-          methodFromMethod(WorldGreeter.class.getDeclaredMethod("greeting"));
-
-      graphInspector.clazz(worldGreeterClass).assertKeptBy(graphInspector.method(mainMethod));
-      graphInspector.clazz(worldGreeterClass).assertReflectedFrom(mainMethod);
-      graphInspector.method(worldGreeterInitMethod).assertReflectedFrom(mainMethod);
-
-      // TODO(b/124181030): greeting() is called from main()
-      graphInspector.method(worldGreeterGreetingMethod).assertNotInvokedFrom(mainMethod);
-    }
+    // TODO(b/124181030): Verify that -whyareyoukeeping works as intended.
   }
 
   @Test