@DataPoints-related fixes

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

@@ -72,12 +72,17 @@ public List<PotentialAssignment> getValueSources(ParameterSignature sig) {
 
 	private void addMultiPointMethods(List<PotentialAssignment> list) {
 		for (FrameworkMethod dataPointsMethod : fClass
-				.getAnnotatedMethods(DataPoints.class))
+				.getAnnotatedMethods(DataPoints.class)) {
+			if (!dataPointsMethod.isStatic()) {
+				throw new RuntimeException("The @" + DataPoints.class.getSimpleName() + 
+						" annotation is illegal for the method " + dataPointsMethod.getName() + " because it is not static.");
+			}
 			try {
 				addArrayValues(dataPointsMethod.getName(), list, dataPointsMethod.invokeExplosively(null));
 			} catch (Throwable e) {
-				// ignore and move on
+				throw new RuntimeException("Method " + dataPointsMethod.getName() + " threw " + e, e);
 			}
+		}
 	}
 
 	@SuppressWarnings("deprecation")

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

@@ -0,0 +1,35 @@
+package org.junit.tests.experimental.theories;
+
+import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
+
+/**
+ * Test for Issue #125
+ */
+@RunWith(Theories.class)
+public class Issue125 {
+
+	int theInteger;
+
+	@DataPoints
+	public static Integer[] dataPoints1() {
+		return new Integer[] {1,2};
+	}
+
+	// this is not static, so we should get a warning
+	@DataPoints
+	public Integer[] dataPoints2() {
+		return new Integer[] {3,4};
+	}
+
+	public Issue125(int i) {
+		theInteger = i;
+	}
+
+	@Test
+	public void test() {
+		System.out.println("Running test method for " + theInteger);
+	}
+}

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

@@ -0,0 +1,36 @@
+package org.junit.tests.experimental.theories;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Categories.ExcludeCategory;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.runner.RunWith;
+
+/**
+ * Test for Issue #137
+ */
+@RunWith(Theories.class)
+public class Issue137 {
+
+	int theInteger;
+
+	@DataPoints
+	public static Integer[] dataPoints1() {
+		return new Integer[] {1,2};
+	}
+
+	// this throws an error, so we should see that error when running tests
+	@DataPoints
+	public static Integer[] dataPoints2() {
+		throw new RuntimeException("throwing exception from dataPoints2!");
+	}
+
+	public Issue137(int i) {
+		theInteger = i;
+	}
+
+	@Test
+	public void test() {
+		System.out.println("Running test method for " + theInteger);
+	}
+}