Fixed a typo in exclude NonTckTest flag, that was causing the TCK results count to be wrong. Format the METHOD_FILTER and improved variable names in TckTestSuiteWrapper. [JSR 303 TCK Result] 151 of 257 (58.75%) Pass with 32 Failures and 7 Errors. Review at http://gwt-code-reviews.appspot.com/1571803 Review by: rjrjr@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10698 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java index f9aa7d7..e58710e 100644 --- a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java +++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -56,11 +56,12 @@ private static final Predicate<Method> EXCLUDE_NON_TCK_TEST = createHasProperty(NonTckTest.EXCLUDE); @SuppressWarnings("unchecked") - private static final Predicate<Method> METHOD_FILTER = and( - or(INCLUDE_NOT_SUPPORTED, not(HAS_NOT_SUPPORTED)), - or(INCLUDE_TEST_NOT_COMPATIBLE, not(HAS_TEST_NOT_COMPATIBLE)), - not(and(EXCLUDE_NON_TCK_TEST, HAS_NON_TCK_TEST)), - or(INCLUDE_FAILING, not(HAS_FAILING)) + private static final Predicate<Method> METHOD_FILTER = + and( + or(INCLUDE_NOT_SUPPORTED, not(HAS_NOT_SUPPORTED)), + or(INCLUDE_TEST_NOT_COMPATIBLE, not(HAS_TEST_NOT_COMPATIBLE)), + or(INCLUDE_FAILING, not(HAS_FAILING)), + not(and(EXCLUDE_NON_TCK_TEST, HAS_NON_TCK_TEST)) ); public static Predicate<Method> createHasAnnotationPredicate( @@ -75,9 +76,9 @@ private static <T> Predicate<T> createHasProperty(final String property) { return new Predicate<T>() { - public boolean apply(T arg0) { - String include = System.getProperty(property); - return Boolean.parseBoolean(include); + public boolean apply(T notUsed) { + String value = System.getProperty(property); + return Boolean.parseBoolean(value); } }; }
diff --git a/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java index ef1f899..5756a69 100644 --- a/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java +++ b/user/test/org/hibernate/jsr303/tck/util/client/NonTckTest.java
@@ -37,5 +37,5 @@ * property {@value} is set to true the {@link TckTestSuiteWrapper} will not * run the tests annotated {@link Failing}. */ - String EXCLUDE = "com.google.gwt.sample.validationtck.util.NotTckTest.exclude"; + String EXCLUDE = "com.google.gwt.sample.validationtck.util.NonTckTest.exclude"; }