opendev
/
gerrit
Code Issues Proposed changes

Fix unchecked type warnings in predicate tests 

Change-Id: If9c681e429e8c130c8cdf3f449a889eb234f3d2d
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2011-05-19 08:48:37 -07:00
parent c68e41ed97
commit d89a18c10b
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java
View File

@ -43,6 +43,7 @@ public class AndPredicateTest extends TestCase {
return new TestPredicate(name, value);
}
@SuppressWarnings("unchecked")
public void testChildren() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -52,6 +53,7 @@ public class AndPredicateTest extends TestCase {
assertSame(b, n.getChild(1));
}
@SuppressWarnings("unchecked")
public void testChildrenUnmodifiable() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -81,6 +83,7 @@ public class AndPredicateTest extends TestCase {
assertEquals(o + " did not affect child", l, p.getChildren());
}
@SuppressWarnings("unchecked")
public void testToString() {
final TestPredicate a = f("q", "alice");
final TestPredicate b = f("q", "bob");
@ -89,6 +92,7 @@ public class AndPredicateTest extends TestCase {
assertEquals("(q:alice q:bob q:charlie)", and(a, b, c).toString());
}
@SuppressWarnings("unchecked")
public void testEquals() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -103,6 +107,7 @@ public class AndPredicateTest extends TestCase {
assertFalse(and(a, c).equals(a));
}
@SuppressWarnings("unchecked")
public void testHashCode() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -113,6 +118,7 @@ public class AndPredicateTest extends TestCase {
assertFalse(and(a, c).hashCode() == and(a, b).hashCode());
}
@SuppressWarnings("unchecked")
public void testCopy() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");

10
gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java
View File

@ -45,7 +45,7 @@ public class NotPredicateTest extends TestCase {
public void testNotNot() {
final TestPredicate p = f("author", "bob");
final Predicate n = not(p);
final Predicate<String> n = not(p);
assertTrue(n instanceof NotPredicate);
assertNotSame(p, n);
assertSame(p, not(n));
@ -53,14 +53,14 @@ public class NotPredicateTest extends TestCase {
public void testChildren() {
final TestPredicate p = f("author", "bob");
final Predicate n = not(p);
final Predicate<String> n = not(p);
assertEquals(1, n.getChildCount());
assertSame(p, n.getChild(0));
}
public void testChildrenUnmodifiable() {
final TestPredicate p = f("author", "bob");
final Predicate n = not(p);
final Predicate<String> n = not(p);
try {
n.getChildren().clear();
@ -81,7 +81,8 @@ public class NotPredicateTest extends TestCase {
assertOnlyChild("remove(0)", p, n);
}
private static void assertOnlyChild(String o, Predicate c, Predicate p) {
private static void assertOnlyChild(String o, Predicate<String> c,
Predicate<String> p) {
assertEquals(o + " did not affect child", 1, p.getChildCount());
assertSame(o + " did not affect child", c, p.getChild(0));
}
@ -102,6 +103,7 @@ public class NotPredicateTest extends TestCase {
assertFalse(not(f("a", "b")).hashCode() == not(f("a", "a")).hashCode());
}
@SuppressWarnings({"rawtypes", "unchecked"})
public void testCopy() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");

24
gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java
View File

@ -43,19 +43,21 @@ public class OrPredicateTest extends TestCase {
return new TestPredicate(name, value);
}
@SuppressWarnings("unchecked")
public void testChildren() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
final Predicate n = or(a, b);
final Predicate<String> n = or(a, b);
assertEquals(2, n.getChildCount());
assertSame(a, n.getChild(0));
assertSame(b, n.getChild(1));
}
@SuppressWarnings("unchecked")
public void testChildrenUnmodifiable() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
final Predicate n = or(a, b);
final Predicate<String> n = or(a, b);
try {
n.getChildren().clear();
@ -76,11 +78,12 @@ public class OrPredicateTest extends TestCase {
assertChildren("remove(0)", n, list(a, b));
}
private static void assertChildren(String o, Predicate p,
final List<Predicate> l) {
private static void assertChildren(String o, Predicate<String> p,
final List<Predicate<String>> l) {
assertEquals(o + " did not affect child", l, p.getChildren());
}
@SuppressWarnings("unchecked")
public void testToString() {
final TestPredicate a = f("q", "alice");
final TestPredicate b = f("q", "bob");
@ -89,6 +92,7 @@ public class OrPredicateTest extends TestCase {
assertEquals("(q:alice OR q:bob OR q:charlie)", or(a, b, c).toString());
}
@SuppressWarnings("unchecked")
public void testEquals() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -103,6 +107,7 @@ public class OrPredicateTest extends TestCase {
assertFalse(or(a, c).equals(a));
}
@SuppressWarnings("unchecked")
public void testHashCode() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
@ -113,26 +118,27 @@ public class OrPredicateTest extends TestCase {
assertFalse(or(a, c).hashCode() == or(a, b).hashCode());
}
@SuppressWarnings("unchecked")
public void testCopy() {
final TestPredicate a = f("author", "alice");
final TestPredicate b = f("author", "bob");
final TestPredicate c = f("author", "charlie");
final List<Predicate> s2 = list(a, b);
final List<Predicate> s3 = list(a, b, c);
final Predicate n2 = or(a, b);
final List<Predicate<String>> s2 = list(a, b);
final List<Predicate<String>> s3 = list(a, b, c);
final Predicate<String> n2 = or(a, b);
assertNotSame(n2, n2.copy(s2));
assertEquals(s2, n2.copy(s2).getChildren());
assertEquals(s3, n2.copy(s3).getChildren());
try {
n2.copy(Collections.<Predicate> emptyList());
n2.copy(Collections.<Predicate<String>> emptyList());
} catch (IllegalArgumentException e) {
assertEquals("Need at least two predicates", e.getMessage());
}
}
private static List<Predicate> list(final Predicate... predicates) {
private static <T> List<Predicate<T>> list(final Predicate<T>... predicates) {
return Arrays.asList(predicates);
}
}