aboutsummaryrefslogtreecommitdiff
path: root/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java')
-rw-r--r--guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java68
1 files changed, 36 insertions, 32 deletions
diff --git a/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java b/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java
index c5db2d575..ac4e05fba 100644
--- a/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java
+++ b/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java
@@ -45,6 +45,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*
* @author Ben Yu
*/
+@AndroidIncompatible // NullPointerTester refuses to run for c.g.c under Android
public class ClassSanityTesterTest extends TestCase {
private final ClassSanityTester tester = new ClassSanityTester();
@@ -212,11 +213,11 @@ public class ClassSanityTesterTest extends TestCase {
@AndroidIncompatible // TODO(cpovirk): ClassNotFoundException... ClassSanityTesterTest$AnInterface
public void testEqualsAndSerializableOnReturnValues_good() throws Exception {
tester
- .forAllPublicStaticMethods(GoodEqualsAndSerialiableFactory.class)
+ .forAllPublicStaticMethods(GoodEqualsAndSerializableFactory.class)
.testEqualsAndSerializable();
}
- public static class GoodEqualsAndSerialiableFactory {
+ public static class GoodEqualsAndSerializableFactory {
public static Object good(AnInterface s) {
return Functions.constant(s);
}
@@ -314,7 +315,7 @@ public class ClassSanityTesterTest extends TestCase {
try {
tester.testEquals(BadEquals.class);
} catch (AssertionFailedError expected) {
- assertThat(expected.getMessage()).contains("create(null)");
+ assertThat(expected).hasMessageThat().contains("create(null)");
return;
}
fail("should have failed");
@@ -324,7 +325,7 @@ public class ClassSanityTesterTest extends TestCase {
try {
tester.testEquals(BadEqualsWithParameterizedType.class);
} catch (AssertionFailedError expected) {
- assertThat(expected.getMessage()).contains("create([[1]])");
+ assertThat(expected).hasMessageThat().contains("create([[1]])");
return;
}
fail("should have failed");
@@ -367,7 +368,7 @@ public class ClassSanityTesterTest extends TestCase {
try {
tester.testEquals(cls);
} catch (AssertionFailedError expected) {
- assertThat(expected.getMessage()).contains(cls.getSimpleName() + "(");
+ assertThat(expected).hasMessageThat().contains(cls.getSimpleName() + "(");
return;
}
fail("should have failed for " + cls);
@@ -432,8 +433,8 @@ public class ClassSanityTesterTest extends TestCase {
tester.testNulls(GoodNulls.class);
}
- public void testNoNullCheckNeededDespitNotInstantiable() throws Exception {
- tester.doTestNulls(NoNullCheckNeededDespitNotInstantiable.class, Visibility.PACKAGE);
+ public void testNoNullCheckNeededDespiteNotInstantiable() throws Exception {
+ tester.doTestNulls(NoNullCheckNeededDespiteNotInstantiable.class, Visibility.PACKAGE);
}
public void testNulls_interface() {
@@ -482,9 +483,10 @@ public class ClassSanityTesterTest extends TestCase {
public void testInstantiate_factoryMethodReturnsNullButNotAnnotated() throws Exception {
try {
- tester.instantiate(FactoryMethodReturnsNullButNotAnnotated.class);
+ FactoryMethodReturnsNullButNotAnnotated unused =
+ tester.instantiate(FactoryMethodReturnsNullButNotAnnotated.class);
} catch (AssertionFailedError expected) {
- assertThat(expected.getMessage()).contains("@Nullable");
+ assertThat(expected).hasMessageThat().contains("@Nullable");
return;
}
fail("should have failed");
@@ -810,8 +812,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameIntegerInstance) {
SameIntegerInstance that = (SameIntegerInstance) obj;
return i == that.i;
@@ -833,8 +835,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameLongInstance) {
SameLongInstance that = (SameLongInstance) obj;
return i == that.i;
@@ -856,8 +858,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameFloatInstance) {
SameFloatInstance that = (SameFloatInstance) obj;
return i == that.i;
@@ -879,8 +881,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameDoubleInstance) {
SameDoubleInstance that = (SameDoubleInstance) obj;
return i == that.i;
@@ -902,8 +904,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameShortInstance) {
SameShortInstance that = (SameShortInstance) obj;
return i == that.i;
@@ -925,8 +927,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- @SuppressWarnings("NumericEquality")
- public boolean equals(Object obj) {
+ @SuppressWarnings({"BoxedPrimitiveEquality", "NumericEquality"})
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameByteInstance) {
SameByteInstance that = (SameByteInstance) obj;
return i == that.i;
@@ -948,7 +950,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ @SuppressWarnings("BoxedPrimitiveEquality")
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameCharacterInstance) {
SameCharacterInstance that = (SameCharacterInstance) obj;
return i == that.i;
@@ -970,7 +973,8 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ @SuppressWarnings("BoxedPrimitiveEquality")
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameBooleanInstance) {
SameBooleanInstance that = (SameBooleanInstance) obj;
return i == that.i;
@@ -992,7 +996,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameStringInstance) {
SameStringInstance that = (SameStringInstance) obj;
return s == that.s;
@@ -1014,7 +1018,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameObjectInstance) {
SameObjectInstance that = (SameObjectInstance) obj;
return s == that.s;
@@ -1036,7 +1040,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameInterfaceInstance) {
SameInterfaceInstance that = (SameInterfaceInstance) obj;
return s == that.s;
@@ -1058,7 +1062,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof SameListInstance) {
SameListInstance that = (SameListInstance) obj;
return s == that.s;
@@ -1090,7 +1094,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof UsesReferentialEquality) {
UsesReferentialEquality that = (UsesReferentialEquality) obj;
return s == that.s;
@@ -1112,7 +1116,7 @@ public class ClassSanityTesterTest extends TestCase {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof UsesEnum) {
UsesEnum that = (UsesEnum) obj;
return s == that.s;
@@ -1160,9 +1164,9 @@ public class ClassSanityTesterTest extends TestCase {
public void failsToRejectNull(@SuppressWarnings("unused") String s) {}
}
- public static class NoNullCheckNeededDespitNotInstantiable {
+ public static class NoNullCheckNeededDespiteNotInstantiable {
- public NoNullCheckNeededDespitNotInstantiable(NotInstantiable x) {
+ public NoNullCheckNeededDespiteNotInstantiable(NotInstantiable x) {
checkNotNull(x);
}
@@ -1285,7 +1289,7 @@ public class ClassSanityTesterTest extends TestCase {
public ConstructorParameterSingleValue(@SuppressWarnings("unused") Singleton s) {}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
return obj instanceof ConstructorParameterSingleValue;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 03:44:55 +0000