Repackage canonicalization tests.

Change-Id: I1d1e87b6b9f493e12fd65411adb7c5dc50258d0c

src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ConstClassCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
similarity index 96%
rename from src/test/java/com/android/tools/r8/ir/optimize/ConstClassCanonicalizationTest.java
rename to src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
index f0ba71e..d1c923c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ConstClassCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.ir.optimize;
+package com.android.tools.r8.ir.optimize.canonicalization;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -15,8 +15,8 @@
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.TestRunResult;
-import com.android.tools.r8.ir.optimize.ConstClassMain.Outer;
-import com.android.tools.r8.ir.optimize.ConstClassMain.Outer.Inner;
+import com.android.tools.r8.ir.optimize.canonicalization.ConstClassMain.Outer;
+import com.android.tools.r8.ir.optimize.canonicalization.ConstClassMain.Outer.Inner;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;

src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/DexItemBasedConstStringCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
similarity index 97%
rename from src/test/java/com/android/tools/r8/ir/optimize/reflection/DexItemBasedConstStringCanonicalizationTest.java
rename to src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
index 0f2e532..1b8d9a2 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/DexItemBasedConstStringCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/DexItemBasedConstStringCanonicalizationTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.ir.optimize.reflection;
+package com.android.tools.r8.ir.optimize.canonicalization;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,6 +12,7 @@
 import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.ir.optimize.reflection.GetNameTestBase;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;

src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java
rename to src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
index 52c0a70..c1b808b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2018, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.ir.optimize;
+package com.android.tools.r8.ir.optimize.canonicalization;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.MatcherAssert.assertThat;

src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java
rename to src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
index 08dbd8c..a8b1557 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringCanonicalizationTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2018, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.ir.optimize.string;
+package com.android.tools.r8.ir.optimize.canonicalization;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.MatcherAssert.assertThat;

src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringInMonitorTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringInMonitorTest.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java
rename to src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringInMonitorTest.java
index fc8aee5..f5e1762 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/StringInMonitorTest.java
@@ -1,7 +1,7 @@
 // Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.ir.optimize.string;
+package com.android.tools.r8.ir.optimize.canonicalization;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
 import static org.hamcrest.MatcherAssert.assertThat;

src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
index cbadc32..9c0766c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTestBase.java
@@ -22,8 +22,8 @@
   static final String CLASS_DESCRIPTOR = "Ljava/lang/Class;";
   static final String STRING_DESCRIPTOR = "Ljava/lang/String;";
 
-  final TestParameters parameters;
-  final boolean enableMinification;
+  protected final TestParameters parameters;
+  protected final boolean enableMinification;
   Path mapping;
 
   @Parameterized.Parameters(name = "{0} minification: {1}")
@@ -32,12 +32,12 @@
         getTestParameters().withAllRuntimes().build(), BooleanUtils.values());
   }
 
-  GetNameTestBase(TestParameters parameters, boolean enableMinification) {
+  public GetNameTestBase(TestParameters parameters, boolean enableMinification) {
     this.parameters = parameters;
     this.enableMinification = enableMinification;
   }
 
-  void configure(InternalOptions options) {
+  protected void configure(InternalOptions options) {
     options.testing.forceNameReflectionOptimization = true;
   }
 
@@ -54,7 +54,7 @@
         && method.name.toString().endsWith("Name");
   }
 
-  static long countGetName(MethodSubject method) {
+  protected static long countGetName(MethodSubject method) {
     return Streams.stream(method.iterateInstructions(instructionSubject -> {
       if (instructionSubject.isInvoke()) {
         return isNameReflection(instructionSubject.getMethod());