From 1aa2e09bdbd413eacb677e9fa4b50630530d0656 Mon Sep 17 00:00:00 2001
From: Tor Norbye <tnorbye@google.com>
Date: Wed, 20 Aug 2014 17:01:23 -0700
Subject: Snapshot idea/138.1696 from
 git://git.jetbrains.org/idea/community.git

Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
---
 .../src/com/intellij/junit4/JUnit4IdeaTestRunner.java    | 16 ++++++++++++++--
 .../src/com/intellij/junit4/JUnit4TestRunnerUtil.java    | 10 ++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'plugins/junit_rt/src/com')

diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
index a1201c65a4d5..3fba1a3d9b7a 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
@@ -92,7 +92,13 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
   }
 
   private static Description getFilteredDescription(Request request, Description description) throws NoSuchFieldException, IllegalAccessException {
-    final Field field = FilterRequest.class.getDeclaredField("fFilter");
+    Field field;
+    try {
+      field = FilterRequest.class.getDeclaredField("fFilter");
+    }
+    catch (NoSuchFieldException e) {
+      field = FilterRequest.class.getDeclaredField("filter");
+    }
     field.setAccessible(true);
     final Filter filter = (Filter)field.get(request);
     final String filterDescription = filter.describe();
@@ -125,7 +131,13 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
   }
 
   private static Description getSuiteMethodDescription(Request request, Description description) throws NoSuchFieldException, IllegalAccessException {
-    final Field field = ClassRequest.class.getDeclaredField("fTestClass");
+    Field field;
+    try {
+      field = ClassRequest.class.getDeclaredField("fTestClass");
+    }
+    catch (NoSuchFieldException e) {
+      field = ClassRequest.class.getDeclaredField("testClass");
+    }
     field.setAccessible(true);
     final Description methodDescription = Description.createSuiteDescription((Class)field.get(request));
     for (Iterator iterator = description.getChildren().iterator(); iterator.hasNext();) {
diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
index d22ea44f2d8f..1bab2d69e1c5 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
@@ -352,12 +352,18 @@ public class JUnit4TestRunnerUtil {
         for (Iterator iterator = children.iterator(); iterator.hasNext(); ) {
           Object child = iterator.next();
           try {
+            Class aClass = child.getClass();
             Field f;
             try {
-              f = child.getClass().getDeclaredField("fName");
+              f = aClass.getDeclaredField("fName");
             }
             catch (NoSuchFieldException e) {
-              continue;
+              try {
+                f = aClass.getDeclaredField("name");
+              }
+              catch (NoSuchFieldException e1) {
+                continue;
+              }
             }
             f.setAccessible(true);
             String fName = (String)f.get(child);
-- 
cgit v1.2.3