commit 141bf5905068dd7b8317f3404fa75d15babe3aba
author Sebastien Hertz <shertz@google.com> Thu May 03 17:56:22 2018 +0200
committer Sebastien Hertz <shertz@google.com> Thu May 03 17:56:22 2018 +0200
tree 14f3e8f0e6eff10d2870676da819298fde2e9433
parent 5ef83c40ad553123c51336dfd274d2a8c289b462

Follow-up to "Automate continuous stepping tests"

This CL uses the FileUtils class to manage file extensions.

Change-Id: I5d08be1ed74270af864eaa15641840410069cdd6

src/test/java/com/android/tools/r8/debug/ContinuousSteppingTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/ContinuousSteppingTest.java b/src/test/java/com/android/tools/r8/debug/ContinuousSteppingTest.java
index 68d2c3d..45e3c96 100644
--- a/src/test/java/com/android/tools/r8/debug/ContinuousSteppingTest.java
+++ b/src/test/java/com/android/tools/r8/debug/ContinuousSteppingTest.java
@@ -7,6 +7,7 @@
 import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.FileUtils;
 import com.android.tools.r8.utils.Pair;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -41,8 +42,6 @@
 @RunWith(Parameterized.class)
 public class ContinuousSteppingTest extends DebugTestBase {
 
-  private static final String CLASS_EXTENSION = ".class";
-  private static final String JAR_EXTENSION = ".jar";
   private static final String MAIN_METHOD_NAME = "main";
 
   // A list of self-contained jars to process (which do not depend on other jar files).
@@ -97,7 +96,7 @@
   private static List<Path> findAllJarsIn(Path root) {
     try {
       return Files.walk(root)
-          .filter(p -> p.toFile().getPath().endsWith(JAR_EXTENSION))
+          .filter(p -> p.toFile().getPath().endsWith(FileUtils.JAR_EXTENSION))
           .collect(Collectors.toList());
     } catch (IOException e) {
       return Collections.emptyList();
@@ -159,8 +158,9 @@
       JarEntry entry;
       while ((entry = jarInputStream.getNextJarEntry()) != null) {
         String entryName = entry.getName();
-        if (entryName.endsWith(CLASS_EXTENSION)) {
-          String className = entryName.substring(0, entryName.length() - CLASS_EXTENSION.length());
+        if (entryName.endsWith(FileUtils.CLASS_EXTENSION)) {
+          String className =
+              entryName.substring(0, entryName.length() - FileUtils.CLASS_EXTENSION.length());
           className = className.replace(DescriptorUtils.DESCRIPTOR_PACKAGE_SEPARATOR,
               DescriptorUtils.JAVA_PACKAGE_SEPARATOR);
           try {