Fix tests with junit 4.13

src/main/java/junitparams/internal/InvokeParameterisedMethod.java

@@ -14,6 +14,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
 
 /**
  * JUnit invoker for parameterised test methods
@@ -209,8 +211,15 @@ private Object castParameterDirectly(Object object, Class clazz) {
             return object.toString().charAt(0);
         if (clazz.isAssignableFrom(Byte.TYPE) || clazz.isAssignableFrom(Byte.class))
             return Byte.parseByte((String) object);
-        if (clazz.isAssignableFrom(BigDecimal.class))
-            return new BigDecimal((String) object);
+        if (clazz.isAssignableFrom(BigDecimal.class)) {
+            DecimalFormat decimalFormat = new DecimalFormat();
+            decimalFormat.setParseBigDecimal(true);
+            try {
+                return decimalFormat.parse((String) object);
+            } catch (ParseException e) {
+                throw new IllegalArgumentException("Illegal BigDecimal value (" + object + ")", e);
+            }
+	}
         PropertyEditor editor = PropertyEditorManager.findEditor(clazz);
         if (editor != null) {
             editor.setAsText((String) object);

src/test/java/junitparams/BeforeAfterClassTest.java

@@ -41,7 +41,7 @@ public void shouldProvideHelpfulExceptionMessageWhenLifecycleAnnotationUsedImpro
 
         assertThat(result.getFailureCount()).isEqualTo(1);
         assertThat(result.getFailures().get(0).getException())
-                .hasMessage("Method fail() should be static");
+                .hasMessageContaining("Method fail() should be static");
     }
 
 

src/test/java/junitparams/FilterableTest.java

@@ -5,6 +5,7 @@
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
+import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
 
 import static org.assertj.core.api.Assertions.*;
@@ -22,7 +23,7 @@ public void shouldRunAllTests() throws Exception {
 
     @Test
     public void shouldRunSingleTestWithoutParameters() throws Exception {
-        Request request = requestSingleMethodRun(SampleTestCase.class, "firstTestMethod");
+        Request request = Request.method(SampleTestCase.class, "firstTestMethod");
 
         Result result = new JUnitCore().run(request);
 
@@ -31,7 +32,7 @@ public void shouldRunSingleTestWithoutParameters() throws Exception {
 
     @Test
     public void shouldRunParametrisedTest() throws Exception {
-        Request request = requestSingleMethodRun(SampleTestCase.class, "secondTestMethod");
+        Request request = Request.method(SampleTestCase.class, "secondTestMethod");
 
         Result result = new JUnitCore().run(request);
 
@@ -40,43 +41,27 @@ public void shouldRunParametrisedTest() throws Exception {
 
     @Test
     public void shouldReturnOneDescriptionForSimpleTestCase() throws Exception {
-        Request request = requestSingleMethodRun(SampleTestCase.class, "firstTestMethod");
+        Request request = Request.method(SampleTestCase.class, "firstTestMethod");
 
-        Description description = request.getRunner().getDescription();
+        Runner runner = request.getRunner();
+        Description description = runner.getDescription();
 
-        assertThat(description.getChildren()).hasSize(1);
-        assertThat(description.getChildren().get(0).getChildren()).hasSize(0);
+        assertThat(runner.testCount() == 1);
+        for (Description desc: description.getChildren())
+            if (desc.getDisplayName() == "firstTestMethod")
+                assertThat(desc.getChildren()).hasSize(0);
     }
 
     @Test
     public void shouldReturnParametrizedDescriptionsForParametrizedTestCase() throws Exception {
-        Request request = requestSingleMethodRun(SampleTestCase.class, "secondTestMethod");
+        Request request = Request.method(SampleTestCase.class, "secondTestMethod");
 
-        Description description = request.getRunner().getDescription();
+        Runner runner = request.getRunner();
+        Description description = runner.getDescription();
 
-        assertThat(description.getChildren()).hasSize(1);
-        assertThat(description.getChildren().get(0).getChildren()).hasSize(2);
-    }
-
-    private Request requestSingleMethodRun(Class<SampleTestCase> clazz, String methodName) {
-        return Request.aClass(clazz).filterWith(new SingleMethodFilter(methodName));
-    }
-
-    private static class SingleMethodFilter extends Filter {
-        private final String methodName;
-
-        public SingleMethodFilter(String methodName) {
-            this.methodName = methodName;
-        }
-
-        @Override
-        public boolean shouldRun(Description description) {
-            return description.getDisplayName().contains(methodName);
-        }
-
-        @Override
-        public String describe() {
-            return methodName;
-        }
+        assertThat(runner.testCount() == 1);
+        for (Description desc: description.getChildren())
+            if (desc.getDisplayName() == "secondTestMethod")
+                assertThat(desc.getChildren()).hasSize(2);
     }
 }

src/test/java/junitparams/RulesTest.java

@@ -45,7 +45,7 @@ public void shouldProvideHelpfulExceptionMessageWhenRuleIsUsedImproperly() {
 
         assertThat(result.getFailureCount()).isEqualTo(1);
         assertThat(result.getFailures().get(0).getException())
-                .hasMessage("The @Rule 'testRule' must be public.");
+                .hasMessageContaining("The @Rule 'testRule' must be public.");
     }
 
     public class ProtectedRuleTest {