diff --git a/src/main/java/junitparams/JUnitParamsRunner.java b/src/main/java/junitparams/JUnitParamsRunner.java index 313eb24..c2ac273 100644 --- a/src/main/java/junitparams/JUnitParamsRunner.java +++ b/src/main/java/junitparams/JUnitParamsRunner.java @@ -455,7 +455,7 @@ protected void runChild(FrameworkMethod method, RunNotifier notifier) { super.runChild(method, notifier); } } - + private boolean initializedProperly(Statement statement, RunNotifier notifier) { boolean initializedProperly = true; if (statement instanceof Fail) { @@ -470,12 +470,6 @@ private boolean initializedProperly(Statement statement, RunNotifier notifier) { return initializedProperly; } - @Override - protected Description describeChild(FrameworkMethod method) { - Description description = parameterisedRunner.getDescriptionFor(method); - return description == null ? super.describeChild(method) : description; - } - private void verifyMethodCanBeRunByStandardRunner(TestMethod testMethod) { List errors = new ArrayList(); testMethod.frameworkMethod().validatePublicVoidNoArg(false, errors); diff --git a/src/main/java/junitparams/internal/ParameterisedTestClassRunner.java b/src/main/java/junitparams/internal/ParameterisedTestClassRunner.java index 2f5a203..7140306 100644 --- a/src/main/java/junitparams/internal/ParameterisedTestClassRunner.java +++ b/src/main/java/junitparams/internal/ParameterisedTestClassRunner.java @@ -158,7 +158,7 @@ public Description describeParameterisedMethod(FrameworkMethod method) { if (!testMethod.isParameterised()) return null; - return testMethod.description(); + return testMethod.describe(); } /** @@ -174,24 +174,4 @@ public TestMethod testMethodFor(FrameworkMethod method) { return testMethods.get(method); } - /** - * Returns description of parametrized method for given set of parameters (considering test name convention - * given with @{@link junitparams.naming.TestCaseName}). If method is not parametrized or runner has not been created yet - * returns null. - * - * @param method - * @return description of given method - */ - public Description getDescriptionFor(FrameworkMethod method) { - TestMethod testMethod = testMethodFor(method); - if (shouldRun(testMethod)) { - ParameterisedTestMethodRunner runner = parameterisedMethods.get(testMethod); - return wasInvoked(runner) ? runner.currentTestDescription() : null; - } - return null; - } - - private boolean wasInvoked(ParameterisedTestMethodRunner runner) { - return runner != null; - } } diff --git a/src/main/java/junitparams/internal/ParameterisedTestMethodRunner.java b/src/main/java/junitparams/internal/ParameterisedTestMethodRunner.java index c4e4594..1e79923 100644 --- a/src/main/java/junitparams/internal/ParameterisedTestMethodRunner.java +++ b/src/main/java/junitparams/internal/ParameterisedTestMethodRunner.java @@ -35,7 +35,7 @@ Object currentParamsFromAnnotation() { } void runTestMethod(Statement methodInvoker, RunNotifier notifier) { - Description methodWithParams = findChildForParams(methodInvoker, method.description()); + Description methodWithParams = findChildForParams(methodInvoker, method.describe()); runMethodInvoker(notifier, methodInvoker, methodWithParams); } @@ -105,8 +105,4 @@ private Statement getOriginalStatement(Statement methodInvoker, Field field) { return null; } } - - Description currentTestDescription() { - return method.description().getChildren().get(count - 1); - } } diff --git a/src/main/java/junitparams/internal/TestMethod.java b/src/main/java/junitparams/internal/TestMethod.java index a8d3477..fe52225 100644 --- a/src/main/java/junitparams/internal/TestMethod.java +++ b/src/main/java/junitparams/internal/TestMethod.java @@ -112,6 +112,11 @@ public T getAnnotation(Class annotationType) { return frameworkMethodAnnotations.getAnnotation(annotationType); } + Description describe() { + return description.get(); + } + + public Object[] parametersSets() { return parameters.get(); } @@ -128,8 +133,4 @@ public FrameworkMethod frameworkMethod() { boolean isParameterised() { return frameworkMethodAnnotations.isParametrised(); } - - Description description() { - return description.get(); - } } diff --git a/src/test/java/junitparams/RulesTest.java b/src/test/java/junitparams/RulesTest.java index 9f8a6aa..3dde4cf 100644 --- a/src/test/java/junitparams/RulesTest.java +++ b/src/test/java/junitparams/RulesTest.java @@ -1,6 +1,5 @@ package junitparams; -import junitparams.naming.TestCaseName; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ErrorCollector; @@ -32,9 +31,9 @@ public class RulesTest { @Rule public Timeout timeout = new Timeout(0); + @Test @Parameters("") - @TestCaseName("{method}") public void shouldHandleRulesProperly(String n) { assertThat(testName.getMethodName()).isEqualTo("shouldHandleRulesProperly"); } diff --git a/src/test/java/junitparams/internal/TestMethodTest.java b/src/test/java/junitparams/internal/TestMethodTest.java index c03c60f..c258300 100644 --- a/src/test/java/junitparams/internal/TestMethodTest.java +++ b/src/test/java/junitparams/internal/TestMethodTest.java @@ -46,7 +46,7 @@ public void forOthersToWorkWithArray(String... arg) throws Exception { public void flatTestMethodStructure() throws Exception { System.setProperty("JUnitParams.flat", "true"); - Description description = plainTestMethod.description(); + Description description = plainTestMethod.describe(); assertEquals("for_others_to_work(junitparams.internal.TestMethodTest)", description.getDisplayName()); assertTrue(description.getChildren().isEmpty()); @@ -57,7 +57,7 @@ public void flatTestMethodStructure() throws Exception { @Test public void hierarchicalTestMethodStructure() throws Exception { System.clearProperty("JUnitParams.flat"); - Description description = plainTestMethod.description(); + Description description = plainTestMethod.describe(); assertEquals("forOthersToWork", description.getDisplayName()); assertEquals("forOthersToWork(a) [0](junitparams.internal.TestMethodTest)", description.getChildren().get(0).getDisplayName()); @@ -67,7 +67,7 @@ public void hierarchicalTestMethodStructure() throws Exception { @Test public void hierarchicalArrayTestMethodStructure() throws Exception { System.clearProperty("JUnitParams.flat"); - Description description = arrayTestMethod.description(); + Description description = arrayTestMethod.describe(); assertEquals("forOthersToWorkWithArray", description.getDisplayName()); assertEquals("forOthersToWorkWithArray(a,b) [0](junitparams.internal.TestMethodTest)", diff --git a/src/test/java/junitparams/rules/TestWatcherDescriptionRuleTest.java b/src/test/java/junitparams/rules/TestWatcherDescriptionRuleTest.java deleted file mode 100644 index f9d646b..0000000 --- a/src/test/java/junitparams/rules/TestWatcherDescriptionRuleTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package junitparams.rules; - - -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; -import junitparams.naming.TestCaseName; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.junit.runner.RunWith; - -import static java.lang.String.format; -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(JUnitParamsRunner.class) -public class TestWatcherDescriptionRuleTest { - - @Rule - public final MethodNameTestWatcher rule = new MethodNameTestWatcher(); - - @Test - @Parameters({"AAA|1", "BBB|2"}) - @TestCaseName("p1_{0}_p2_{1}") - public void paramsInAnnotationPipeSeparated(String p1, Integer p2) { - rule.expectedTestName(format("p1_%s_p2_%s", p1, p2)); - } - - public static class MethodNameTestWatcher extends TestWatcher { - - private String expectedTestName; - - @Override - public void finished(Description description) { - assertThat(description.getMethodName()).isEqualTo(expectedTestName); - } - - void expectedTestName(String expectedTestName) { - this.expectedTestName = expectedTestName; - } - } -}