Avoid ToolHelper.getSourceFileForTestClass.
Bug: b/519506456
Change-Id: Ia21c108f238c51ac01308f6ab0da0341d350371e
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
index f7345cf..1f2562e 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/MergedConstructorWithEquivalenceStackTraceTest.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.NoVerticalClassMerging;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.naming.retrace.StackTrace;
import com.android.tools.r8.naming.retrace.StackTrace.StackTraceLine;
import org.junit.Test;
@@ -25,8 +24,7 @@
super(parameters);
}
- private final String FILE_NAME =
- ToolHelper.getSourceFileForTestClass(getClass()).getFileName().toString();
+ private final String FILE_NAME = getClass().getSimpleName() + ".java";
private StackTrace getExpectedStackTrace() {
return StackTrace.builder()
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java b/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java
index 81ba711..25a1cdb 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java
@@ -14,7 +14,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.TestRuntime.CfVm;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.naming.retrace.StackTrace;
import com.android.tools.r8.naming.retrace.StackTrace.StackTraceLine;
import com.android.tools.r8.references.ClassReference;
@@ -220,7 +219,7 @@
.setLineNumber(parameters.isCfRuntime() ? -1 : 0)
.build());
}
- String fileName = ToolHelper.getSourceFileForTestClass(CLASS).getFileName().toString();
+ String fileName = CLASS.getSimpleName() + ".java";
builder
.add(
StackTraceLine.builder()
diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java b/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java
index 070ea57..a36e9c2 100644
--- a/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java
@@ -15,7 +15,6 @@
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
import com.android.tools.r8.TestRuntime.CfVm;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.naming.retrace.StackTrace;
import com.android.tools.r8.naming.retrace.StackTrace.StackTraceLine;
import com.android.tools.r8.references.ClassReference;
@@ -177,7 +176,7 @@
.setLineNumber(-1)
.build());
}
- String fileName = ToolHelper.getSourceFileForTestClass(CLASS).getFileName().toString();
+ String fileName = CLASS.getSimpleName() + ".java";
builder
.add(
StackTraceLine.builder()