From d922e651f75ede33a47a4b5da3be0188a94aa897 Mon Sep 17 00:00:00 2001 From: nharmata Date: Wed, 17 May 2017 20:29:19 +0200 Subject: PiperOrigin-RevId: 156331430 --- src/test/java/com/google/devtools/build/lib/BUILD | 3 + .../build/lib/analysis/util/AnalysisMock.java | 7 +- .../build/lib/analysis/util/AnalysisTestCase.java | 5 +- .../build/lib/analysis/util/BuildViewTestCase.java | 19 ++-- .../lib/analysis/util/ConfigurationTestCase.java | 4 +- .../build/lib/packages/util/LoadingMock.java | 7 +- .../lib/packages/util/PackageLoadingTestCase.java | 5 +- .../lib/pkgcache/BuildFileModificationTest.java | 4 +- .../build/lib/pkgcache/IncrementalLoadingTest.java | 4 +- .../build/lib/pkgcache/LoadingPhaseRunnerTest.java | 2 +- .../build/lib/pkgcache/PackageCacheTest.java | 16 ++- .../rules/repository/RepositoryDelegatorTest.java | 2 +- .../lib/skyframe/ArtifactFunctionTestCase.java | 2 +- .../build/lib/skyframe/FileFunctionTest.java | 2 +- .../lib/skyframe/FilesystemValueCheckerTest.java | 2 +- .../LocalRepositoryLookupFunctionTest.java | 9 +- .../lib/skyframe/PackageLookupFunctionTest.java | 9 +- .../RecursiveFilesystemTraversalFunctionTest.java | 4 +- .../lib/skyframe/TimestampBuilderTestCase.java | 2 +- .../packages/AbstractPackageLoaderTest.java | 118 +++++++++++++++++++++ .../devtools/build/lib/skyframe/packages/BUILD | 25 +++++ .../skyframe/packages/BazelPackageLoaderTest.java | 32 ++++++ .../BazelPackageBuilderHelperForTesting.java | 108 +++++++++++++++++++ ...kageFactoryBuilderFactoryForBazelUnitTests.java | 56 ++++++++++ .../PackageFactoryFactoryForBazelUnitTests.java | 51 --------- .../devtools/build/lib/testutil/TestConstants.java | 6 +- 26 files changed, 406 insertions(+), 98 deletions(-) create mode 100644 src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java create mode 100644 src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD create mode 100644 src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java create mode 100644 src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java create mode 100644 src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java delete mode 100644 src/test/java/com/google/devtools/build/lib/testutil/PackageFactoryFactoryForBazelUnitTests.java (limited to 'src/test/java/com/google/devtools/build') diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 302276a94f..adcbbf9d56 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -64,6 +64,7 @@ java_library( srcs = glob(["testutil/*.java"]), visibility = ["//visibility:public"], deps = [ + "//src/main/java/com/google/devtools/build/lib:BazelPackageLoader", "//src/main/java/com/google/devtools/build/lib:bazel-main", "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", @@ -339,6 +340,7 @@ java_library( ":foundations_testutil", ":packages_testutil", ":testutil", + "//src/main/java/com/google/devtools/build/lib:BazelPackageLoader", "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:bazel-main", "//src/main/java/com/google/devtools/build/lib:bazel-rules", @@ -581,6 +583,7 @@ java_library( ":foundations_testutil", ":testutil", "//src/main/java/com/google/devtools/build/docgen:docgen_javalib", + "//src/main/java/com/google/devtools/build/lib:BazelPackageLoader", "//src/main/java/com/google/devtools/build/lib:bazel-main", "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java index 57a6ac45db..70e3ef0d01 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRul import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction; import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule; import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer; -import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.util.LoadingMock; import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.packages.util.MockToolsConfig; @@ -34,11 +33,11 @@ import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunctio import com.google.devtools.build.lib.rules.repository.RepositoryFunction; import com.google.devtools.build.lib.rules.repository.RepositoryLoaderFunction; import com.google.devtools.build.lib.skyframe.SkyFunctions; +import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionName; - import java.io.IOException; import java.lang.reflect.Field; import java.util.Collection; @@ -68,8 +67,8 @@ public abstract class AnalysisMock extends LoadingMock { } @Override - public PackageFactory.FactoryForTesting getPackageFactoryForTesting() { - return TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING; + public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() { + return super.getPackageFactoryBuilderForTesting().setExtraSkyFunctions(getSkyFunctions()); } @Override diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java index 7f88ad3241..0fb75bf762 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java @@ -13,7 +13,6 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.util; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -173,8 +172,8 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ruleClassProvider.getConfigurationFragments())); PackageFactory pkgFactory = analysisMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, scratch.getFileSystem()); + .getPackageFactoryBuilderForTesting() + .build(ruleClassProvider, scratch.getFileSystem()); BinTools binTools = BinTools.forUnitTesting(directories, analysisMock.getEmbeddedTools()); skyframeExecutor = SequencedSkyframeExecutor.create( 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 1c88d6d8b4..77fcd43d68 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 @@ -216,14 +216,17 @@ public abstract class BuildViewTestCase extends FoundationTestCase { configurationFactory = analysisMock.createConfigurationFactory(ruleClassProvider.getConfigurationFragments()); + ImmutableList extraPrecomputedValues = ImmutableList.of( + PrecomputedValue.injected( + RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, + ImmutableMap.of())); pkgFactory = analysisMock - .getPackageFactoryForTesting() - .create( - ruleClassProvider, - getPlatformSetRegexps(), - getEnvironmentExtensions(), - scratch.getFileSystem()); + .getPackageFactoryBuilderForTesting() + .setExtraPrecomputeValues(extraPrecomputedValues) + .setEnvironmentExtensions(getEnvironmentExtensions()) + .setPlatformSetRegexps(getPlatformSetRegexps()) + .build(ruleClassProvider, scratch.getFileSystem()); tsgm = new TimestampGranularityMonitor(BlazeClock.instance()); skyframeExecutor = SequencedSkyframeExecutor.create( @@ -240,9 +243,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { analysisMock.getProductName(), CrossRepositoryLabelViolationStrategy.ERROR, ImmutableList.of(BuildFileName.BUILD_DOT_BAZEL, BuildFileName.BUILD)); - skyframeExecutor.injectExtraPrecomputedValues(ImmutableList.of(PrecomputedValue.injected( - RepositoryDelegatorFunction.REPOSITORY_OVERRIDES, - ImmutableMap.of()))); + skyframeExecutor.injectExtraPrecomputedValues(extraPrecomputedValues); packageCacheOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC; packageCacheOptions.showLoadingProgress = true; packageCacheOptions.globbingThreads = 7; diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index 9cfc8fd9b2..0f61da4431 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -98,8 +98,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); pkgFactory = analysisMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, scratch.getFileSystem()); + .getPackageFactoryBuilderForTesting() + .build(ruleClassProvider, scratch.getFileSystem()); AnalysisTestUtil.DummyWorkspaceStatusActionFactory workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory(directories); diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java index f08e502b21..217c37565d 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/LoadingMock.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.packages.util; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer; -import com.google.devtools.build.lib.packages.PackageFactory; +import com.google.devtools.build.lib.skyframe.packages.PackageFactoryBuilderWithSkyframeForTesting; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; @@ -29,8 +29,9 @@ public class LoadingMock { return TestConstants.PRODUCT_NAME; } - public PackageFactory.FactoryForTesting getPackageFactoryForTesting() { - return TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING; + public PackageFactoryBuilderWithSkyframeForTesting getPackageFactoryBuilderForTesting() { + return (PackageFactoryBuilderWithSkyframeForTesting) + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder(); } public ConfiguredRuleClassProvider createRuleClassProvider() { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java index 975160dc0d..3ebda8ea71 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java @@ -90,8 +90,9 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { } packageFactory = loadingMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, null, getEnvironmentExtensions(), scratch.getFileSystem()); + .getPackageFactoryBuilderForTesting() + .setEnvironmentExtensions(getEnvironmentExtensions()) + .build(ruleClassProvider, scratch.getFileSystem()); skyframeExecutor = createSkyframeExecutor(); setUpSkyframe(); } diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java index 91297b50b1..1633111cea 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java @@ -81,8 +81,8 @@ public class BuildFileModificationTest extends FoundationTestCase { skyframeExecutor = SequencedSkyframeExecutor.create( analysisMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, scratch.getFileSystem()), + .getPackageFactoryBuilderForTesting() + .build(ruleClassProvider, scratch.getFileSystem()), directories, null, /* BinTools */ null, /* workspaceStatusActionFactory */ diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java index 8e57f6c5d8..def12d9fc0 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java @@ -468,8 +468,8 @@ public class IncrementalLoadingTest { skyframeExecutor = SequencedSkyframeExecutor.create( loadingMock - .getPackageFactoryForTesting() - .create(loadingMock.createRuleClassProvider(), fs), + .getPackageFactoryBuilderForTesting() + .build(loadingMock.createRuleClassProvider(), fs), new BlazeDirectories( fs.getPath("/install"), fs.getPath("/output"), 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 9de3dec925..eb114ea224 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 @@ -604,7 +604,7 @@ public class LoadingPhaseRunnerTest { ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider(); PackageFactory pkgFactory = - analysisMock.getPackageFactoryForTesting().create(ruleClassProvider, fs); + analysisMock.getPackageFactoryBuilderForTesting().build(ruleClassProvider, fs); PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class); storedErrors = new StoredEventHandler(); BlazeDirectories directories = diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index d31fa524c9..3b7908e74d 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java @@ -36,6 +36,7 @@ import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.Package; +import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.skyframe.DiffAwareness; @@ -76,15 +77,22 @@ public class PackageCacheTest extends FoundationTestCase { @Before public final void initializeSkyframeExecutor() throws Exception { + initializeSkyframeExecutor(/*doPackageLoadingChecks=*/ true); + } + + private void initializeSkyframeExecutor(boolean doPackageLoadingChecks) throws Exception { analysisMock = AnalysisMock.get(); ruleClassProvider = analysisMock.createRuleClassProvider(); BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName()); + PackageFactory.BuilderForTesting packageFactoryBuilder = + analysisMock.getPackageFactoryBuilderForTesting(); + if (!doPackageLoadingChecks) { + packageFactoryBuilder.disableChecks(); + } skyframeExecutor = SequencedSkyframeExecutor.create( - analysisMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, scratch.getFileSystem()), + packageFactoryBuilder.build(ruleClassProvider, scratch.getFileSystem()), directories, null, /* BinTools */ null, /* workspaceStatusActionFactory */ @@ -484,6 +492,8 @@ public class PackageCacheTest extends FoundationTestCase { @Test public void testDeletedPackages() throws Exception { + // PackageLoader doesn't support --deleted_packages. + initializeSkyframeExecutor(/*doPackageLoadingChecks=*/ false); reporter.removeHandler(failFastHandler); setUpCacheWithTwoRootLocator(); createBuildFile(rootDir1, "c", "d/x"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java index 449cf0ca11..849a3b712d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java @@ -106,7 +106,7 @@ public class RepositoryDelegatorTest extends FoundationTestCase { SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create( + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( TestRuleClassProvider.getRuleClassProvider(), root.getFileSystem()), directories)) .put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction()) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index 491ecc14d1..c01285e969 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java @@ -108,7 +108,7 @@ abstract class ArtifactFunctionTestCase { SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create( + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( TestRuleClassProvider.getRuleClassProvider(), root.getFileSystem()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index 8e1ff34c53..8be17f2064 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -157,7 +157,7 @@ public class FileFunctionTest { SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create( + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( TestRuleClassProvider.getRuleClassProvider(), fs), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) 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 2c92706a7a..74e7c776e5 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 @@ -128,7 +128,7 @@ public class FilesystemValueCheckerTest { new WorkspaceASTFunction(TestRuleClassProvider.getRuleClassProvider())); skyFunctions.put(SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction(TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create( + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( TestRuleClassProvider.getRuleClassProvider(), fs), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java index a2d51781c3..c8c5bae031 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.packages.PackageFactory; +import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension; import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction; @@ -94,10 +95,12 @@ public class LocalRepositoryLookupFunctionTest extends FoundationTestCase { new WorkspaceFileFunction( ruleClassProvider, analysisMock - .getPackageFactoryForTesting() - .create( + .getPackageFactoryBuilderForTesting() + .setEnvironmentExtensions( + ImmutableList.of( + new PackageFactory.EmptyEnvironmentExtension())) + .build( ruleClassProvider, - new PackageFactory.EmptyEnvironmentExtension(), scratch.getFileSystem()), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index 9fe08801d5..ff5b2bdeee 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java @@ -31,6 +31,7 @@ import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.events.NullEventHandler; import com.google.devtools.build.lib.packages.BuildFileNotFoundException; import com.google.devtools.build.lib.packages.PackageFactory; +import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension; import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.rules.repository.LocalRepositoryFunction; @@ -117,10 +118,12 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { new WorkspaceFileFunction( ruleClassProvider, analysisMock - .getPackageFactoryForTesting() - .create( + .getPackageFactoryBuilderForTesting() + .setEnvironmentExtensions( + ImmutableList.of( + new PackageFactory.EmptyEnvironmentExtension())) + .build( ruleClassProvider, - new PackageFactory.EmptyEnvironmentExtension(), scratch.getFileSystem()), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index d2ddae08a4..2aa91f699d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -120,8 +120,8 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe new WorkspaceFileFunction( ruleClassProvider, analysisMock - .getPackageFactoryForTesting() - .create(ruleClassProvider, scratch.getFileSystem()), + .getPackageFactoryBuilderForTesting() + .build(ruleClassProvider, scratch.getFileSystem()), directories)); skyFunctions.put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()); skyFunctions.put(SkyFunctions.LOCAL_REPOSITORY_LOOKUP, new LocalRepositoryLookupFunction()); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 901fa9ffe9..2104ec53dd 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -205,7 +205,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { SkyFunctions.WORKSPACE_FILE, new WorkspaceFileFunction( TestRuleClassProvider.getRuleClassProvider(), - TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create( + TestConstants.PACKAGE_FACTORY_BUILDER_FACTORY_FOR_TESTING.builder().build( TestRuleClassProvider.getRuleClassProvider(), scratch.getFileSystem()), directories)) .put(SkyFunctions.EXTERNAL_PACKAGE, new ExternalPackageFunction()) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java new file mode 100644 index 0000000000..40deb5089d --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoaderTest.java @@ -0,0 +1,118 @@ +// Copyright 2017 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.lib.skyframe.packages; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.devtools.build.lib.testutil.MoreAsserts.assertContainsEvent; +import static com.google.devtools.build.lib.testutil.MoreAsserts.assertNoEvents; +import static org.junit.Assert.fail; + +import com.google.common.base.Joiner; +import com.google.common.eventbus.EventBus; +import com.google.devtools.build.lib.cmdline.PackageIdentifier; +import com.google.devtools.build.lib.events.Reporter; +import com.google.devtools.build.lib.events.StoredEventHandler; +import com.google.devtools.build.lib.packages.NoSuchPackageException; +import com.google.devtools.build.lib.packages.Package; +import com.google.devtools.build.lib.vfs.FileSystem; +import com.google.devtools.build.lib.vfs.FileSystemUtils; +import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.PathFragment; +import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; +import org.junit.Before; +import org.junit.Test; + +/** Abstract base class of a unit test for a {@link AbstractPackageLoader} implementation. */ +public abstract class AbstractPackageLoaderTest { + private Path pkgRoot; + protected StoredEventHandler handler; + protected PackageLoader pkgLoader; + + @Before + public final void init() throws Exception { + FileSystem fs = new InMemoryFileSystem(); + pkgRoot = fs.getRootDirectory().getChild("pkgRoot"); + FileSystemUtils.createDirectoryAndParents(pkgRoot); + Reporter reporter = new Reporter(new EventBus()); + handler = new StoredEventHandler(); + reporter.addHandler(handler); + pkgLoader = makeFreshBuilder(pkgRoot).setReporter(reporter).build(); + } + + protected abstract AbstractPackageLoader.Builder makeFreshBuilder(Path pkgRoot); + + @Test + public void simpleNoPackage() throws Exception { + PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("nope")); + try { + pkgLoader.loadPackage(pkgId); + fail(); + } catch (NoSuchPackageException expected) { + assertThat(expected) + .hasMessageThat() + .isEqualTo("no such package 'nope': BUILD file not found on package path"); + } + assertNoEvents(handler.getEvents()); + } + + @Test + public void simpleBadPackage() throws Exception { + file("bad/BUILD", "invalidBUILDsyntax"); + PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("bad")); + Package badPkg = pkgLoader.loadPackage(pkgId); + assertThat(badPkg.containsErrors()).isTrue(); + assertContainsEvent(badPkg.getEvents(), "invalidBUILDsyntax"); + assertContainsEvent(handler.getEvents(), "invalidBUILDsyntax"); + } + + @Test + public void simpleGoodPackage() throws Exception { + file("good/BUILD", "sh_library(name = 'good')"); + PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("good")); + Package goodPkg = pkgLoader.loadPackage(pkgId); + assertThat(goodPkg.containsErrors()).isFalse(); + assertThat( + goodPkg.getTarget("good").getAssociatedRule().getRuleClass()).isEqualTo("sh_library"); + assertNoEvents(goodPkg.getEvents()); + assertNoEvents(handler.getEvents()); + } + + @Test + public void simpleGoodPackage_Skylark() throws Exception { + file("good/good.bzl", + "def f(x):", + " native.sh_library(name = x)"); + file("good/BUILD", + "load('//good:good.bzl', 'f')", + "f('good')"); + PackageIdentifier pkgId = PackageIdentifier.createInMainRepo(PathFragment.create("good")); + Package goodPkg = pkgLoader.loadPackage(pkgId); + assertThat(goodPkg.containsErrors()).isFalse(); + assertThat( + goodPkg.getTarget("good").getAssociatedRule().getRuleClass()).isEqualTo("sh_library"); + assertNoEvents(goodPkg.getEvents()); + assertNoEvents(handler.getEvents()); + } + + protected Path path(String rootRelativePath) { + return pkgRoot.getRelative(PathFragment.create(rootRelativePath)); + } + + protected Path file(String fileName, String... contents) throws Exception { + Path path = path(fileName); + FileSystemUtils.createDirectoryAndParents(path.getParentDirectory()); + FileSystemUtils.writeContentAsLatin1(path, Joiner.on("\n").join(contents)); + return path; + } +} diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD new file mode 100644 index 0000000000..89f75b39c4 --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BUILD @@ -0,0 +1,25 @@ +filegroup( + name = "srcs", + srcs = glob(["**"]), + visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"], +) + +java_test( + name = "BazelPackageLoaderTest", + srcs = [ + "AbstractPackageLoaderTest.java", + "BazelPackageLoaderTest.java", + ], + deps = [ + "//src/main/java/com/google/devtools/build/lib:BazelPackageLoader", + "//src/main/java/com/google/devtools/build/lib:events", + "//src/main/java/com/google/devtools/build/lib:inmemoryfs", + "//src/main/java/com/google/devtools/build/lib:packages", + "//src/main/java/com/google/devtools/build/lib:vfs", + "//src/test/java/com/google/devtools/build/lib:testutil", + "//third_party:guava", + "//third_party:jsr305", + "//third_party:junit4", + "//third_party:truth", + ], +) diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java new file mode 100644 index 0000000000..e6f6e4df2c --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java @@ -0,0 +1,32 @@ +// Copyright 2017 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.lib.skyframe.packages; + +import com.google.devtools.build.lib.vfs.Path; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** + * Simple tests for {@link BazelPackageLoader}. + * + *

Bazel's unit and integration tests do sanity checks with {@link BazelPackageLoader} under the + * covers, so we get pretty exhaustive correctness tests for free. + */ +@RunWith(JUnit4.class) +public final class BazelPackageLoaderTest extends AbstractPackageLoaderTest { + @Override + protected BazelPackageLoader.Builder makeFreshBuilder(Path pkgRoot) { + return BazelPackageLoader.builder(pkgRoot); + } +} diff --git a/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java new file mode 100644 index 0000000000..21f20cfb16 --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java @@ -0,0 +1,108 @@ +// Copyright 2017 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.lib.testutil; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.cmdline.PackageIdentifier; +import com.google.devtools.build.lib.packages.NoSuchPackageException; +import com.google.devtools.build.lib.packages.Package; +import com.google.devtools.build.lib.packages.RuleClassProvider; +import com.google.devtools.build.lib.packages.Target; +import com.google.devtools.build.lib.skyframe.PackageFunction; +import com.google.devtools.build.lib.skyframe.packages.BazelPackageLoader; +import com.google.devtools.build.lib.skyframe.packages.PackageLoader; +import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.PathFragment; + +/** + * A Package.Builder.Helper for use in tests that a sanity check with {@link BazelPackageLoader} for + * each loaded package, for the sake of getting pretty nice test coverage. + */ +public class BazelPackageBuilderHelperForTesting implements Package.Builder.Helper { + private final RuleClassProvider ruleClassProvider; + + public BazelPackageBuilderHelperForTesting(RuleClassProvider ruleClassProvider) { + this.ruleClassProvider = ruleClassProvider; + } + + @Override + public Package createFreshPackage(PackageIdentifier packageId, String runfilesPrefix) { + return Package.Builder.DefaultHelper.INSTANCE.createFreshPackage(packageId, runfilesPrefix); + } + + @Override + public void onLoadingComplete(Package pkg) { + sanityCheckBazelPackageLoader(pkg, ruleClassProvider); + } + + private static final Function TARGET_TO_LABEL = + new Function() { + @Override + public Label apply(Target input) { + return input.getLabel(); + } + }; + + // This is synchronized because some Skylark internals aren't thread safe. + private synchronized void sanityCheckBazelPackageLoader( + Package pkg, + RuleClassProvider ruleClassProvider) { + PackageIdentifier pkgId = pkg.getPackageIdentifier(); + if (pkgId.equals(Label.EXTERNAL_PACKAGE_IDENTIFIER) + || !pkg.getPackageIdentifier().getRepository().isMain() + || PackageFunction.isDefaultsPackage(pkg.getPackageIdentifier())) { + // TODO(nharmata): Support these packages. + return; + } + int numNameSegments = pkg.getNameFragment().segmentCount(); + PathFragment fullFilenameFragment = pkg.getFilename().asFragment(); + int numFullFilenameFragmentSegments = fullFilenameFragment.segmentCount(); + Path workspaceRoot = pkg.getFilename().getFileSystem().getPath( + fullFilenameFragment.subFragment( + 0, + numFullFilenameFragmentSegments - (numNameSegments + 1))); + PackageLoader packageLoader = BazelPackageLoader.builder(workspaceRoot) + .setRuleClassProvider(ruleClassProvider) + .build(); + Package newlyLoadedPkg; + try { + newlyLoadedPkg = packageLoader.loadPackage(pkg.getPackageIdentifier()); + } catch (InterruptedException e) { + return; + } catch (NoSuchPackageException e) { + throw new IllegalStateException(e); + } + ImmutableSet