commit 33fad16e75bb90d24d6918123bb0d7494bef31ce
author clementbera <clementbera@google.com> Tue May 14 16:29:30 2019 +0200
committer clementbera <clementbera@google.com> Tue May 14 16:29:30 2019 +0200
tree 37fe92cee69ed0a304d1989e1b4af90a8b59130e
parent 591de400a74e039353fea603d172002ece463f9d

Fix Nest Tests

Change-Id: I5216f3b95c395245c92d0ef81c96881feac49092

src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
index dc040da..21ee28e 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
@@ -159,9 +159,6 @@
     inspector.forAllClasses(
         classSubject -> {
           DexClass dexClass = classSubject.getDexClass();
-          if (dexClass.type.getName().contains("GeneratedOutlineSupport")) {
-            return;
-          }
           assertTrue(dexClass.isInANest());
           if (outerClassNames.contains(dexClass.type.getName())) {
             assertNull(dexClass.getNestHostClassAttribute());

src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java

diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
index a6acd2e..e2e1a18 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestAccessControlTestUtils.java
@@ -63,6 +63,8 @@
           .put("constructors", "BasicNestHostWithInnerClassConstructors")
           .put("anonymous", "BasicNestHostWithAnonymousInnerClass")
           .put("all", "NestHostExample")
+          .put("merge", "BasicNestHostClassMerging")
+          .put("prune", "BasicNestHostTreePruning")
           .build();
   public static final String ALL_RESULT_LINE =
       String.join(