diff options
author | 2018-08-08 07:38:28 -0700 | |
---|---|---|
committer | 2018-08-08 07:39:58 -0700 | |
commit | 39e9b450a05f19e698fede059dccae29e962b97e (patch) | |
tree | 3971b70cec0358ce783867abfc234b7f1cc9ff4e /src/test/java/com/google/devtools/build | |
parent | 60ec7001af92408eade19ece35a14490c7582231 (diff) |
Automatic code cleanup.
PiperOrigin-RevId: 207882126
Diffstat (limited to 'src/test/java/com/google/devtools/build')
5 files changed, 22 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java index f09d1b0af4..634667de10 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java @@ -212,14 +212,21 @@ public class RegisteredExecutionPlatformsFunctionTest extends ToolchainTestCase new EqualsTester() .addEqualityGroup( + // Two platforms registered. RegisteredExecutionPlatformsValue.create( ImmutableList.of(executionPlatformKey1, executionPlatformKey2)), RegisteredExecutionPlatformsValue.create( ImmutableList.of(executionPlatformKey1, executionPlatformKey2))) .addEqualityGroup( - RegisteredExecutionPlatformsValue.create(ImmutableList.of(executionPlatformKey1)), - RegisteredExecutionPlatformsValue.create(ImmutableList.of(executionPlatformKey2)), + // A single platform registered. + RegisteredExecutionPlatformsValue.create(ImmutableList.of(executionPlatformKey1))) + .addEqualityGroup( + // A single, different, platform registered. + RegisteredExecutionPlatformsValue.create(ImmutableList.of(executionPlatformKey2))) + .addEqualityGroup( + // The same as the first group, but the order is different. RegisteredExecutionPlatformsValue.create( - ImmutableList.of(executionPlatformKey2, executionPlatformKey1))); + ImmutableList.of(executionPlatformKey2, executionPlatformKey1))) + .testEquals(); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java index 4ade87d5e9..d8593d1344 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java @@ -256,9 +256,10 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase { .addEqualityGroup( RegisteredToolchainsValue.create(ImmutableList.of(toolchain1, toolchain2)), RegisteredToolchainsValue.create(ImmutableList.of(toolchain1, toolchain2))) + .addEqualityGroup(RegisteredToolchainsValue.create(ImmutableList.of(toolchain1))) + .addEqualityGroup(RegisteredToolchainsValue.create(ImmutableList.of(toolchain2))) .addEqualityGroup( - RegisteredToolchainsValue.create(ImmutableList.of(toolchain1)), - RegisteredToolchainsValue.create(ImmutableList.of(toolchain2)), - RegisteredToolchainsValue.create(ImmutableList.of(toolchain2, toolchain1))); + RegisteredToolchainsValue.create(ImmutableList.of(toolchain2, toolchain1))) + .testEquals(); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java index 78a95305f6..f0d3eb5a51 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java @@ -203,6 +203,7 @@ public class RepositoryMappingFunctionTest extends BuildViewTestCase { RepositoryMappingValue.withMapping( ImmutableMap.of(RepositoryName.create("@fizz"), RepositoryName.create("@buzz"))), RepositoryMappingValue.withMapping( - ImmutableMap.of(RepositoryName.create("@fizz"), RepositoryName.create("@buzz")))); + ImmutableMap.of(RepositoryName.create("@fizz"), RepositoryName.create("@buzz")))) + .testEquals(); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java index 5e7f349afc..fb33c02217 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java @@ -175,6 +175,7 @@ public class ToolchainResolutionFunctionTest extends ToolchainTestCase { ImmutableMap.<ConfiguredTargetKey, Label>builder() .put(LINUX_CTKEY, makeLabel("//test:toolchain_impl_1")) .put(MAC_CTKEY, makeLabel("//test:toolchain_impl_1")) - .build())); + .build())) + .testEquals(); } } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java index ec173772b6..b290e8df8c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceNameFunctionTest.java @@ -77,13 +77,10 @@ public class WorkspaceNameFunctionTest extends BuildViewTestCase { } @Test - public void testEqualsAndHashCode(){ + public void testEqualsAndHashCode() { new EqualsTester() - .addEqualityGroup( - WorkspaceNameValue.withName("foo"), - WorkspaceNameValue.withName("foo")) - .addEqualityGroup( - WorkspaceNameValue.withName("bar"), - WorkspaceNameValue.withName("bar")); + .addEqualityGroup(WorkspaceNameValue.withName("foo"), WorkspaceNameValue.withName("foo")) + .addEqualityGroup(WorkspaceNameValue.withName("bar"), WorkspaceNameValue.withName("bar")) + .testEquals(); } } |