aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/objc
diff options
context:
space:
mode:
authorGravatar cpeyser <cpeyser@google.com>2018-02-05 09:33:15 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-05 09:35:15 -0800
commitac09f0a1b39092aa92cd86ffe51b30488e3ae312 (patch)
tree5da2c93a53102c82258a2637b9e853c7bfb2dd2c /src/test/java/com/google/devtools/build/lib/rules/objc
parent98f703b46e08b6795af609b6f453ce3884f28a28 (diff)
Add type assertion that TreeFileArtifact's parentTreeArtifact member is a
SpecialArtifact. PiperOrigin-RevId: 184539696
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryTest.java5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index e3937d4efd..a2df8b5030 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -28,6 +28,7 @@ import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
import com.google.devtools.build.lib.actions.ArtifactOwner;
import com.google.devtools.build.lib.actions.CommandAction;
@@ -936,9 +937,9 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest {
// Therefore we need to fake some files inside them to test the action template in this
// analysis-time test.
TreeFileArtifact oneSourceFileFromGenJar =
- ActionInputHelper.treeFileArtifact(sourceFilesFromGenJar, "children1.m");
+ ActionInputHelper.treeFileArtifact((SpecialArtifact) sourceFilesFromGenJar, "children1.m");
TreeFileArtifact oneObjFileFromGenJar =
- ActionInputHelper.treeFileArtifact(objectFilesFromGenJar, "children1.o");
+ ActionInputHelper.treeFileArtifact((SpecialArtifact) objectFilesFromGenJar, "children1.o");
Iterable<CommandAction> compileActions =
getActionsForInputsOfGeneratingActionTemplate(
objectFilesFromGenJar, oneSourceFileFromGenJar);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryTest.java
index 85e4ff53af..09cb47d7c2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryTest.java
@@ -17,6 +17,7 @@ package com.google.devtools.build.lib.rules.objc;
import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
+import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
@@ -34,8 +35,8 @@ public class J2ObjcLibraryTest extends ObjcRuleTestCase {
new ArtifactExpander() {
@Override
public void expand(Artifact artifact, Collection<? super Artifact> output) {
- output.add(ActionInputHelper.treeFileArtifact(artifact, "children1"));
- output.add(ActionInputHelper.treeFileArtifact(artifact, "children2"));
+ output.add(ActionInputHelper.treeFileArtifact((SpecialArtifact) artifact, "children1"));
+ output.add(ActionInputHelper.treeFileArtifact((SpecialArtifact) artifact, "children2"));
}
};