From 03b9cfd3f9117fc22bf8ae129c316cf606b46a00 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Wed, 14 Sep 2016 13:14:39 +0000 Subject: Add type annotations for the benefit of Java 7 -- MOS_MIGRATED_REVID=133119463 --- .../com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 4 ++-- .../google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 2 +- .../devtools/build/lib/analysis/util/ConfigurationTestCase.java | 2 +- .../google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java | 4 ++-- .../google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java | 2 +- .../java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java | 2 +- .../com/google/devtools/build/lib/skyframe/PackageFunctionTest.java | 2 +- .../google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java | 4 ++-- .../devtools/build/lib/skyframe/SkylarkFileContentHashTests.java | 2 +- .../devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib') 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 3cb49517e3..2ea8887392 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 @@ -183,7 +183,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); packageManager = skyframeExecutor.getPackageManager(); loadingPhaseRunner = skyframeExecutor.getLoadingPhaseRunner( @@ -287,7 +287,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.invalidateFilesUnderPathForTesting(reporter, ModifiedFileSet.EVERYTHING_MODIFIED, rootDirectory); 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 7da4ca5398..dc540061ab 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 @@ -232,7 +232,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { 7, "", UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), tsgm); useConfiguration(); setUpSkyframe(); 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 b5ecba0643..45a135b5df 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 @@ -123,7 +123,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { ruleClassProvider.getDefaultsPackageContent( analysisMock.getInvocationPolicyEnforcer().getInvocationPolicy()), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); mockToolsConfig = new MockToolsConfig(rootDirectory); 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 3069a1d12c..b667018866 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 @@ -485,7 +485,7 @@ public class IncrementalLoadingTest { skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(workspace)), ConstantRuleVisibility.PUBLIC, true, 7, "", - UUID.randomUUID(), ImmutableMap.of(), + UUID.randomUUID(), ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } @@ -565,7 +565,7 @@ public class IncrementalLoadingTest { skyframeExecutor.preparePackageLoading( new PathPackageLocator(outputBase, ImmutableList.of(workspace)), ConstantRuleVisibility.PUBLIC, true, 7, "", - UUID.randomUUID(), ImmutableMap.of(), + UUID.randomUUID(), ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.invalidateFilesUnderPathForTesting( new Reporter(), modifiedFileSet, workspace); 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 ceb26a1da3..1c3ca978c9 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 @@ -621,7 +621,7 @@ public class LoadingPhaseRunnerTest { 7, analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(clock)); loadingPhaseRunner = skyframeExecutor.getLoadingPhaseRunner(pkgFactory.getRuleClassNames(), useNewImpl); 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 5735458b10..5ab8687ae6 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 @@ -111,7 +111,7 @@ public class PackageCacheTest extends FoundationTestCase { 7, analysisMock.getDefaultsPackageContent(), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); skyframeExecutor.setDeletedPackages( ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages())); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java index f6ee2ee57a..fcda5f41d7 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java @@ -449,7 +449,7 @@ public class PackageFunctionTest extends BuildViewTestCase { 7, "", UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), tsgm); value = validPackage(skyKey); assertThat( diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java index 902c62f5a1..34570a0b3f 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java @@ -409,7 +409,7 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { 7, loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("pkg/BUILD", "sh_library(name = 'x', deps = ['z'])", "sh_library(name = 'z')"); @@ -454,7 +454,7 @@ public class SkyframeLabelVisitorTest extends SkyframeLabelVisitorTestCase { 7, loadingMock.getDefaultsPackageContent(), UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); this.visitor = getSkyframeExecutor().pkgLoader(); scratch.file("a/BUILD", "subinclude('//b:c/d/foo')"); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java index 23f7171bf7..d5dff75223 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java @@ -163,7 +163,7 @@ public class SkylarkFileContentHashTests extends BuildViewTestCase { 7, "", UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); SkyKey pkgLookupKey = PackageValue.key(PackageIdentifier.parse("@//" + pkg)); EvaluationResult result = diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java index 78100f728e..f869e655c4 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java @@ -54,7 +54,7 @@ public class SkylarkImportLookupFunctionTest extends BuildViewTestCase { 7, "", UUID.randomUUID(), - ImmutableMap.of(), + ImmutableMap.of(), new TimestampGranularityMonitor(BlazeClock.instance())); } -- cgit v1.2.3