Changed AllMembersSupplier to call single-valued methods at parameter assignment time, not parameter use time.

Author: pimterry

src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java

@@ -19,34 +19,6 @@
  * Supplies Theory parameters based on all public members of the target class.
  */
 public class AllMembersSupplier extends ParameterSupplier {
-    static class MethodParameterValue extends PotentialAssignment {
-        private final FrameworkMethod fMethod;
-
-        private MethodParameterValue(FrameworkMethod dataPointMethod) {
-            fMethod = dataPointMethod;
-        }
-
-        @Override
-        public Object getValue() throws CouldNotGenerateValueException {
-            try {
-                return fMethod.invokeExplosively(null);
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(
-                        "unexpected: argument length is checked");
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(
-                        "unexpected: getMethods returned an inaccessible method");
-            } catch (Throwable e) {
-                throw new CouldNotGenerateValueException();
-                // do nothing, just look for more values
-            }
-        }
-
-        @Override
-        public String getDescription() throws CouldNotGenerateValueException {
-            return fMethod.getName();
-        }
-    }   
 
     private final TestClass fClass;
 
@@ -83,7 +55,11 @@ private void addSinglePointMethods(ParameterSignature sig,
             List<PotentialAssignment> list) {
         for (FrameworkMethod dataPointMethod : getSingleDataPointMethods(sig)) {
             if (sig.canAcceptType(dataPointMethod.getType())) {
-                list.add(new MethodParameterValue(dataPointMethod));
+                try {
+                    list.add(PotentialAssignment.forValue(dataPointMethod.getName(), dataPointMethod.invokeExplosively(null)));
+                } catch (Throwable e) {
+                    // ignore and move on
+                }
             }
         }
     }

src/test/java/org/junit/tests/experimental/theories/AssumingInTheoriesTest.java

@@ -1,47 +1,42 @@
 package org.junit.tests.experimental.theories;
 
+import static org.junit.tests.experimental.theories.TheoryTestUtils.runTheoryClass;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Request;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
-import org.junit.runner.Runner;
 import org.junit.runners.model.InitializationError;
 
 @RunWith(Theories.class)
 public class AssumingInTheoriesTest {
 
-	@Test
-	public void noTheoryAnnotationMeansAssumeShouldIgnore() {
-		Assume.assumeTrue(false);
-	}
-
-	@Test
-	public void theoryMeansOnlyAssumeShouldFail() throws InitializationError {
-		JUnitCore junitRunner = new JUnitCore();
-		Runner theoryRunner = new Theories(TheoryWithNoUnassumedParameters.class);
-		Request request = Request.runner(theoryRunner);
-		Result result = junitRunner.run(request);
-		Assert.assertEquals(1, result.getFailureCount());
-	}
-
-	/**
-	 * Simple class that SHOULD fail because no parameters are met.
-	 */
-	public static class TheoryWithNoUnassumedParameters {
-		
-		@DataPoint 
-		public final static boolean FALSE = false;
-		
-		@Theory
-		public void theoryWithNoUnassumedParameters(boolean value) {
-			Assume.assumeTrue(value);
-		}
-	}
+    @Test
+    public void noTheoryAnnotationMeansAssumeShouldIgnore() {
+        Assume.assumeTrue(false);
+    }
+
+    @Test
+    public void theoryMeansOnlyAssumeShouldFail() throws InitializationError {
+        Result result = runTheoryClass(TheoryWithNoUnassumedParameters.class);
+        Assert.assertEquals(1, result.getFailureCount());
+    }
+
+    /**
+     * Simple class that SHOULD fail because no parameters are met.
+     */
+    public static class TheoryWithNoUnassumedParameters {
+
+        @DataPoint
+        public final static boolean FALSE = false;
+
+        @Theory
+        public void theoryWithNoUnassumedParameters(boolean value) {
+            Assume.assumeTrue(value);
+        }
+    }
 
 }

src/test/java/org/junit/tests/experimental/theories/TheoryTestUtils.java

@@ -4,7 +4,13 @@
 import java.util.List;
 
 import org.junit.experimental.theories.PotentialAssignment;
+import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.internal.Assignments;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.Result;
+import org.junit.runner.Runner;
+import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.TestClass;
 
 public final class TheoryTestUtils {
@@ -17,5 +23,11 @@ public static List<PotentialAssignment> potentialAssignments(Method method)
                 new TestClass(method.getDeclaringClass()))
                 .potentialsForNextUnassigned();
     }
+    
+    public static Result runTheoryClass(Class<?> testClass) throws InitializationError {
+        Runner theoryRunner = new Theories(testClass);
+        Request request = Request.runner(theoryRunner);
+        return new JUnitCore().run(request);
+    }
 
 }

src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java

@@ -5,23 +5,26 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.experimental.results.PrintableResult.testResult;
 import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 import static org.junit.tests.experimental.theories.TheoryTestUtils.potentialAssignments;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
+import org.junit.experimental.theories.DataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.Failure;
+import org.junit.runners.model.InitializationError;
+import org.junit.tests.experimental.theories.TheoryTestUtils;
 
 public class WithDataPointMethod {
     @RunWith(Theories.class)
@@ -65,31 +68,6 @@ public void ignoreExceptionsFromDataPointMethods() {
         assertThat(testResult(HasUglyDataPointMethod.class), isSuccessful());
     }
 
-    @RunWith(Theories.class)
-    public static class DataPointMethodReturnsMutableObject {
-        @DataPoint
-        public static List<Object> empty() {
-            return new ArrayList<Object>();
-        }
-
-        @DataPoint
-        public static int ONE = 1;
-
-        @DataPoint
-        public static int TWO = 2;
-
-        @Theory
-        public void everythingsEmpty(List<Object> first, int number) {
-            assertThat(first.size(), is(0));
-            first.add("a");
-        }
-    }
-
-    @Test
-    public void mutableObjectsAreCreatedAfresh() {
-        assertThat(failures(DataPointMethodReturnsMutableObject.class), empty());
-    }
-
     @RunWith(Theories.class)
     public static class HasDateMethod {
         @DataPoint