Global cleanup change.
--
MOS_MIGRATED_REVID=129226221
diff --git a/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java b/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
index 64e61a9..868d691 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ErrorTransienceValueTest.java
@@ -56,6 +56,7 @@
}
@Test
+ @SuppressWarnings("SelfEquals")
public void testIsntEqualToSelf() {
// assertThat(...).isNotEqualTo(...) does ref equality check, so use equals explicitly.
assertThat(ErrorTransienceValue.INSTANCE.equals(ErrorTransienceValue.INSTANCE)).isFalse();
diff --git a/src/test/java/com/google/devtools/common/options/OptionsTest.java b/src/test/java/com/google/devtools/common/options/OptionsTest.java
index 5fb681c..fccc011 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsTest.java
@@ -22,13 +22,13 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import com.google.common.testing.EqualsTester;
+import java.net.MalformedURLException;
+import java.net.URL;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.net.MalformedURLException;
-import java.net.URL;
-
/**
* Test for {@link Options}.
*/
@@ -117,7 +117,7 @@
assertTrue(toString.contains("port=80"));
assertTrue(toString.endsWith("}"));
- assertTrue(left.equals(left));
+ new EqualsTester().addEqualityGroup(left).testEquals();
assertTrue(left.toString().equals(likeLeft.toString()));
assertTrue(left.equals(likeLeft));
assertTrue(likeLeft.equals(left));