diff options
| author |  mjhalupka <mjhalupka@google.com> | 2018-07-11 11:09:46 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-11 11:11:12 -0700 |
| commit | b6385d1e8f17fa5b1bdcd08c3577634901d4b4b5 (patch) | |
| tree | 8d20b4e7026d0b494d9ebdcf651343f14bcc113b /src/test/java/com/google/devtools/build | |
| parent | e0a68ab35294b0acff1226d74744957780967ae4 (diff) | |
Move caching to BuildOptions instead of BuildConfigurationValue.Key.
PiperOrigin-RevId: 204154609
Diffstat (limited to 'src/test/java/com/google/devtools/build')
| -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, 12 insertions, 8 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 baa2940b1c..3b280c5b25 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,9 +462,7 @@ 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( - BuildConfigurationValue.KeyCodecCache.class, - new BuildConfigurationValue.KeyCodecCache()) + .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()) .setVerificationFunction(BuildConfigurationTest::verifyDeserialized) .runTests(); } @@ -476,9 +474,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { .stream() .map(BuildConfigurationValue::key) .collect(ImmutableList.toImmutableList())) - .addDependency( - BuildConfigurationValue.KeyCodecCache.class, - new BuildConfigurationValue.KeyCodecCache()) + .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()) .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 3f0f93a513..f8590d206d 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,7 +210,15 @@ 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())) - .isEqualTo(TestUtils.toBytes(diff1, ImmutableMap.of())); + assertThat( + TestUtils.toBytes( + diff2, + ImmutableMap.of( + BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()))) + .isEqualTo( + TestUtils.toBytes( + diff1, + ImmutableMap.of( + BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache()))); } } |