Remove redundant function prettyJarNames from ActionsTestUtil

RELNOTES:none
PiperOrigin-RevId: 184411715

4 files changed, 238 insertions, 211 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index c432723c4f..4792caf480 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -360,16 +360,6 @@ public final class ActionsTestUtil {
     return transform(artifacts, Artifact::prettyPrint);
   }
 
-  /**
-   * This function is exactly duplication of {@link #prettyArtifactNames(Iterable)}
-   * It appears by mistake. It has more than 144 usages in the code. Decided to not remove it
-   * or not to mark it as deprecated. Just leave it to kindly remind that our world is not perfect.
-   * It should not hurt us to much.
-   */
-  public static List<String> prettyJarNames(Iterable<Artifact> jars) {
-    return prettyArtifactNames(jars);
-  }
-
   public static <T, R> List<R> transform(Iterable<T> iterable, Function<T, R> mapper) {
     // Can not use com.google.common.collect.Iterables.transform() there, as it returns Iterable.
     return Streams.stream(iterable)
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
index 8f21916f5b..dc8b505788 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.rules.java;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyJarNames;
+import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
 
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -48,32 +48,32 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider
-                .getRecursiveJavaCompilationArgs()
-                .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
   }
 
@@ -97,30 +97,31 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib-ijar.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider
-                .getRecursiveJavaCompilationArgs()
-                .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib-ijar.jar");
   }
 
@@ -144,13 +145,10 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaRuleOutputJarsProvider javaRuleOutputJarsProvider =
         fetchJavaInfo().getProvider(JavaRuleOutputJarsProvider.class);
 
-    assertThat(
-        prettyJarNames(javaRuleOutputJarsProvider.getAllSrcOutputJars()))
+    assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllSrcOutputJars()))
         .containsExactly("foo/my_skylark_rule_src.jar");
 
-    assertThat(
-        prettyJarNames(
-            javaRuleOutputJarsProvider.getAllClassOutputJars()))
+    assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllClassOutputJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
 
     assertThat(javaRuleOutputJarsProvider.getOutputJars())
@@ -178,30 +176,31 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider
-                .getRecursiveJavaCompilationArgs()
-                .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
   }
 
@@ -222,30 +221,31 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider
-                .getRecursiveJavaCompilationArgs()
-                .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
   }
 
@@ -269,30 +269,31 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .isEmpty();
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .isEmpty();
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider
-                .getRecursiveJavaCompilationArgs()
-                .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
   }
 
@@ -311,10 +312,10 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
         .containsExactly("foo/my_skylark_rule_src.jar");
 
-    assertThat(prettyJarNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
         .containsExactly("foo/my_skylark_rule_src.jar");
   }
 
@@ -334,9 +335,9 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars())).isEmpty();
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars())).isEmpty();
 
-    assertThat(prettyJarNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
         .containsExactly("foo/libmy_java_lib_direct-src.jar");
   }
 
@@ -356,9 +357,9 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars())).isEmpty();
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars())).isEmpty();
 
-    assertThat(prettyJarNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
         .containsExactly("foo/libmy_java_lib_direct-src.jar");
   }
 
@@ -381,9 +382,9 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars())).isEmpty();
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars())).isEmpty();
 
-    assertThat(prettyJarNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
         .containsExactly(
             "foo/libmy_java_lib_direct-src.jar", "foo/libmy_java_lib_transitive-src.jar");
   }
@@ -408,9 +409,9 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars())).isEmpty();
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars())).isEmpty();
 
-    assertThat(prettyJarNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
         .containsExactly(
             "foo/libmy_java_lib_direct-src.jar", "foo/libmy_java_lib_transitive-src.jar");
   }
@@ -460,31 +461,32 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider
-            .getRecursiveJavaCompilationArgs()
-            .getFullCompileTimeJars()))
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
         .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar",
