Rename proto test classes
Change-Id: I1815492fda447279b5a552197df69e76bc210de9
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java b/src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderOnlyReferencedFromDynamicMethodTest.java
similarity index 94%
rename from src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java
rename to src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderOnlyReferencedFromDynamicMethodTest.java
index 349f9fd..3060b59 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderOnlyReferencedFromDynamicMethodTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderOnlyReferencedFromDynamicMethodTest.java
@@ -1,7 +1,6 @@
-// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2024, 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.internal.proto;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
@@ -22,11 +21,10 @@
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-// TODO(b/339100248): Rename class to ProtoBuilderOnlyReferencedFromDynamicMethodTest.
// TODO(b/339100248): Avoid creating edition2023 messages in proto2 package.
// Instead move proto2 and proto edition2023 messages to com.android.tools.r8.proto.
@RunWith(Parameterized.class)
-public class Proto2BuilderOnlyReferencedFromDynamicMethodTest extends ProtoShrinkingTestBase {
+public class ProtoBuilderOnlyReferencedFromDynamicMethodTest extends ProtoShrinkingTestBase {
private static final String MAIN = "proto2.BuilderOnlyReferencedFromDynamicMethodTestClass";
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderShrinkingTest.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
rename to src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderShrinkingTest.java
index 327b8e2..40560ff 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2BuilderShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/ProtoBuilderShrinkingTest.java
@@ -1,7 +1,6 @@
-// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2024, 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.internal.proto;
import static com.android.tools.r8.utils.codeinspector.Matchers.isAbsent;
@@ -30,11 +29,10 @@
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-// TODO(b/339100248): Rename class to ProtoBuilderShrinkingTest.
// TODO(b/339100248): Avoid creating edition2023 messages in proto2 package.
// Instead move proto2 and proto edition2023 messages to com.android.tools.r8.proto.
@RunWith(Parameterized.class)
-public class Proto2BuilderShrinkingTest extends ProtoShrinkingTestBase {
+public class ProtoBuilderShrinkingTest extends ProtoShrinkingTestBase {
private enum MainClassesConfig {
ALL,
diff --git a/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java b/src/test/java/com/android/tools/r8/internal/proto/ProtoShrinkingTest.java
similarity index 98%
rename from src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java
rename to src/test/java/com/android/tools/r8/internal/proto/ProtoShrinkingTest.java
index 1a81f39..e9181de 100644
--- a/src/test/java/com/android/tools/r8/internal/proto/Proto2ShrinkingTest.java
+++ b/src/test/java/com/android/tools/r8/internal/proto/ProtoShrinkingTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// Copyright (c) 2024, 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.internal.proto;
@@ -29,11 +29,10 @@
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-// TODO(b/339100248): Rename class to ProtoShrinkingTest.
// TODO(b/339100248): Avoid creating edition2023 messages in proto2 package.
// Instead move proto2 and proto edition2023 messages to com.android.tools.r8.proto.
@RunWith(Parameterized.class)
-public class Proto2ShrinkingTest extends ProtoShrinkingTestBase {
+public class ProtoShrinkingTest extends ProtoShrinkingTestBase {
private static final String CONTAINS_FLAGGED_OFF_FIELD =
"com.android.tools.r8.proto2.Shrinking$ContainsFlaggedOffField";
