commit 1a8486507e3feb42078ca2581404700a65110f0a
author Brian Carlstrom <bdc@google.com> Thu Jun 19 02:08:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 19 02:08:05 2014 +0000
tree 6fd9c376ed00f2611745dec45fcf8448e336f9dd
parent 101f6aa764e3520f85d807ddd9b5348711d84444
parent 8f312e0c3d6dff30d015d2c85fdaae0a39220fd6

am 8f312e0c: Merge "Switch from core to core-libart"

* commit '8f312e0c3d6dff30d015d2c85fdaae0a39220fd6':
  Switch from core to core-libart

src/org/junit/internal/runners/JUnit38ClassRunner.java

diff --git a/src/org/junit/internal/runners/JUnit38ClassRunner.java b/src/org/junit/internal/runners/JUnit38ClassRunner.java
index acb18f8..11c7a53 100644
--- a/src/org/junit/internal/runners/JUnit38ClassRunner.java
+++ b/src/org/junit/internal/runners/JUnit38ClassRunner.java
@@ -133,7 +133,7 @@
 	 */
 	private static Annotation[] getAnnotations(TestCase test) {
 		try {
-			Method m = test.getClass().getDeclaredMethod(test.getName());
+			Method m = test.getClass().getMethod(test.getName());
 			return m.getDeclaredAnnotations();
 		} catch (SecurityException e) {
 			e.printStackTrace();
@@ -164,6 +164,11 @@
 					filtered.addTest(test);
 			}
 			setTest(filtered);
+			// android-changed: handle empty suite
+			if (filtered.testCount() == 0) {
+				throw new NoTestsRemainException();
+			}
+			// android-changed end
 		}
 	}