Some more cleanup.
--
MOS_MIGRATED_REVID=87942730
diff --git a/src/test/java/com/google/devtools/build/lib/util/CommandBuilderTest.java b/src/test/java/com/google/devtools/build/lib/util/CommandBuilderTest.java
index 566da25..e104c82 100644
--- a/src/test/java/com/google/devtools/build/lib/util/CommandBuilderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/CommandBuilderTest.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.util;
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;
@@ -53,7 +52,7 @@
builder.build();
fail("Expected exception");
} catch (Exception e) {
- assertEquals(expected, e.getMessage());
+ assertThat(e).hasMessage(expected);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java b/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java
index 301875c..6d32eaa 100644
--- a/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/FileTypeTest.java
@@ -106,7 +106,7 @@
FileTypeSet allowedTypes = FileTypeSet.of(TEXT, HTML);
assertTrue(allowedTypes.matches("readme.txt"));
- assertTrue(!allowedTypes.matches("style.css"));
+ assertFalse(allowedTypes.matches("style.css"));
}
private List<HasFilename> getArtifacts() {
diff --git a/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java b/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
index 87cd8c9..7a2eacc 100644
--- a/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/GroupedListTest.java
@@ -13,7 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
-import static com.google.common.truth.Truth.assert_;
+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.assertTrue;
@@ -125,8 +125,8 @@
assertFalse(groupedList.isEmpty());
Object compressed = groupedList.compress();
assertElementsEqual(compressed, allElts);
- assert_().that(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
- assert_().that(groupedList).containsExactlyElementsIn(elements).inOrder();
+ assertThat(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
+ assertThat(groupedList).containsExactlyElementsIn(elements).inOrder();
}
@Test
@@ -157,8 +157,8 @@
assertElementsEqual(compressed, allElts);
// Get rid of empty list -- it was not stored in groupedList.
elements.remove(1);
- assert_().that(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
- assert_().that(groupedList).containsExactlyElementsIn(elements).inOrder();
+ assertThat(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
+ assertThat(groupedList).containsExactlyElementsIn(elements).inOrder();
}
@Test
@@ -194,8 +194,8 @@
elements.remove(ImmutableList.of("3"));
elements.remove(ImmutableList.of());
elements.remove(ImmutableList.of("removedGroup1", "removedGroup2"));
- assert_().that(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
- assert_().that(groupedList).containsExactlyElementsIn(elements).inOrder();
+ assertThat(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
+ assertThat(groupedList).containsExactlyElementsIn(elements).inOrder();
}
@Test
@@ -220,8 +220,8 @@
allElts.removeAll(removed);
assertElementsEqual(compressed, allElts);
elements.get(0).removeAll(removed);
- assert_().that(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
- assert_().that(groupedList).containsExactlyElementsIn(elements).inOrder();
+ assertThat(GroupedList.create(compressed)).containsExactlyElementsIn(elements).inOrder();
+ assertThat(groupedList).containsExactlyElementsIn(elements).inOrder();
}
private static Object createAndCompress(Collection<String> list) {
@@ -239,8 +239,7 @@
}
private static void assertElementsEqual(Object compressed, Iterable<String> expected) {
- assert_()
- .that(GroupedList.<String>create(compressed).toSet())
+ assertThat(GroupedList.<String>create(compressed).toSet())
.containsExactlyElementsIn(expected)
.inOrder();
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/PairTest.java b/src/test/java/com/google/devtools/build/lib/util/PairTest.java
index f82e12f..7093c76 100644
--- a/src/test/java/com/google/devtools/build/lib/util/PairTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/PairTest.java
@@ -16,7 +16,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,6 +46,6 @@
assertNull(p.first);
assertNull(p.second);
p.hashCode(); // Should not throw.
- assertTrue(p.equals(p));
+ assertEquals(p, p);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/PersistentMapTest.java b/src/test/java/com/google/devtools/build/lib/util/PersistentMapTest.java
index 44aa538..2e246c8 100644
--- a/src/test/java/com/google/devtools/build/lib/util/PersistentMapTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/PersistentMapTest.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
+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.assertTrue;
@@ -97,19 +98,19 @@
createMap();
map.put("foo", "bar");
map.put("baz", "bang");
- assertEquals("bar", map.get("foo"));
- assertEquals("bang", map.get("baz"));
- assertEquals(2, map.size());
+ assertThat(map).containsEntry("foo", "bar");
+ assertThat(map).containsEntry("baz", "bang");
+ assertThat(map).hasSize(2);
long size = map.save();
assertEquals(mapFile.getFileSize(), size);
- assertEquals("bar", map.get("foo"));
- assertEquals("bang", map.get("baz"));
- assertEquals(2, map.size());
+ assertThat(map).containsEntry("foo", "bar");
+ assertThat(map).containsEntry("baz", "bang");
+ assertThat(map).hasSize(2);
createMap(); // create a new map
- assertEquals("bar", map.get("foo"));
- assertEquals("bang", map.get("baz"));
- assertEquals(2, map.size());
+ assertThat(map).containsEntry("foo", "bar");
+ assertThat(map).containsEntry("baz", "bang");
+ assertThat(map).hasSize(2);
}
@Test
@@ -121,10 +122,10 @@
assertEquals(mapFile.getFileSize(), size);
assertFalse(journalFile.exists());
map.remove("foo");
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
assertTrue(journalFile.exists());
createMap(); // create a new map
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
}
@Test
@@ -136,11 +137,11 @@
assertTrue(mapFile.exists());
assertFalse(journalFile.exists());
map.clear();
- assertEquals(0, map.size());
+ assertThat(map).isEmpty();
assertTrue(mapFile.exists());
assertFalse(journalFile.exists());
createMap(); // create a new map
- assertEquals(0, map.size());
+ assertThat(map).isEmpty();
}
@Test
@@ -154,12 +155,12 @@
map.updateJournal = false;
// remove an entry
map.remove("foo");
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
// no journal file written
assertFalse(journalFile.exists());
createMap(); // create a new map
// both entries are still in the map on disk
- assertEquals(2, map.size());
+ assertThat(map).hasSize(2);
}
@Test
@@ -176,26 +177,26 @@
// remove an entry
map.remove("foo");
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
// no journal file written
assertFalse(journalFile.exists());
long size = map.save();
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
// The journal must be serialzed on save(), even if !updateJournal.
assertTrue(journalFile.exists());
assertEquals(journalFile.getFileSize() + mapFile.getFileSize(), size);
map.load();
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
assertTrue(journalFile.exists());
createMap(); // create a new map
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
map.keepJournal = false;
map.save();
- assertEquals(1, map.size());
+ assertThat(map).hasSize(1);
assertFalse(journalFile.exists());
}
@@ -207,19 +208,19 @@
assertFalse(journalFile.exists());
// add an entry
map.put("baz", "bang");
- assertEquals(2, map.size());
+ assertThat(map).hasSize(2);
// journal file written
assertTrue(journalFile.exists());
createMap(); // create a new map
// both entries are still in the map on disk
- assertEquals(2, map.size());
+ assertThat(map).hasSize(2);
// add another entry
map.put("baz2", "bang2");
- assertEquals(3, map.size());
+ assertThat(map).hasSize(3);
// journal file written
assertTrue(journalFile.exists());
createMap(); // create a new map
// all three entries are still in the map on disk
- assertEquals(3, map.size());
+ assertThat(map).hasSize(3);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/ResourceFileLoaderTest.java b/src/test/java/com/google/devtools/build/lib/util/ResourceFileLoaderTest.java
index e821ca1..6067101 100644
--- a/src/test/java/com/google/devtools/build/lib/util/ResourceFileLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/ResourceFileLoaderTest.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
+import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -42,7 +43,7 @@
"does_not_exist.txt");
fail();
} catch (IOException e) {
- assertEquals("does_not_exist.txt not found.", e.getMessage());
+ assertThat(e).hasMessage("does_not_exist.txt not found.");
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/StringIndexerTest.java b/src/test/java/com/google/devtools/build/lib/util/StringIndexerTest.java
index 693e11a..b1dee1b 100644
--- a/src/test/java/com/google/devtools/build/lib/util/StringIndexerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/StringIndexerTest.java
@@ -78,7 +78,7 @@
protected void assertContent() {
for (int i = 0; i < indexer.size(); i++) {
assertNotNull(mappings.get(i));
- assertEquals(mappings.get(i), indexer.getStringForIndex(i));
+ assertThat(mappings).containsEntry(i, indexer.getStringForIndex(i));
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/StringUtilTest.java b/src/test/java/com/google/devtools/build/lib/util/StringUtilTest.java
index 96d9a53..3239d73 100644
--- a/src/test/java/com/google/devtools/build/lib/util/StringUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/StringUtilTest.java
@@ -13,12 +13,14 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.util.StringUtil.capitalize;
import static com.google.devtools.build.lib.util.StringUtil.indent;
import static com.google.devtools.build.lib.util.StringUtil.joinEnglishList;
import static com.google.devtools.build.lib.util.StringUtil.splitAndInternString;
import static com.google.devtools.build.lib.util.StringUtil.stripSuffix;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import com.google.common.collect.ImmutableList;
@@ -57,13 +59,13 @@
@Test
public void splitAndIntern() throws Exception {
- assertEquals(ImmutableList.of(), splitAndInternString(" "));
- assertEquals(ImmutableList.of(), splitAndInternString(null));
+ assertThat(splitAndInternString(" ")).isEmpty();
+ assertThat(splitAndInternString(null)).isEmpty();
List<String> list1 = splitAndInternString(" x y z z");
List<String> list2 = splitAndInternString("a z c z");
- assertEquals(ImmutableList.of("x", "y", "z", "z"), list1);
- assertEquals(ImmutableList.of("a", "z", "c", "z"), list2);
+ assertThat(list1).containsExactly("x", "y", "z", "z").inOrder();
+ assertThat(list2).containsExactly("a", "z", "c", "z").inOrder();
assertSame(list1.get(2), list1.get(3));
assertSame(list1.get(2), list2.get(1));
assertSame(list2.get(1), list2.get(3));
@@ -81,8 +83,8 @@
@Test
public void testIndent() throws Exception {
- assertEquals("", indent("", 0));
- assertEquals("", indent("", 1));
+ assertThat(indent("", 0)).isEmpty();
+ assertThat(indent("", 1)).isEmpty();
assertEquals("a", indent("a", 1));
assertEquals("\n a", indent("\na", 2));
assertEquals("a\n b", indent("a\nb", 2));
@@ -92,16 +94,16 @@
@Test
public void testStripSuffix() throws Exception {
- assertEquals("", stripSuffix("", ""));
- assertEquals(null, stripSuffix("", "a"));
+ assertThat(stripSuffix("", "")).isEmpty();
+ assertNull(stripSuffix("", "a"));
assertEquals("a", stripSuffix("a", ""));
assertEquals("a", stripSuffix("aa", "a"));
- assertEquals(null, stripSuffix("ab", "c"));
+ assertNull(stripSuffix("ab", "c"));
}
@Test
public void testCapitalize() throws Exception {
- assertEquals("", capitalize(""));
+ assertThat(capitalize("")).isEmpty();
assertEquals("Joe", capitalize("joe"));
assertEquals("Joe", capitalize("Joe"));
assertEquals("O", capitalize("o"));
diff --git a/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java b/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
index c8ed641..548d10f 100644
--- a/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/StringUtilitiesTest.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.util.StringUtilities.combineKeys;
import static com.google.devtools.build.lib.util.StringUtilities.joinLines;
import static com.google.devtools.build.lib.util.StringUtilities.layoutTable;
@@ -42,7 +43,7 @@
@Test
public void emptyLinesYieldsEmptyString() {
- assertEquals("", joinLines());
+ assertThat(joinLines()).isEmpty();
}
@Test
@@ -88,11 +89,11 @@
String combined_key = combineKeys(keys_copy);
String[] prev_keys = map.put(combined_key, keys_copy);
if (prev_keys != null) {
- fail("combineKeys collision:\n" +
- "key sequence 1: " + Arrays.deepToString(prev_keys) + "\n" +
- "key sequence 2: " + Arrays.deepToString(keys_copy) + "\n" +
- "combined key sequence 1: " + combineKeys(prev_keys) + "\n" +
- "combined key sequence 2: " + combineKeys(keys_copy) + "\n");
+ fail("combineKeys collision:\n"
+ + "key sequence 1: " + Arrays.toString(prev_keys) + "\n"
+ + "key sequence 2: " + Arrays.toString(keys_copy) + "\n"
+ + "combined key sequence 1: " + combineKeys(prev_keys) + "\n"
+ + "combined key sequence 2: " + combineKeys(keys_copy) + "\n");
}
} else {
for (String key : test_keys) {
@@ -119,8 +120,7 @@
public void replaceAllLiteral() throws Exception {
assertEquals("ababab",
StringUtilities.replaceAllLiteral("bababa", "ba", "ab"));
- assertEquals("",
- StringUtilities.replaceAllLiteral("bababa", "ba", ""));
+ assertThat(StringUtilities.replaceAllLiteral("bababa", "ba", "")).isEmpty();
assertEquals("bababa",
StringUtilities.replaceAllLiteral("bababa", "", "ab"));
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/TargetUtilsTest.java b/src/test/java/com/google/devtools/build/lib/util/TargetUtilsTest.java
index 33b0fe3..338f3a7 100644
--- a/src/test/java/com/google/devtools/build/lib/util/TargetUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/TargetUtilsTest.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util;
+import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import com.google.devtools.build.lib.packages.TargetUtils;
@@ -31,6 +32,6 @@
public void getRuleLanguage() {
assertEquals("java", TargetUtils.getRuleLanguage("java_binary"));
assertEquals("foobar", TargetUtils.getRuleLanguage("foobar"));
- assertEquals("", TargetUtils.getRuleLanguage(""));
+ assertThat(TargetUtils.getRuleLanguage("")).isEmpty();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java b/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java
index d75208f..b9d8dd3 100644
--- a/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/io/AnsiTerminalPrinterTest.java
@@ -13,10 +13,10 @@
// limitations under the License.
package com.google.devtools.build.lib.util.io;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.util.io.AnsiTerminalPrinter.Mode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import com.google.devtools.build.lib.testutil.MoreAsserts;
@@ -79,9 +79,9 @@
printer.print(Mode.INFO + "XXX" + Mode.ERROR + "XXX" + Mode.WARNING +"XXX" + Mode.DEFAULT
+ "XXX" + Mode.INFO + "XXX" + Mode.ERROR + "XXX" + Mode.WARNING +"XXX" + Mode.DEFAULT);
String[] codes = stream.toString().split("XXX");
- assertEquals(8, codes.length);
+ assertThat(codes).hasLength(8);
for (int i = 0; i < 4; i++) {
- assertTrue(codes[i].length() > 0);
+ assertThat(codes[i]).isNotEmpty();
assertEquals(codes[i], codes[i+4]);
}
assertFalse(codes[0].equals(codes[1]));
diff --git a/src/test/java/com/google/devtools/build/lib/util/io/LinePrefixingOutputStreamTest.java b/src/test/java/com/google/devtools/build/lib/util/io/LinePrefixingOutputStreamTest.java
index b060beb..921b669 100644
--- a/src/test/java/com/google/devtools/build/lib/util/io/LinePrefixingOutputStreamTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/io/LinePrefixingOutputStreamTest.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.google.devtools.build.lib.util.io;
+import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
@@ -44,7 +45,7 @@
@Test
public void testNoOutputUntilNewline() throws IOException {
prefixOut.write(bytes("We won't be seeing any output."));
- assertEquals("", string(out.toByteArray()));
+ assertThat(string(out.toByteArray())).isEmpty();
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/util/io/StreamDemultiplexerTest.java b/src/test/java/com/google/devtools/build/lib/util/io/StreamDemultiplexerTest.java
index 59277df5..d19c15f 100644
--- a/src/test/java/com/google/devtools/build/lib/util/io/StreamDemultiplexerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/io/StreamDemultiplexerTest.java
@@ -64,12 +64,8 @@
@Test
public void testHelloWorldOnStandardOut() throws Exception {
byte[] multiplexed = lines("@1@", "Hello, world.");
- StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out);
- try {
+ try (final StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out)) {
demux.write(multiplexed);
- demux.flush();
- } finally {
- demux.close();
}
assertEquals("Hello, world.", out.toString("ISO-8859-1"));
}
@@ -77,12 +73,8 @@
@Test
public void testOutErrCtl() throws Exception {
byte[] multiplexed = lines("@1@", "out", "@2@", "err", "@3@", "ctl", "");
- StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out, err, ctl);
- try {
+ try (final StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out, err, ctl)) {
demux.write(multiplexed);
- demux.flush();
- } finally {
- demux.close();
}
assertEquals("out", toAnsi(out));
assertEquals("err", toAnsi(err));
@@ -92,12 +84,8 @@
@Test
public void testWithoutLineBreaks() throws Exception {
byte[] multiplexed = lines("@1@", "just ", "@1@", "one ", "@1@", "line", "");
- StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out);
- try {
+ try (final StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out)) {
demux.write(multiplexed);
- demux.flush();
- } finally {
- demux.close();
}
assertEquals("just one line", out.toString("ISO-8859-1"));
}
@@ -105,13 +93,10 @@
@Test
public void testLineBreaks() throws Exception {
byte[] multiplexed = lines("@1", "two", "@1", "lines", "");
- StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out);
- try {
+ try (StreamDemultiplexer demux = new StreamDemultiplexer((byte) '1', out)) {
demux.write(multiplexed);
demux.flush();
assertEquals("two\nlines\n", out.toString("ISO-8859-1"));
- } finally {
- demux.close();
}
}
