diff options
Diffstat (limited to 'src/test/java/com')
6 files changed, 6 insertions, 29 deletions
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 6dbd8e0794..bcad79f2f6 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 @@ -234,8 +234,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { analysisMock .getPackageFactoryBuilderForTesting(directories) .setExtraPrecomputeValues(extraPrecomputedValues) - .setEnvironmentExtensions(getEnvironmentExtensions()) - .setPlatformSetRegexps(getPlatformSetRegexps()); + .setEnvironmentExtensions(getEnvironmentExtensions()); if (!doPackageLoadingChecks) { pkgFactoryBuilder.disableChecks(); } @@ -286,10 +285,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase { analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot()); } - protected Map<String, String> getPlatformSetRegexps() { - return null; - } - protected AnalysisMock getAnalysisMock() { return AnalysisMock.get(); } diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java index 4e33a396c2..c3ae5f91cc 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java @@ -252,8 +252,7 @@ public class RuleClassTest extends PackageLoadingTestCase { private Package.Builder createDummyPackageBuilder() { return packageFactory.newPackageBuilder( PackageIdentifier.createInMainRepo(TEST_PACKAGE_NAME), "TESTING") - .setFilename(testBuildfilePath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(testBuildfilePath); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java index 8b76f7fce1..3c78b8eb3e 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java @@ -49,8 +49,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/mypkg/BUILD"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -136,8 +135,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/mypkg/BUILD"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -165,8 +163,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo/workspace/WORKSPACE"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(Label.EXTERNAL_PACKAGE_IDENTIFIER, "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("name", "foo"); @@ -207,8 +204,7 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Path myPkgPath = scratch.resolve("/foo"); Package.Builder pkgBuilder = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") - .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()); + .setFilename(myPkgPath); Map<String, Object> attributeValues = new HashMap<>(); attributeValues.put("outs", Lists.newArrayList(".")); @@ -243,7 +239,6 @@ public class RuleFactoryTest extends PackageLoadingTestCase { Package pkg = packageFactory.newPackageBuilder(PackageIdentifier.createInMainRepo("mypkg"), "TESTING") .setFilename(myPkgPath) - .setMakeEnv(new MakeEnvironment.Builder()) .build(); for (String name : ruleFactory.getRuleClassNames()) { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java index 742f616496..b39e3cc536 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.packages.AttributeContainer; import com.google.devtools.build.lib.packages.CachingPackageLocator; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.GlobCache; -import com.google.devtools.build.lib.packages.MakeEnvironment; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.Package.Builder; @@ -58,7 +57,6 @@ public class PackageFactoryApparatus { factory = new PackageFactory( ruleClassProvider, - null, AttributeContainer::new, ImmutableList.copyOf(environmentExtensions), "test", @@ -145,7 +143,6 @@ public class PackageFactoryApparatus { ConstantRuleVisibility.PUBLIC, SkylarkSemantics.DEFAULT_SEMANTICS, false, - new MakeEnvironment.Builder(), ImmutableMap.<String, Extension>of(), ImmutableList.<Label>of()); Package result; diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java index 0e1b3a5264..7565fc90e5 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java @@ -53,17 +53,9 @@ public class EvaluationTestCase { @Before public final void initialize() throws Exception { - beforeInitialization(); env = newEnvironment(); } - protected void beforeInitialization() throws Exception { - // This method exists so that it can be overridden in MakeEnvironmentTest. - // The problem is that MakeEnvironmentTest's initialization code (setting up makeEnvBuilder) - // needs to run before initialize(), otherwise some tests fail with an NPE. - // Consequently, we need this hack to ensure the right order of methods. - } - /** * Creates a standard Environment for tests in the BUILD language. * No PythonPreprocessing, mostly empty mutable Environment. diff --git a/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java b/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java index 5cb3772266..eee0d34f2b 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java @@ -54,7 +54,6 @@ class PackageFactoryBuilderFactoryForBazelUnitTests implements BuilderFactoryFor : Package.Builder.DefaultHelper.INSTANCE; return new PackageFactory( ruleClassProvider, - platformSetRegexps, attributeContainerFactory, environmentExtensions, version, |