diff options
author | 2018-08-02 11:49:08 -0700 | |
---|---|---|
committer | 2018-08-02 11:50:28 -0700 | |
commit | 04e9281ad2353ffa75f05c3e67c55d6fa2130a1c (patch) | |
tree | a0d1a11b9e3b5cdfb776029fa9795cdb0f22c643 /src/test/java/com/google/devtools/build | |
parent | d1a203bbdd2033ec8049b39242189e1cc76a9e8e (diff) |
Thread a path resolver through target/aspect complete event.
At the moment, an identity path resolver is passed. This will later be replaced by a contextual path resolver.
RELNOTES: None
PiperOrigin-RevId: 207138772
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java | 5 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java b/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java index 4d164143d2..ea48bb3524 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.analysis; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.actions.ArtifactPathResolver; import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsToBuild; import com.google.devtools.build.lib.analysis.util.AnalysisTestCase; import com.google.devtools.build.lib.buildeventstream.BuildEvent; @@ -47,7 +48,9 @@ public class TargetCompleteEventTest extends AnalysisTestCase { TopLevelArtifactHelper.getAllArtifactsToBuild(ct, context); TargetCompleteEvent event = TargetCompleteEvent.successfulBuild( - ctAndData, artifactsToBuild.getAllArtifactsByOutputGroup()); + ctAndData, + ArtifactPathResolver.IDENTITY, + artifactsToBuild.getAllArtifactsByOutputGroup()); assertThat(event.referencedLocalFiles()) .contains( new BuildEvent.LocalFile( diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java index 7d7bbc424a..53d4a74d9c 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java @@ -30,6 +30,7 @@ import com.google.devtools.build.lib.actions.ActionExecutedEvent; import com.google.devtools.build.lib.actions.ActionExecutedEvent.ErrorTiming; import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.actions.ArtifactPathResolver; import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.EventReportingArtifacts; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; @@ -213,8 +214,8 @@ public class BuildEventStreamerTest extends FoundationTestCase { } @Override - public Collection<NestedSet<Artifact>> reportedArtifacts() { - return artifacts; + public ReportedArtifacts reportedArtifacts() { + return new ReportedArtifacts(artifacts, ArtifactPathResolver.IDENTITY); } @Override |