Get Target out of TargetParsingCompleteEvent.

Makes it easier to serialize Events.

PiperOrigin-RevId: 197640007

1 files changed, 35 insertions, 24 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index b4fa688e84..215c99224d 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -71,6 +71,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -244,8 +245,19 @@ public class LoadingPhaseRunnerTest {
     tester.addFile("my_test/BUILD",
         "sh_test(name = 'my_test', srcs = ['test.cc'])");
     assertNoErrors(tester.loadTests("-//my_test"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
+  }
+
+  private static void assertThinTargetsEqualToTargets(
+      Collection<TargetParsingCompleteEvent.ThinTarget> thinTargets, Collection<Target> targets) {
+    assertThat(
+            thinTargets
+                .stream()
+                .map(TargetParsingCompleteEvent.ThinTarget::getLabel)
+                .collect(Collectors.toList()))
+        .containsExactlyElementsIn(
+            targets.stream().map(Target::getLabel).collect(Collectors.toList()));
   }
 
   @Test
@@ -253,8 +265,8 @@ public class LoadingPhaseRunnerTest {
     tester.addFile("my_library/BUILD",
         "cc_library(name = 'my_library', srcs = ['test.cc'])");
     assertNoErrors(tester.loadTests("-//my_library"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
   }
 
   private void writeBuildFilesForTestFiltering() throws Exception {
@@ -272,8 +284,8 @@ public class LoadingPhaseRunnerTest {
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
     assertThat(loadingResult.getTestsToRun())
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
   }
 
   @Test
@@ -285,8 +297,8 @@ public class LoadingPhaseRunnerTest {
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2", "//tests:t3"));
     assertThat(loadingResult.getTestsToRun())
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
   }
 
   @Test
@@ -298,8 +310,8 @@ public class LoadingPhaseRunnerTest {
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
     assertThat(loadingResult.getTestsToRun())
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
   }
 
   @Test
@@ -310,8 +322,8 @@ public class LoadingPhaseRunnerTest {
     assertThat(loadingResult.getTargets())
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t2"));
     assertThat(loadingResult.getTestsToRun()).containsExactlyElementsIn(getTargets("//tests:t1"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets());
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets());
   }
 
   @Test
@@ -321,8 +333,8 @@ public class LoadingPhaseRunnerTest {
     LoadingResult loadingResult = assertNoErrors(tester.loadTests("//tests:all"));
     assertThat(loadingResult.getTargets()).containsExactlyElementsIn(getTargets("//tests:t1"));
     assertThat(loadingResult.getTestsToRun()).containsExactlyElementsIn(getTargets("//tests:t1"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets("//tests:t2"));
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets("//tests:t2"));
   }
 
   @Test
@@ -334,8 +346,8 @@ public class LoadingPhaseRunnerTest {
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t3"));
     assertThat(loadingResult.getTestsToRun())
         .containsExactlyElementsIn(getTargets("//tests:t1", "//tests:t3"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets()).containsExactlyElementsIn(getTargets("//tests:t2"));
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets("//tests:t2"));
   }
 
   @Test
@@ -347,8 +359,8 @@ public class LoadingPhaseRunnerTest {
     LoadingResult loadingResult = assertNoErrors(tester.loadTests("//cc:tests"));
     assertThat(loadingResult.getTargets()).containsExactlyElementsIn(getTargets("//cc:my_test"));
     assertThat(loadingResult.getTestsToRun()).containsExactlyElementsIn(getTargets("//cc:my_test"));
-    assertThat(tester.getOriginalTargets())
-        .containsExactlyElementsIn(getTargets("//cc:tests", "//cc:my_test"));
+    assertThinTargetsEqualToTargets(
+        tester.getOriginalTargets(), getTargets("//cc:tests", "//cc:my_test"));
     assertThat(tester.getTestSuiteTargets())
         .containsExactlyElementsIn(getTargets("//cc:tests"));
   }
@@ -411,9 +423,8 @@ public class LoadingPhaseRunnerTest {
         .containsExactlyElementsIn(getTargets("//foo:foo", "//foo:baz"));
     assertThat(loadingResult.getTestsToRun())
         .containsExactlyElementsIn(getTargets("//foo:foo", "//foo:baz"));
-    assertThat(tester.getFilteredTargets()).containsExactlyElementsIn(getTargets());
-    assertThat(tester.getTestFilteredTargets())
-        .containsExactlyElementsIn(getTargets("//foo:foo_suite"));
+    assertThinTargetsEqualToTargets(tester.getFilteredTargets(), getTargets());
+    assertThinTargetsEqualToTargets(tester.getTestFilteredTargets(), getTargets("//foo:foo_suite"));
   }
 
   /** Regression test for bug: "subtracting tests from test doesn't work" */
@@ -892,15 +903,15 @@ public class LoadingPhaseRunnerTest {
       return skyframeExecutor.getPackageManager();
     }
 
-    public ImmutableSet<Target> getFilteredTargets() {
+    public ImmutableSet<TargetParsingCompleteEvent.ThinTarget> getFilteredTargets() {
       return targetParsingCompleteEvent.getFilteredTargets();
     }
 
-    public ImmutableSet<Target> getTestFilteredTargets() {
+    public ImmutableSet<TargetParsingCompleteEvent.ThinTarget> getTestFilteredTargets() {
       return targetParsingCompleteEvent.getTestFilteredTargets();
     }
 
-    public ImmutableSet<Target> getOriginalTargets() {
+    public ImmutableSet<TargetParsingCompleteEvent.ThinTarget> getOriginalTargets() {
       return targetParsingCompleteEvent.getTargets();
     }