Change parameterization of test to have shorter file names

Otherwise we do not store the result in testing state.

Change-Id: I2bf86cbdfb0d3ee89b7930fb5a8f15d74d17422c

src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
index 2a325ad..30b9700 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/HorizontalClassMergingWithStartupClassesTest.java
@@ -10,6 +10,7 @@
 import com.android.tools.r8.experimental.startup.StartupClass;
 import com.android.tools.r8.experimental.startup.StartupConfiguration;
 import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.utils.BooleanUtils;
 import com.google.common.collect.ImmutableList;
 import java.util.Collections;
 import java.util.List;
@@ -26,14 +27,18 @@
   public TestParameters parameters;
 
   @Parameter(1)
-  public List<Class<?>> startupClasses;
+  public boolean includeStartupClasses;
 
-  @Parameters(name = "{0}, startup classes: {1}")
+  @Parameters(name = "{0}, include startup classes: {1}")
   public static List<Object[]> data() {
     return buildParameters(
-        getTestParameters().withAllRuntimesAndApiLevels().build(),
-        ImmutableList.of(
-            Collections.emptyList(), ImmutableList.of(StartupA.class, StartupB.class)));
+        getTestParameters().withAllRuntimesAndApiLevels().build(), BooleanUtils.values());
+  }
+
+  private List<Class<?>> getStartupClasses() {
+    return includeStartupClasses
+        ? Collections.emptyList()
+        : ImmutableList.of(StartupA.class, StartupB.class);
   }
 
   @Test
@@ -50,20 +55,21 @@
                       StartupConfiguration.builder()
                           .apply(
                               builder ->
-                                  startupClasses.forEach(
-                                      startupClass ->
-                                          builder.addStartupClass(
-                                              StartupClass.dexBuilder()
-                                                  .setClassReference(
-                                                      toDexType(startupClass, dexItemFactory))
-                                                  .build())))
+                                  getStartupClasses()
+                                      .forEach(
+                                          startupClass ->
+                                              builder.addStartupClass(
+                                                  StartupClass.dexBuilder()
+                                                      .setClassReference(
+                                                          toDexType(startupClass, dexItemFactory))
+                                                      .build())))
                           .build());
             })
         .addHorizontallyMergedClassesInspector(
             inspector ->
                 inspector
                     .applyIf(
-                        startupClasses.isEmpty(),
+                        getStartupClasses().isEmpty(),
                         i ->
                             i.assertIsCompleteMergeGroup(
                                 StartupA.class,