From aea56b36af994b269800602e36000c293cabd00b Mon Sep 17 00:00:00 2001 From: lberki Date: Tue, 30 May 2017 12:35:33 +0200 Subject: Migrate Java tests to Truth. RELNOTES: None. PiperOrigin-RevId: 157446717 --- .../analysis/config/BuildConfigurationTest.java | 95 +++++++++++----------- .../lib/analysis/config/BuildOptionsTest.java | 31 +++---- .../lib/analysis/config/PerLabelOptionsTest.java | 20 ++--- .../lib/analysis/config/RunUnderConverterTest.java | 16 ++-- .../build/lib/analysis/config/StampTest.java | 6 +- 5 files changed, 79 insertions(+), 89 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis/config') 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 7678314870..b9fcc2f39b 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 @@ -14,10 +14,6 @@ package com.google.devtools.build.lib.analysis.config; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableSet; @@ -55,16 +51,16 @@ public class BuildConfigurationTest extends ConfigurationTestCase { + "/" + config.getMainRepositoryName() + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-piii-fastbuild"; - assertEquals(outputDirPrefix, - config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); - assertEquals(outputDirPrefix + "/bin", - config.getBinDirectory(RepositoryName.MAIN).getPath().toString()); - assertEquals(outputDirPrefix + "/include", - config.getIncludeDirectory(RepositoryName.MAIN).getPath().toString()); - assertEquals(outputDirPrefix + "/genfiles", - config.getGenfilesDirectory(RepositoryName.MAIN).getPath().toString()); - assertEquals(outputDirPrefix + "/testlogs", - config.getTestLogsDirectory(RepositoryName.MAIN).getPath().toString()); + assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo(outputDirPrefix); + assertThat(config.getBinDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo(outputDirPrefix + "/bin"); + assertThat(config.getIncludeDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo(outputDirPrefix + "/include"); + assertThat(config.getGenfilesDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo(outputDirPrefix + "/genfiles"); + assertThat(config.getTestLogsDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo(outputDirPrefix + "/testlogs"); } @Test @@ -74,9 +70,12 @@ public class BuildConfigurationTest extends ConfigurationTestCase { } BuildConfiguration config = create("--platform_suffix=-test"); - assertEquals(outputBase + "/" + config.getMainRepositoryName() - + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test", - config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()); + assertThat(config.getOutputDirectory(RepositoryName.MAIN).getPath().toString()) + .isEqualTo( + outputBase + + "/" + + config.getMainRepositoryName() + + "/blaze-out/gcc-4.4.0-glibc-2.3.6-grte-k8-fastbuild-test"); } @Test @@ -101,7 +100,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase { public void testHostCpu() throws Exception { for (String cpu : new String[] { "piii", "k8" }) { BuildConfiguration hostConfig = createHost("--host_cpu=" + cpu); - assertEquals(cpu, hostConfig.getFragment(CppConfiguration.class).getTargetCpu()); + assertThat(hostConfig.getFragment(CppConfiguration.class).getTargetCpu()).isEqualTo(cpu); } } @@ -113,12 +112,12 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfigurationCollection configs = createCollection("--cpu=piii"); BuildConfiguration config = Iterables.getOnlyElement(configs.getTargetConfigurations()); - assertEquals(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:cc-compiler-piii"), - config.getFragment(CppConfiguration.class).getCcToolchainRuleLabel()); + assertThat(config.getFragment(CppConfiguration.class).getCcToolchainRuleLabel()) + .isEqualTo(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:cc-compiler-piii")); BuildConfiguration hostConfig = configs.getHostConfiguration(); - assertEquals(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:cc-compiler-k8"), - hostConfig.getFragment(CppConfiguration.class).getCcToolchainRuleLabel()); + assertThat(hostConfig.getFragment(CppConfiguration.class).getCcToolchainRuleLabel()) + .isEqualTo(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:cc-compiler-k8")); } @Test @@ -133,8 +132,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfiguration.Options b = Options.getDefaults(BuildConfiguration.Options.class); // The String representations of the BuildConfiguration.Options must be equal even if these are // different objects, if they were created with the same options (no options in this case). - assertEquals(a.toString(), b.toString()); - assertEquals(a.cacheKey(), b.cacheKey()); + assertThat(b.toString()).isEqualTo(a.toString()); + assertThat(b.cacheKey()).isEqualTo(a.cacheKey()); } @Test @@ -145,8 +144,11 @@ public class BuildConfigurationTest extends ConfigurationTestCase { create("--cpu=bogus", "--experimental_disable_jvm"); fail(); } catch (InvalidConfigurationException e) { - assertThat(e.getMessage()).matches(Pattern.compile( - "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n( [\\w-]+,\n)+]")); + assertThat(e) + .hasMessageThat() + .matches( + Pattern.compile( + "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n( [\\w-]+,\n)+]")); } } @@ -165,8 +167,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { BuildConfigurationCollection master = createCollection("--multi_cpu=k8", "--multi_cpu=piii"); assertThat(master.getTargetConfigurations()).hasSize(2); // Note: the cpus are sorted alphabetically. - assertEquals("k8", master.getTargetConfigurations().get(0).getCpu()); - assertEquals("piii", master.getTargetConfigurations().get(1).getCpu()); + assertThat(master.getTargetConfigurations().get(0).getCpu()).isEqualTo("k8"); + assertThat(master.getTargetConfigurations().get(1).getCpu()).isEqualTo("piii"); } /** @@ -187,8 +189,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { master = createCollection("--multi_cpu=piii", "--multi_cpu=k8"); } assertThat(master.getTargetConfigurations()).hasSize(2); - assertEquals("k8", master.getTargetConfigurations().get(0).getCpu()); - assertEquals("piii", master.getTargetConfigurations().get(1).getCpu()); + assertThat(master.getTargetConfigurations().get(0).getCpu()).isEqualTo("k8"); + assertThat(master.getTargetConfigurations().get(1).getCpu()).isEqualTo("piii"); } } @@ -272,29 +274,24 @@ public class BuildConfigurationTest extends ConfigurationTestCase { @Test public void testGetTransitiveOptionDetails() throws Exception { // Directly defined options: - assertEquals( - CompilationMode.DBG, - create("-c", "dbg").getTransitiveOptionDetails().getOptionValue("compilation_mode")); - assertEquals( - CompilationMode.OPT, - create("-c", "opt").getTransitiveOptionDetails().getOptionValue("compilation_mode")); + assertThat(create("-c", "dbg").getTransitiveOptionDetails().getOptionValue("compilation_mode")) + .isEqualTo(CompilationMode.DBG); + assertThat(create("-c", "opt").getTransitiveOptionDetails().getOptionValue("compilation_mode")) + .isEqualTo(CompilationMode.OPT); // Options defined in a fragment: - assertEquals( - Boolean.TRUE, - create("--force_pic").getTransitiveOptionDetails().getOptionValue("force_pic")); - assertEquals( - Boolean.FALSE, - create("--noforce_pic").getTransitiveOptionDetails().getOptionValue("force_pic")); + assertThat(create("--force_pic").getTransitiveOptionDetails().getOptionValue("force_pic")) + .isEqualTo(Boolean.TRUE); + assertThat(create("--noforce_pic").getTransitiveOptionDetails().getOptionValue("force_pic")) + .isEqualTo(Boolean.FALSE); // Late-bound default option: BuildConfiguration config = create(); - assertEquals( - config.getTransitiveOptionDetails().getOptionValue("compiler"), - config.getFragment(CppConfiguration.class).getCompiler()); + assertThat(config.getFragment(CppConfiguration.class).getCompiler()) + .isEqualTo(config.getTransitiveOptionDetails().getOptionValue("compiler")); // Legitimately null option: - assertNull(create().getTransitiveOptionDetails().getOptionValue("test_filter")); + assertThat(create().getTransitiveOptionDetails().getOptionValue("test_filter")).isNull(); } @Test @@ -315,9 +312,9 @@ public class BuildConfigurationTest extends ConfigurationTestCase { analysisMock.createRuleClassProvider()); BuildConfiguration hostConfig = createHost(); - assertTrue(config.equalsOrIsSupersetOf(trimmedConfig)); - assertFalse(config.equalsOrIsSupersetOf(hostConfig)); - assertFalse(trimmedConfig.equalsOrIsSupersetOf(config)); + assertThat(config.equalsOrIsSupersetOf(trimmedConfig)).isTrue(); + assertThat(config.equalsOrIsSupersetOf(hostConfig)).isFalse(); + assertThat(trimmedConfig.equalsOrIsSupersetOf(config)).isFalse(); } @Test 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 4b4d7d0258..7dbca0bf42 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 @@ -13,13 +13,11 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.rules.cpp.CppOptions; import com.google.devtools.common.options.OptionsParser; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -38,8 +36,8 @@ public class BuildOptionsTest { BuildOptions b = BuildOptions.of(TEST_OPTIONS, OptionsParser.newOptionsParser(TEST_OPTIONS)); // The cache keys of the OptionSets must be equal even if these are // different objects, if they were created with the same options (no options in this case). - assertEquals(a.toString(), b.toString()); - assertEquals(a.computeCacheKey(), b.computeCacheKey()); + assertThat(b.toString()).isEqualTo(a.toString()); + assertThat(b.computeCacheKey()).isEqualTo(a.computeCacheKey()); } @Test @@ -48,7 +46,7 @@ public class BuildOptionsTest { String[] options = new String[] { "--run_under=//run_under" }; BuildOptions a = BuildOptions.of(TEST_OPTIONS, options); BuildOptions b = BuildOptions.of(TEST_OPTIONS, options); - assertEquals(a.toString(), b.toString()); + assertThat(b.toString()).isEqualTo(a.toString()); } @Test @@ -56,15 +54,20 @@ public class BuildOptionsTest { String[] options1 = new String[] { "--compilation_mode=opt" }; String[] options2 = new String[] { "--compilation_mode=dbg" }; // Distinct instances with the same values are equal: - assertEquals(BuildOptions.of(TEST_OPTIONS, options1), BuildOptions.of(TEST_OPTIONS, options1)); + assertThat(BuildOptions.of(TEST_OPTIONS, options1)) + .isEqualTo(BuildOptions.of(TEST_OPTIONS, options1)); // Same fragments, different values aren't equal: - assertFalse(BuildOptions.of(TEST_OPTIONS, options1).equals( - BuildOptions.of(TEST_OPTIONS, options2))); + assertThat( + BuildOptions.of(TEST_OPTIONS, options1).equals(BuildOptions.of(TEST_OPTIONS, options2))) + .isFalse(); // Same values, different fragments aren't equal: - assertFalse(BuildOptions.of(TEST_OPTIONS, options1).equals( - BuildOptions.of( - ImmutableList.>of( - BuildConfiguration.Options.class, CppOptions.class), - options1))); + assertThat( + BuildOptions.of(TEST_OPTIONS, options1) + .equals( + BuildOptions.of( + ImmutableList.>of( + BuildConfiguration.Options.class, CppOptions.class), + options1))) + .isFalse(); } } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/PerLabelOptionsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/PerLabelOptionsTest.java index 1441ebe485..c1e17652cf 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/PerLabelOptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/PerLabelOptionsTest.java @@ -14,24 +14,18 @@ package com.google.devtools.build.lib.analysis.config; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.util.RegexFilter; import com.google.devtools.common.options.OptionsParsingException; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; -/** - * A test for {@link PerLabelOptions}. - */ +/** A test for {@link PerLabelOptions}. */ @RunWith(JUnit4.class) public class PerLabelOptionsTest { private PerLabelOptions options = null; @@ -43,15 +37,15 @@ public class PerLabelOptionsTest { private void assertRegexParsing(String filter) throws OptionsParsingException { RegexFilter regexFilter = new RegexFilter.RegexFilterConverter().convert(filter); - assertEquals(regexFilter.toString(), options.getRegexFilter().toString()); + assertThat(options.getRegexFilter().toString()).isEqualTo(regexFilter.toString()); } private void assertOptions(String pattern, String opts, List expectedOptions) throws OptionsParsingException { createOptions(pattern + "@" + opts); assertRegexParsing(pattern); - assertNotNull(options.getOptions()); - assertEquals(expectedOptions, options.getOptions()); + assertThat(options.getOptions()).isNotNull(); + assertThat(options.getOptions()).isEqualTo(expectedOptions); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/RunUnderConverterTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/RunUnderConverterTest.java index 4ded8121b4..70e8d002b5 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/RunUnderConverterTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/RunUnderConverterTest.java @@ -14,21 +14,16 @@ package com.google.devtools.build.lib.analysis.config; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.devtools.common.options.OptionsParsingException; - +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.List; - -/** - * Tests {@link RunUnderConverter}. - */ +/** Tests {@link RunUnderConverter}. */ @RunWith(JUnit4.class) public class RunUnderConverterTest { @@ -49,9 +44,10 @@ public class RunUnderConverterTest { private void assertEqualsRunUnder(String input, String label, String command, List options) throws Exception { RunUnder runUnder = new RunUnderConverter().convert(input); - assertEquals(label, runUnder.getLabel() == null ? null : runUnder.getLabel().toString()); - assertEquals(command, runUnder.getCommand()); - assertEquals(options, runUnder.getOptions()); + assertThat(runUnder.getLabel() == null ? null : runUnder.getLabel().toString()) + .isEqualTo(label); + assertThat(runUnder.getCommand()).isEqualTo(command); + assertThat(runUnder.getOptions()).isEqualTo(options); } private void assertRunUnderFails(String input, String expectedError) { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java index 1875088c53..c6e68c042e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.config; -import static org.junit.Assert.assertEquals; +import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.packages.AttributeContainer; @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleFactory; import com.google.devtools.build.lib.packages.TargetUtils; import com.google.devtools.build.lib.packages.TriState; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -43,7 +42,8 @@ public class StampTest extends BuildViewTestCase { for (String name : ruleFactory.getRuleClassNames()) { RuleClass ruleClass = ruleFactory.getRuleClass(name); if (TargetUtils.isTestRuleName(name) && ruleClass.hasAttr("stamp", BuildType.TRISTATE)) { - assertEquals(TriState.NO, ruleClass.getAttributeByName("stamp").getDefaultValue(null)); + assertThat(ruleClass.getAttributeByName("stamp").getDefaultValue(null)) + .isEqualTo(TriState.NO); } } } -- cgit v1.2.3