Automatic code cleanup.
PiperOrigin-RevId: 217210028
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
index b2c9a47..db6cc5e 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -169,6 +169,14 @@
assertThat(rule.getName()).isEqualTo("foo");
}
+ EvaluationResult<GetRuleByNameValue> getRuleByName(SkyKey key) throws InterruptedException {
+ return driver.<GetRuleByNameValue>evaluate(
+ ImmutableList.of(key),
+ false,
+ SkyframeExecutor.DEFAULT_THREAD_COUNT,
+ NullEventHandler.INSTANCE);
+ }
+
@Test
public void getRuleByName_missing() throws Exception {
if (!analysisMock.isThisBazel()) {
@@ -202,6 +210,15 @@
.inOrder();
}
+ EvaluationResult<GetRegisteredToolchainsValue> getRegisteredToolchains(SkyKey key)
+ throws InterruptedException {
+ return driver.<GetRegisteredToolchainsValue>evaluate(
+ ImmutableList.of(key),
+ false,
+ SkyframeExecutor.DEFAULT_THREAD_COUNT,
+ NullEventHandler.INSTANCE);
+ }
+
@Test
public void getRegisteredExecutionPlatforms() throws Exception {
scratch.overwriteFile(
@@ -218,6 +235,15 @@
.inOrder();
}
+ EvaluationResult<GetRegisteredExecutionPlatformsValue> getRegisteredExecutionPlatforms(SkyKey key)
+ throws InterruptedException {
+ return driver.<GetRegisteredExecutionPlatformsValue>evaluate(
+ ImmutableList.of(key),
+ false,
+ SkyframeExecutor.DEFAULT_THREAD_COUNT,
+ NullEventHandler.INSTANCE);
+ }
+
// HELPER SKYFUNCTIONS
// GetRuleByName.
@@ -225,14 +251,6 @@
return new Key(ruleName);
}
- EvaluationResult<GetRuleByNameValue> getRuleByName(SkyKey key) throws InterruptedException {
- return driver.<GetRuleByNameValue>evaluate(
- ImmutableList.of(key),
- false,
- SkyframeExecutor.DEFAULT_THREAD_COUNT,
- NullEventHandler.INSTANCE);
- }
-
private static final SkyFunctionName GET_RULE_BY_NAME_FUNCTION =
SkyFunctionName.createHermetic("GET_RULE_BY_NAME");
@@ -272,15 +290,6 @@
return () -> GET_REGISTERED_TOOLCHAINS_FUNCTION;
}
- EvaluationResult<GetRegisteredToolchainsValue> getRegisteredToolchains(SkyKey key)
- throws InterruptedException {
- return driver.<GetRegisteredToolchainsValue>evaluate(
- ImmutableList.of(key),
- false,
- SkyframeExecutor.DEFAULT_THREAD_COUNT,
- NullEventHandler.INSTANCE);
- }
-
private static final SkyFunctionName GET_REGISTERED_TOOLCHAINS_FUNCTION =
SkyFunctionName.createHermetic("GET_REGISTERED_TOOLCHAINS");
@@ -319,15 +328,6 @@
return () -> GET_REGISTERED_EXECUTION_PLATFORMS_FUNCTION;
}
- EvaluationResult<GetRegisteredExecutionPlatformsValue> getRegisteredExecutionPlatforms(SkyKey key)
- throws InterruptedException {
- return driver.<GetRegisteredExecutionPlatformsValue>evaluate(
- ImmutableList.of(key),
- false,
- SkyframeExecutor.DEFAULT_THREAD_COUNT,
- NullEventHandler.INSTANCE);
- }
-
private static final SkyFunctionName GET_REGISTERED_EXECUTION_PLATFORMS_FUNCTION =
SkyFunctionName.createHermetic("GET_REGISTERED_EXECUTION_PLATFORMS_FUNCTION");