diff options
Diffstat (limited to 'src/test/java/com')
10 files changed, 28 insertions, 24 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java index 911f690588..cf15941d9b 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java @@ -924,7 +924,7 @@ public class CustomCommandLineTest { rootDir.getRoot().getRelative(relpath), rootDir, rootDir.getExecPath().getRelative(relpath), - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java index eca896acd1..5f85b94faa 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java @@ -114,7 +114,7 @@ public class ParamFileWriteActionTest extends BuildViewTestCase { rootDir.getRoot().getRelative(relpath), rootDir, rootDir.getExecPath().getRelative(relpath), - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactActionTest.java index 94ac8a8cf3..a22868beee 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/PopulateTreeArtifactActionTest.java @@ -349,7 +349,7 @@ public class PopulateTreeArtifactActionTest extends BuildViewTestCase { root.getRoot().getRelative(relpath), root, root.getExecPath().getRelative(relpath), - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java index 5bfb86f2e2..3001b3b66f 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java @@ -147,9 +147,10 @@ public class SpawnActionTemplateTest { Iterable<TreeFileArtifact> inputTreeFileArtifacts = createInputTreeFileArtifacts(inputTreeArtifact); - List<SpawnAction> expandedActions = ImmutableList.copyOf( - actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER)); + List<SpawnAction> expandedActions = + ImmutableList.copyOf( + actionTemplate.generateActionForInputArtifacts( + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE)); assertThat(expandedActions).hasSize(3); @@ -185,9 +186,10 @@ public class SpawnActionTemplateTest { Iterable<TreeFileArtifact> inputTreeFileArtifacts = createInputTreeFileArtifacts(inputTreeArtifact); - List<SpawnAction> expandedActions = ImmutableList.copyOf( - actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER)); + List<SpawnAction> expandedActions = + ImmutableList.copyOf( + actionTemplate.generateActionForInputArtifacts( + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE)); for (int i = 0; i < expandedActions.size(); ++i) { assertThat(expandedActions.get(i).getInputs()).containsAllOf( @@ -205,9 +207,10 @@ public class SpawnActionTemplateTest { Iterable<TreeFileArtifact> inputTreeFileArtifacts = createInputTreeFileArtifacts(inputTreeArtifact); - List<SpawnAction> expandedActions = ImmutableList.copyOf( - actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER)); + List<SpawnAction> expandedActions = + ImmutableList.copyOf( + actionTemplate.generateActionForInputArtifacts( + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE)); assertThat(expandedActions).hasSize(3); @@ -229,9 +232,10 @@ public class SpawnActionTemplateTest { Iterable<TreeFileArtifact> inputTreeFileArtifacts = createInputTreeFileArtifacts(inputTreeArtifact); - List<SpawnAction> expandedActions = ImmutableList.copyOf( - actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER)); + List<SpawnAction> expandedActions = + ImmutableList.copyOf( + actionTemplate.generateActionForInputArtifacts( + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE)); assertThat(expandedActions).hasSize(3); @@ -265,7 +269,7 @@ public class SpawnActionTemplateTest { try { actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER); + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE); fail("Absolute output paths not allowed, expected IllegalArgumentException"); } catch (IllegalArgumentException e) { // expected @@ -283,7 +287,7 @@ public class SpawnActionTemplateTest { try { actionTemplate.generateActionForInputArtifacts( - inputTreeFileArtifacts, ArtifactOwner.NULL_OWNER); + inputTreeFileArtifacts, ArtifactOwner.NullArtifactOwner.INSTANCE); fail("Output paths containing '..' not allowed, expected IllegalArgumentException"); } catch (IllegalArgumentException e) { // expected @@ -324,7 +328,7 @@ public class SpawnActionTemplateTest { root.getRoot().getRelative(relpath), root, root.getExecPath().getRelative(relpath), - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index eb91237e0f..2f7ad5b7c3 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -393,7 +393,7 @@ public final class AnalysisTestUtil { @Override public ArtifactOwner getOwner() { - return ArtifactOwner.NULL_OWNER; + return ArtifactOwner.NullArtifactOwner.INSTANCE; } @Override diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index d7d194c1fa..4141e584ac 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -503,7 +503,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { return new CachingAnalysisEnvironment( view.getArtifactFactory(), actionKeyContext, - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, /*isSystemEnv=*/ true, /*extendedSanityChecks*/ false, reporter, diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 3819117c7c..36c2daa8ae 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -677,7 +677,7 @@ public class CppLinkActionTest extends BuildViewTestCase { path, ArtifactRoot.asDerivedRoot(execRoot, execRoot.getRelative("out")), execPath, - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } 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 58703e5d9e..e3937d4efd 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 @@ -902,7 +902,7 @@ public class BazelJ2ObjcLibraryTest extends J2ObjcLibraryTest { return ImmutableList.<CommandAction>builder() .addAll( template.generateActionForInputArtifacts( - ImmutableList.of(treeFileArtifact), ArtifactOwner.NULL_OWNER)) + ImmutableList.of(treeFileArtifact), ArtifactOwner.NullArtifactOwner.INSTANCE)) .build(); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java index 9b2e73d3a8..b6a834ef55 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java @@ -212,7 +212,7 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas fullPath, ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")), execPath, - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java index 8b421f65f0..d33c259caa 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java @@ -623,7 +623,7 @@ public class FilesystemValueCheckerTest { outputPath, derivedRoot, derivedRoot.getExecPath().getRelative(derivedRoot.getRoot().relativize(outputPath)), - ArtifactOwner.NULL_OWNER, + ArtifactOwner.NullArtifactOwner.INSTANCE, SpecialArtifactType.TREE); } |