diff options
| author |  shahan <shahan@google.com> | 2018-07-26 10:34:15 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-26 10:35:21 -0700 |
| commit | db01c6f926bcb4774d901797c59f51dd54c05624 (patch) | |
| tree | e6787b60cc8aeefc22943a34f4fb151b1b6fca8d /src/test | |
| parent | e24a591d4288b33dfbf790e89e0def610fe6a7d9 (diff) | |
PiperOrigin-RevId: 206181674
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java | 8 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index 3b280c5b25..baa2940b1c 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -462,7 +462,9 @@ public class BuildConfigurationTest extends ConfigurationTestCase { // Unnecessary ImmutableList.copyOf apparently necessary to choose non-varargs constructor. new SerializationTester(ImmutableList.copyOf(getTestConfigurations())) .addDependency(FileSystem.class, getScratch().getFileSystem()) - .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()) + .addDependency( + BuildConfigurationValue.KeyCodecCache.class, + new BuildConfigurationValue.KeyCodecCache()) .setVerificationFunction(BuildConfigurationTest::verifyDeserialized) .runTests(); } @@ -474,7 +476,9 @@ public class BuildConfigurationTest extends ConfigurationTestCase { .stream() .map(BuildConfigurationValue::key) .collect(ImmutableList.toImmutableList())) - .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()) + .addDependency( + BuildConfigurationValue.KeyCodecCache.class, + new BuildConfigurationValue.KeyCodecCache()) .runTests(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java index f8590d206d..3f0f93a513 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java @@ -210,15 +210,7 @@ public class BuildOptionsTest { OptionsDiffForReconstruction diff1 = BuildOptions.diffForReconstruction(one, two); OptionsDiffForReconstruction diff2 = BuildOptions.diffForReconstruction(one, two); assertThat(diff2).isEqualTo(diff1); - assertThat( - TestUtils.toBytes( - diff2, - ImmutableMap.of( - BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()))) - .isEqualTo( - TestUtils.toBytes( - diff1, - ImmutableMap.of( - BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()))); + assertThat(TestUtils.toBytes(diff2, ImmutableMap.of())) + .isEqualTo(TestUtils.toBytes(diff1, ImmutableMap.of())); } } |