diff options
author | Paul Duffin <paulduffin@google.com> | 2016-12-20 21:10:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-20 21:10:13 +0000 |
commit | 327d6aab06eed8deae1e0634c0a3e5d65f9a1d5b (patch) | |
tree | bf730f5600a54ec6c07b9f1ce10abb48589a79ef | |
parent | ad800d890fccd3d9899e9bc06a8af28b4d37aff4 (diff) | |
parent | 4f3ba934391886e969d1051e59d13c5dbfd1fd12 (diff) | |
download | platform_external_junit-params-327d6aab06eed8deae1e0634c0a3e5d65f9a1d5b.tar.gz platform_external_junit-params-327d6aab06eed8deae1e0634c0a3e5d65f9a1d5b.tar.bz2 platform_external_junit-params-327d6aab06eed8deae1e0634c0a3e5d65f9a1d5b.zip |
Partially revert "Patch to make it compile against JUnit 4.10 and run on Android" am: ea07fbcef7 am: cad05b7095
am: 4f3ba93439
Change-Id: I700e33a147deee5aae6b933ec84dd5bcd4deeffa
4 files changed, 6 insertions, 20 deletions
diff --git a/src/main/java/junitparams/JUnitParamsRunner.java b/src/main/java/junitparams/JUnitParamsRunner.java index b77539c..fa37257 100644 --- a/src/main/java/junitparams/JUnitParamsRunner.java +++ b/src/main/java/junitparams/JUnitParamsRunner.java @@ -16,8 +16,6 @@ import junitparams.internal.ParameterisedTestClassRunner; import junitparams.internal.ParametrizedTestMethodsFilter; import junitparams.internal.TestMethod; -import static org.junit.internal.runners.rules.RuleFieldValidator.RULE_VALIDATOR; - /** * <h1>JUnitParams</h1><br> * <p> @@ -404,8 +402,7 @@ public class JUnitParamsRunner extends BlockJUnit4ClassRunner { @Override protected void collectInitializationErrors(List<Throwable> errors) { - // TODO(JUnit4.10) - super.validateFields() is private in JUnit 4.10 - so inline method - RULE_VALIDATOR.validate(getTestClass(), errors); + super.validateFields(errors); for (Throwable throwable : errors) throwable.printStackTrace(); } diff --git a/src/main/java/junitparams/internal/InvokeParameterisedMethod.java b/src/main/java/junitparams/internal/InvokeParameterisedMethod.java index ea4c98d..7d313c2 100644 --- a/src/main/java/junitparams/internal/InvokeParameterisedMethod.java +++ b/src/main/java/junitparams/internal/InvokeParameterisedMethod.java @@ -219,13 +219,7 @@ public class InvokeParameterisedMethod extends Statement { } boolean matchesDescription(Description description) { - // TODO(JUnit4.10) - because JUnit 4.10 has no separation of display name and unique method - // id, we need to do some mangling of the name to get a match - String displayName = description.getDisplayName(); - - int endIndex = displayName.lastIndexOf("(", displayName.length() - 1); - String uniqueName = (endIndex == - 1) ? displayName : displayName.substring(0, endIndex); - return uniqueName.equals(uniqueMethodId); + return description.hashCode() == uniqueMethodId.hashCode(); } @Override diff --git a/src/main/java/junitparams/internal/TestMethod.java b/src/main/java/junitparams/internal/TestMethod.java index 7eac3ae..6125803 100644 --- a/src/main/java/junitparams/internal/TestMethod.java +++ b/src/main/java/junitparams/internal/TestMethod.java @@ -103,13 +103,10 @@ public class TestMethod { for (int i = 0; i < params.length; i++) { Object paramSet = params[i]; String name = namingStrategy.getTestCaseName(i, paramSet); - // TODO(JUnit4.10) - Description.createTestDescription(Class, String, Serializable) - // is not available in JUnit 4.10. That means that it is not possible to - // differentiate between tests using a unique method id. Just use the name for now. - // There is a corresponding change in - // InvokeParameterisedMethod.matchesDescription(Description description). + String uniqueMethodId = Utils.uniqueMethodId(i, paramSet, name()); + parametrised.addChild( - Description.createTestDescription(testClass(), name) + Description.createTestDescription(testClass().getName(), name, uniqueMethodId) ); } return parametrised; diff --git a/src/test/java/junitparams/internal/TestMethodTest.java b/src/test/java/junitparams/internal/TestMethodTest.java index cceccbc..2964781 100644 --- a/src/test/java/junitparams/internal/TestMethodTest.java +++ b/src/test/java/junitparams/internal/TestMethodTest.java @@ -93,9 +93,7 @@ public class TestMethodTest { public void testVarargsCustomClass(Pair... pairs){ assertEquals(pairs[0].x, pairs[0].y); assertEquals(pairs[1].x, pairs[1].y); - // TODO(JUnit4.10) - assertNotEquals not in JUnit 4.10 - // assertNotEquals(pairs[2].x, pairs[2].y); - assertTrue(pairs[2].x != pairs[2].y); + assertNotEquals(pairs[2].x, pairs[2].y); } protected Object[] parametersForTestVarargsCustomClass(){ |