-            "foo/libmy_java_lib_exports-hjar.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
   }
 
   /**
@@ -521,36 +523,49 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a-hjar.jar",
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a-hjar.jar",
             "foo/libmy_java_lib_b-hjar.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar",
-            "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar", "foo/libmy_java_lib_c.jar");
-    assertThat(
-        prettyJarNames(javaCompilationArgsProvider
-            .getRecursiveJavaCompilationArgs()
-            .getFullCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar",
-            "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar", "foo/libmy_java_lib_c.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a.jar",
+            "foo/libmy_java_lib_b.jar",
+            "foo/libmy_java_lib_c.jar");
+    assertThat(
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a.jar",
+            "foo/libmy_java_lib_b.jar",
+            "foo/libmy_java_lib_c.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a-hjar.jar",
-            "foo/libmy_java_lib_b-hjar.jar", "foo/libmy_java_lib_c-hjar.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a-hjar.jar",
+            "foo/libmy_java_lib_b-hjar.jar",
+            "foo/libmy_java_lib_c-hjar.jar");
   }
 
 
@@ -600,36 +615,51 @@ public class JavaInfoSkylarkApiTest extends BuildViewTestCase {
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
     assertThat(
-        prettyJarNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar");
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getFullCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a-hjar.jar",
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a-hjar.jar",
             "foo/libmy_java_lib_b-hjar.jar");
 
     assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar", "foo/libmy_java_lib_c.jar", "foo/libmy_java_lib_d.jar");
-    assertThat(
-        prettyJarNames(javaCompilationArgsProvider
-            .getRecursiveJavaCompilationArgs()
-            .getFullCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a.jar",
-            "foo/libmy_java_lib_b.jar", "foo/libmy_java_lib_c.jar", "foo/libmy_java_lib_d.jar");
-    assertThat(
-        prettyJarNames(
-            javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
-        .containsExactly("foo/my_skylark_rule_lib.jar", "foo/libmy_java_lib_a-hjar.jar",
-            "foo/libmy_java_lib_b-hjar.jar", "foo/libmy_java_lib_c-hjar.jar",
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a.jar",
+            "foo/libmy_java_lib_b.jar",
+            "foo/libmy_java_lib_c.jar",
+            "foo/libmy_java_lib_d.jar");
+    assertThat(
+            prettyArtifactNames(
+                javaCompilationArgsProvider
+                    .getRecursiveJavaCompilationArgs()
+                    .getFullCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a.jar",
+            "foo/libmy_java_lib_b.jar",
+            "foo/libmy_java_lib_c.jar",
+            "foo/libmy_java_lib_d.jar");
+    assertThat(
+            prettyArtifactNames(
+                javaCompilationArgsProvider.getRecursiveJavaCompilationArgs().getCompileTimeJars()))
+        .containsExactly(
+            "foo/my_skylark_rule_lib.jar",
+            "foo/libmy_java_lib_a-hjar.jar",
+            "foo/libmy_java_lib_b-hjar.jar",
+            "foo/libmy_java_lib_c-hjar.jar",
             "foo/libmy_java_lib_d-hjar.jar");
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index 2836ff1cbe..83423c0b97 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.rules.java;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyJarNames;
+import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -304,7 +304,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     OutputJar outputJar = outputs.getOutputJars().get(0);
     assertThat(outputJar.getClassJar().getFilename()).isEqualTo("libdep.jar");
     assertThat(outputJar.getIJar().getFilename()).isEqualTo("libdep-hjar.jar");
-    assertThat(prettyJarNames(outputJar.getSrcJars())).containsExactly("java/test/libdep-src.jar");
+    assertThat(prettyArtifactNames(outputJar.getSrcJars()))
+        .containsExactly("java/test/libdep-src.jar");
     assertThat(outputs.getJdeps().getFilename()).isEqualTo("libdep.jdeps");
   }
 
@@ -770,19 +771,20 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     JavaInfo info = target.get(JavaInfo.PROVIDER);
 
     SkylarkNestedSet compileJars = info.getCompileTimeJars();
-    assertThat(prettyJarNames(compileJars.getSet(Artifact.class))).containsExactly("foo/liba.jar");
+    assertThat(prettyArtifactNames(compileJars.getSet(Artifact.class)))
+        .containsExactly("foo/liba.jar");
 
     SkylarkNestedSet fullCompileJars = info.getFullCompileTimeJars();
-    assertThat(
-        prettyJarNames(fullCompileJars.getSet(Artifact.class))).containsExactly("foo/liba.jar");
+    assertThat(prettyArtifactNames(fullCompileJars.getSet(Artifact.class)))
+        .containsExactly("foo/liba.jar");
 
     SkylarkNestedSet transitiveCompileTimeJars = info.getTransitiveCompileTimeJars();
-    assertThat(prettyJarNames(
-        transitiveCompileTimeJars.getSet(Artifact.class))).containsExactly("foo/libc.jar");
+    assertThat(prettyArtifactNames(transitiveCompileTimeJars.getSet(Artifact.class)))
+        .containsExactly("foo/libc.jar");
 
     SkylarkNestedSet transitiveRuntimeJars = info.getTransitiveRuntimeJars();
-    assertThat(prettyJarNames(
-        transitiveRuntimeJars.getSet(Artifact.class))).containsExactly("foo/libd.jar");
+    assertThat(prettyArtifactNames(transitiveRuntimeJars.getSet(Artifact.class)))
+        .containsExactly("foo/libd.jar");
   }
 
   @Test
@@ -813,15 +815,16 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     JavaInfo info = target.get(JavaInfo.PROVIDER);
 
     SkylarkNestedSet compileJars = info.getCompileTimeJars();
-    assertThat(prettyJarNames(compileJars.getSet(Artifact.class))).containsExactly("foo/liba.jar");
+    assertThat(prettyArtifactNames(compileJars.getSet(Artifact.class)))
+        .containsExactly("foo/liba.jar");
 
     SkylarkNestedSet transitiveCompileTimeJars = info.getTransitiveCompileTimeJars();
-    assertThat(prettyJarNames(
-        transitiveCompileTimeJars.getSet(Artifact.class))).containsExactly("foo/liba.jar");
+    assertThat(prettyArtifactNames(transitiveCompileTimeJars.getSet(Artifact.class)))
+        .containsExactly("foo/liba.jar");
 
     SkylarkNestedSet transitiveRuntimeJars = info.getTransitiveRuntimeJars();
-    assertThat(prettyJarNames(
-        transitiveRuntimeJars.getSet(Artifact.class))).containsExactly("foo/libd.jar");
+    assertThat(prettyArtifactNames(transitiveRuntimeJars.getSet(Artifact.class)))
+        .containsExactly("foo/libd.jar");
   }
 
   @Test
@@ -860,22 +863,22 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, target);
     assertThat(provider).isNotNull();
     List<String> compileTimeJars =
-        prettyJarNames(provider.getJavaCompilationArgs().getCompileTimeJars());
+        prettyArtifactNames(provider.getJavaCompilationArgs().getCompileTimeJars());
     assertThat(compileTimeJars).containsExactly("foo/liba.jar");
     List<String> runtimeJars =
-        prettyJarNames(provider.getJavaCompilationArgs().getRuntimeJars());
+        prettyArtifactNames(provider.getJavaCompilationArgs().getRuntimeJars());
     assertThat(runtimeJars).containsExactly("foo/libb.jar");
 
     List<String> transitiveCompileTimeJars =
-        prettyJarNames(provider.getRecursiveJavaCompilationArgs().getCompileTimeJars());
+        prettyArtifactNames(provider.getRecursiveJavaCompilationArgs().getCompileTimeJars());
     assertThat(transitiveCompileTimeJars).containsExactly("foo/libc.jar");
     List<String> transitiveRuntimeJars =
-        prettyJarNames(provider.getRecursiveJavaCompilationArgs().getRuntimeJars());
+        prettyArtifactNames(provider.getRecursiveJavaCompilationArgs().getRuntimeJars());
     assertThat(transitiveRuntimeJars).containsExactly("foo/libd.jar");
 
     JavaSourceJarsProvider sourcesProvider =
         JavaInfo.getProvider(JavaSourceJarsProvider.class, target);
-    List<String> sourceJars = prettyJarNames(sourcesProvider.getSourceJars());
+    List<String> sourceJars = prettyArtifactNames(sourcesProvider.getSourceJars());
     assertThat(sourceJars).containsExactly("foo/liba-src.jar");
   }
 
@@ -914,11 +917,11 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, target);
     assertThat(provider).isNotNull();
     List<String> compileTimeJars =
-        prettyJarNames(provider.getJavaCompilationArgs().getCompileTimeJars());
+        prettyArtifactNames(provider.getJavaCompilationArgs().getCompileTimeJars());
     assertThat(compileTimeJars).containsExactly("foo/liba.jar", "foo/libjava_dep-hjar.jar");
 
-    List<String> runtimeJars = prettyJarNames(
-        provider.getJavaCompilationArgs().getRuntimeJars());
+    List<String> runtimeJars =
+        prettyArtifactNames(provider.getJavaCompilationArgs().getRuntimeJars());
     assertThat(runtimeJars).containsExactly("foo/libb.jar", "foo/libjava_dep.jar");
   }
 
@@ -952,12 +955,12 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget target = getConfiguredTarget("//foo:java_lib");
     JavaCompilationArgsProvider provider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, target);
-    List<String> compileTimeJars = prettyJarNames(
-        provider.getRecursiveJavaCompilationArgs().getCompileTimeJars());
+    List<String> compileTimeJars =
+        prettyArtifactNames(provider.getRecursiveJavaCompilationArgs().getCompileTimeJars());
     assertThat(compileTimeJars).containsExactly("foo/libjava_lib-hjar.jar", "foo/liba.jar");
 
-    List<String> runtimeJars = prettyJarNames(
-        provider.getRecursiveJavaCompilationArgs().getRuntimeJars());
+    List<String> runtimeJars =
+        prettyArtifactNames(provider.getRecursiveJavaCompilationArgs().getRuntimeJars());
     assertThat(runtimeJars).containsExactly("foo/libjava_lib.jar", "foo/libb.jar");
   }
 
@@ -1046,7 +1049,9 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget jlExports = getConfiguredTarget("//foo:lib_exports");
     JavaCompilationArgsProvider jlExportsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jlExports);
-    assertThat(prettyJarNames(jlExportsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+    assertThat(
+            prettyArtifactNames(
+                jlExportsProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .containsAllOf(
             "foo/libjl_bottom_for_deps.jar",
             "foo/libjl_bottom_for_runtime_deps.jar",
@@ -1056,7 +1061,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget jlTop = getConfiguredTarget("//foo:lib_interm");
     JavaCompilationArgsProvider jlTopProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jlTop);
-    assertThat(prettyJarNames(jlTopProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+    assertThat(
+            prettyArtifactNames(jlTopProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
         .contains("foo/libjl_bottom_for_exports.jar");
   }
 
@@ -1081,10 +1087,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
 
     // Test that all bottom jars are on the runtime classpath.
     ConfiguredTarget binary = getConfiguredTarget("//foo:binary");
-    assertThat(prettyJarNames(
-        binary.getProvider(JavaRuntimeClasspathProvider.class).getRuntimeClasspath()))
-            .containsAllOf(
-                "foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
+    assertThat(
+            prettyArtifactNames(
+                binary.getProvider(JavaRuntimeClasspathProvider.class).getRuntimeClasspath()))
+        .containsAllOf("foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
   }
 
   @Test
@@ -1109,10 +1115,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget importTarget = getConfiguredTarget("//foo:import");
     JavaCompilationArgsProvider compilationProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, importTarget);
-    assertThat(prettyJarNames(
-        compilationProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
-        .containsAllOf(
-            "foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
+    assertThat(
+            prettyArtifactNames(
+                compilationProvider.getRecursiveJavaCompilationArgs().getRuntimeJars()))
+        .containsAllOf("foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
   }
 
   @Test
@@ -1135,10 +1141,9 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
         new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "result"));
     @SuppressWarnings("unchecked") SkylarkList<Artifact> sourceJars =
         (SkylarkList<Artifact>) (info.getValue("source_jars"));
-    assertThat(prettyJarNames(sourceJars)).containsExactly("foo/libmy_java_lib_a-src.jar");
-
-    assertThat(prettyJarNames(sourceJars)).doesNotContain("foo/libmy_java_lib_b-src.jar");
+    assertThat(prettyArtifactNames(sourceJars)).containsExactly("foo/libmy_java_lib_a-src.jar");
 
+    assertThat(prettyArtifactNames(sourceJars)).doesNotContain("foo/libmy_java_lib_b-src.jar");
   }
 
   @Test
@@ -1165,7 +1170,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     @SuppressWarnings("unchecked")
     SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property");
 
-    assertThat(prettyJarNames(sourceJars.getSet(Artifact.class)))
+    assertThat(prettyArtifactNames(sourceJars.getSet(Artifact.class)))
         .containsExactly(
             "foo/libmy_java_lib_a-src.jar",
             "foo/libmy_java_lib_b-src.jar",
@@ -1196,7 +1201,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     @SuppressWarnings("unchecked")
     SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property");
 
-    assertThat(prettyJarNames(sourceJars.getSet(Artifact.class)))
+    assertThat(prettyArtifactNames(sourceJars.getSet(Artifact.class)))
         .containsExactly(
             "foo/libmy_java_lib_a-hjar.jar",
             "foo/libmy_java_lib_b-hjar.jar",
@@ -1227,7 +1232,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     @SuppressWarnings("unchecked")
     SkylarkNestedSet sourceJars = (SkylarkNestedSet) info.getValue("property");
 
-    assertThat(prettyJarNames(sourceJars.getSet(Artifact.class)))
+    assertThat(prettyArtifactNames(sourceJars.getSet(Artifact.class)))
         .containsExactly(
             "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar", "foo/libmy_java_lib_c.jar");
   }
@@ -1315,7 +1320,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     JavaCompilationInfoProvider javaCompilationInfoProvider =
         (JavaCompilationInfoProvider) info.getValue("property");
 
-    assertThat(prettyJarNames(javaCompilationInfoProvider.getRuntimeClasspath()))
+    assertThat(prettyArtifactNames(javaCompilationInfoProvider.getRuntimeClasspath()))
         .containsExactly("foo/libmy_java_lib_a.jar");
   }
 
@@ -1411,8 +1416,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:custom");
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, myRuleTarget);
-    List<String> directJars = prettyJarNames(
-        javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars());
+    List<String> directJars =
+        prettyArtifactNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars());
     assertThat(directJars).containsExactly("foo/liba.jar");
   }
 
@@ -1444,8 +1449,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:custom");
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, myRuleTarget);
-    List<String> directJars = prettyJarNames(
-        javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars());
+    List<String> directJars =
+        prettyArtifactNames(javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars());
     assertThat(directJars).containsExactly("foo/liba.jar", "foo/libb.jar");
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index 6ffd13cecc..8eff6cdd0b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -18,7 +18,6 @@ import static com.google.common.collect.Iterables.transform;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.devtools.build.lib.actions.Artifact.ROOT_RELATIVE_PATH_STRING;
 import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
-import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyJarNames;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
@@ -248,9 +247,10 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
         .inOrder();
 
     List<String> directJars =
-        prettyJarNames(
+        prettyArtifactNames(
             getProvider(JavaCompilationArgsProvider.class, litepb2)
-                .getJavaCompilationArgs().getRuntimeJars());
+                .getJavaCompilationArgs()
+                .getRuntimeJars());
     assertThat(directJars)
         .containsExactly("cross/libbravo-lite.jar", "protobuf/libjavalite_runtime.jar");
   }
@@ -301,7 +301,7 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
 
     JavaSourceJarsProvider sourceJarsProvider = getProvider(JavaSourceJarsProvider.class, rule);
     assertThat(sourceJarsProvider).isNotNull();
-    assertThat(prettyJarNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
         .containsExactly("x/proto_lib-lite-src.jar");
 
     ImmutableListMultimap<String, Artifact> runtimeJars =
@@ -444,14 +444,15 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
           getProvider(JavaCompilationArgsProvider.class, getConfiguredTarget("//x:foo_lite_pb2"));
 
       Iterable<String> directJars =
-          prettyJarNames(compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
+          prettyArtifactNames(
+              compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
 
       assertThat(directJars).containsExactly("x/libfoo-lite-hjar.jar");
 
       JavaSourceJarsProvider sourceJarsProvider =
           getProvider(JavaSourceJarsProvider.class, getConfiguredTarget("//x:foo_lite_pb2"));
       assertThat(sourceJarsProvider).isNotNull();
-      assertThat(prettyJarNames(sourceJarsProvider.getSourceJars()))
+      assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
           .containsExactly("x/foo-lite-src.jar");
     }
 
@@ -460,14 +461,15 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
           getProvider(JavaCompilationArgsProvider.class, getConfiguredTarget("//x:bar_lite_pb2"));
 
       Iterable<String> directJars =
-          prettyJarNames(compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
+          prettyArtifactNames(
+              compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
 
       assertThat(directJars).containsExactly("x/libbar-lite-hjar.jar");
 
       JavaSourceJarsProvider sourceJarsProvider =
           getProvider(JavaSourceJarsProvider.class, getConfiguredTarget("//x:bar_lite_pb2"));
       assertThat(sourceJarsProvider).isNotNull();
-      assertThat(prettyJarNames(sourceJarsProvider.getSourceJars()))
+      assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
           .containsExactly("x/bar-lite-src.jar");
     }
   }
@@ -502,7 +504,7 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
         JavaCompilationArgsProvider.class, getConfiguredTarget("//x:foo_java_proto_lite"));
 
     Iterable<String> directJars =
-        prettyJarNames(compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
+        prettyArtifactNames(compilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars());
 
     assertThat(directJars).containsExactly("x/libbar_proto-lite-hjar.jar");
   }