From 6b53f1c71e8b3ac235cff5b700702d9f34cb4f70 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 29 Sep 2016 09:34:14 +0200
Subject: [PATCH] run test on unnamed element in editor: choose element at
 caret in addition to data context retrieval (IDEA-159387)

---
 ...ractPatternBasedConfigurationProducer.java | 16 +++++++---
 .../junit/JUnitRerunFailedTestsTest.java      | 32 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractPatternBasedConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractPatternBasedConfigurationProducer.java
index 189f80bb6ed1..514a82daa105 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractPatternBasedConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractPatternBasedConfigurationProducer.java
@@ -165,11 +165,12 @@ public abstract class AbstractPatternBasedConfigurationProducer<T extends Module
     }
     else {
       final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
+      PsiElement element = null;
       if (editor != null) {
+        final PsiFile editorFile = CommonDataKeys.PSI_FILE.getData(dataContext);
         final List<Caret> allCarets = editor.getCaretModel().getAllCarets();
-        if (allCarets.size() > 1) {
-          final PsiFile editorFile = CommonDataKeys.PSI_FILE.getData(dataContext);
-          if (editorFile != null) {
+        if (editorFile != null) {
+          if (allCarets.size() > 1) {
             final Set<PsiMethod> methods = new LinkedHashSet<>();
             for (Caret caret : allCarets) {
               ContainerUtil.addIfNotNull(methods, PsiTreeUtil.getParentOfType(editorFile.findElementAt(caret.getOffset()), PsiMethod.class));
@@ -178,9 +179,16 @@ public abstract class AbstractPatternBasedConfigurationProducer<T extends Module
               return collectTestMembers(methods.toArray(PsiElement.EMPTY_ARRAY), checkAbstract, checkIsTest, processor, classes);
             }
           }
+          else {
+            element = editorFile.findElementAt(editor.getCaretModel().getOffset());
+          }
         }
       }
-      final PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
+
+      if (element == null) {
+        element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
+      }
+
       final VirtualFile[] files = CommonDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
       if (files != null) {
         Project project = CommonDataKeys.PROJECT.getData(dataContext);
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
index 98a8f3bd5c65..8bab77726491 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
@@ -16,17 +16,24 @@
 package com.intellij.execution.junit;
 
 import com.intellij.execution.Location;
+import com.intellij.execution.actions.ConfigurationContext;
+import com.intellij.execution.actions.RunConfigurationProducer;
 import com.intellij.execution.junit2.PsiMemberParameterizedLocation;
 import com.intellij.execution.junit2.info.MethodLocation;
 import com.intellij.execution.testframework.JavaTestLocator;
 import com.intellij.execution.testframework.sm.runner.SMTestProxy;
+import com.intellij.idea.IdeaTestApplication;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.testFramework.TestDataProvider;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import org.jetbrains.annotations.NonNls;
 
 @SuppressWarnings({"JUnitTestClassNamingConvention", "JUnitTestCaseWithNoTests"})
 public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase  {
@@ -166,4 +173,27 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     PsiElement element = location.getPsiElement();
     assertEquals(aClass, element);
   }
-}
+
+  public void testMultipleClassesInOneFile() throws Exception {
+    myFixture.configureByText("a.java", "public class Test1 {<caret>} public class Test2 {}");
+
+    final IdeaTestApplication testApplication = IdeaTestApplication.getInstance();
+    try {
+      testApplication.setDataProvider(new TestDataProvider(myFixture.getProject()) {
+        @Override
+        public Object getData(@NonNls String dataId) {
+          if (CommonDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
+            return new VirtualFile[] {myFixture.getFile().getVirtualFile()};
+          }
+          return super.getData(dataId);
+        }
+      });
+      final PsiElement psiElement = myFixture.getFile().findElementAt(getEditor().getCaretModel().getOffset());
+      final PatternConfigurationProducer configurationProducer = RunConfigurationProducer.getInstance(PatternConfigurationProducer.class);
+      assertFalse(configurationProducer.isMultipleElementsSelected(new ConfigurationContext(psiElement)));
+    }
+    finally {
+      testApplication.setDataProvider(null);
+    }
+  }
+}
\ No newline at end of file