commit 9b0518d1b20dec80c050704d371a53e0280480f3
author leba <leba@google.com> Wed May 18 01:18:40 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 18 01:19:52 2022 -0700
tree 765107b702a5dec8785fed8b34a65fc8f3967ec8
parent fc5bf5459a52d1ea68b3dcd9fa582de118e452d1

More accurate naming for helper methods.

PiperOrigin-RevId: 449418863

src/test/java/com/google/devtools/build/lib/buildtool/SkymeldBuildIntegrationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/SkymeldBuildIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/SkymeldBuildIntegrationTest.java
index 9c17d06..f2c5daa 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/SkymeldBuildIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/SkymeldBuildIntegrationTest.java
@@ -113,8 +113,8 @@
     assertSingleOutputBuilt("//foo:foo");
     assertSingleOutputBuilt("//foo:bar");
 
-    assertThat(getAnalyzedTargetsLabel()).containsExactly("//foo:foo", "//foo:bar");
-    assertThat(getBuiltTargetsLabel()).containsExactly("//foo:foo", "//foo:bar");
+    assertThat(getLabelsOfAnalyzedTargets()).containsExactly("//foo:foo", "//foo:bar");
+    assertThat(getLabelsOfBuiltTargets()).containsExactly("//foo:foo", "//foo:bar");
   }
 
   @Test
@@ -161,7 +161,7 @@
 
     // TODO(b/227138583) Update this.
     if (mergedAnalysisExecution) {
-      assertThat(getAnalyzedTargetsLabel()).contains("//foo:foo");
+      assertThat(getLabelsOfAnalyzedTargets()).contains("//foo:foo");
     }
   }
 
@@ -189,11 +189,11 @@
 
     // TODO(b/227138583) Update this.
     if (mergedAnalysisExecution) {
-      assertThat(getAnalyzedTargetsLabel()).contains("//foo:execution_failure");
+      assertThat(getLabelsOfAnalyzedTargets()).contains("//foo:execution_failure");
       if (keepGoing) {
-        assertThat(getAnalyzedTargetsLabel())
+        assertThat(getLabelsOfAnalyzedTargets())
             .containsExactly("//foo:foo", "//foo:execution_failure");
-        assertThat(getBuiltTargetsLabel()).containsExactly("//foo:foo");
+        assertThat(getLabelsOfBuiltTargets()).containsExactly("//foo:foo");
       }
     }
   }
@@ -226,8 +226,8 @@
     // TODO(b/227138583) Update this.
     if (mergedAnalysisExecution) {
       if (keepGoing) {
-        assertThat(getAnalyzedTargetsLabel()).contains("//foo:foo");
-        assertThat(getBuiltTargetsLabel()).containsExactly("//foo:foo");
+        assertThat(getLabelsOfAnalyzedTargets()).contains("//foo:foo");
+        assertThat(getLabelsOfBuiltTargets()).containsExactly("//foo:foo");
       } else {
         assertThat(getBuildResultListener().getBuiltTargets()).isEmpty();
       }
@@ -252,8 +252,8 @@
         "Action foo/execution_failure.out failed: missing input file '//foo:missing'");
     events.assertContainsError("rule '//foo:missing' does not exist");
 
-    assertThat(getAnalyzedTargetsLabel()).contains("//foo:execution_failure");
-    assertThat(getBuiltTargetsLabel()).isEmpty();
+    assertThat(getLabelsOfAnalyzedTargets()).contains("//foo:execution_failure");
+    assertThat(getLabelsOfBuiltTargets()).isEmpty();
   }
 
   @Test

src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java b/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
index 02b63d8..dea8a7b 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
@@ -977,13 +977,13 @@
     return getCommandEnvironment().getBuildResultListener();
   }
 
-  protected ImmutableList<String> getAnalyzedTargetsLabel() {
+  protected ImmutableList<String> getLabelsOfAnalyzedTargets() {
     return getBuildResultListener().getAnalyzedTargets().stream()
         .map(x -> x.getLabel().toString())
         .collect(toImmutableList());
   }
 
-  protected ImmutableList<String> getBuiltTargetsLabel() {
+  protected ImmutableList<String> getLabelsOfBuiltTargets() {
     return getBuildResultListener().getBuiltTargets().stream()
         .map(x -> x.getLabel().toString())
         .collect(toImmutableList());