diff options
Diffstat (limited to 'src/main/java/junitparams/internal')
-rw-r--r-- | src/main/java/junitparams/internal/InvokeParameterisedMethod.java | 8 | ||||
-rw-r--r-- | src/main/java/junitparams/internal/TestMethod.java | 9 |
2 files changed, 4 insertions, 13 deletions
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; |