CHE-5737: run custom set of tests (eclipse-che#5956)

* CHE-5737: run custom set of tests * CHE-5737: code cleanup * CHE-5737: update test actions presentation
anshul231193 · Aug 17, 2017 · 0d5648d · 0d5648d
1 parent 6792b2b
commit 0d5648d
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 67 deletions.
diff --git a/...g-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java b/...g-classpath/src/main/java/org/eclipse/che/plugin/java/testing/AbstractJavaTestRunner.java
@@ -35,6 +35,7 @@
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
@@ -163,7 +164,7 @@ private ICompilationUnit findCompilationUnitByPath(IJavaProject javaProject, Str
 
             String packagePath = packageRootPath.toOSString();
             if (!packagePath.endsWith("/")) {
-                packagePath += "/";
+                packagePath += '/';
             }
 
             String pathToClass = filePath.substring(packagePath.length());
@@ -204,6 +205,8 @@ protected List<String> createTestSuite(TestExecutionContext context,
                                                            context.getFilePath(),
                                                            methodAnnotation,
                                                            classAnnotation);
+            case SET:
+                return convertClassesPathsToFqns(context.getListOfTestClasses(), javaProject);
             case PROJECT:
                 return javaTestFinder.findClassesInProject(javaProject,
                                                            methodAnnotation,
@@ -242,4 +245,20 @@ private static boolean isPortAvailable(int port) {
     private RuntimeException getRuntimeException(String filePath) {
         return new RuntimeException("Can't find IClasspathEntry for path " + filePath);
     }
+
+    private List<String> convertClassesPathsToFqns(List<String> testClasses, IJavaProject javaProject) {
+        if (testClasses == null) {
+            return emptyList();
+        }
+        List<String> result = new LinkedList<>();
+        for (String classPath : testClasses) {
+            ICompilationUnit compilationUnit = findCompilationUnitByPath(javaProject, classPath);
+            if (compilationUnit != null) {
+                IType primaryType = compilationUnit.findPrimaryType();
+                result.add(primaryType.getFullyQualifiedName());
+            }
+        }
+
+        return result;
+    }
 }
diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml
@@ -25,10 +25,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>

diff --git a/...e/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/DebugJUnitTestAction.java b/...e/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/DebugJUnitTestAction.java
@@ -14,7 +14,6 @@
 import com.google.web.bindery.event.shared.EventBus;
 
 import org.eclipse.che.ide.api.action.ActionEvent;
-import org.eclipse.che.ide.api.action.Presentation;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.debug.DebugConfigurationsManager;
 import org.eclipse.che.ide.api.notification.NotificationManager;
@@ -27,8 +26,6 @@
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import javax.validation.constraints.NotNull;
-
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
@@ -67,14 +64,4 @@ public void actionPerformed(ActionEvent e) {
         actionPerformed(frameworkAndTestName, true);
     }
 
-    @Override
-    public void updateInPerspective(@NotNull ActionEvent e) {
-        Presentation presentation = e.getPresentation();
-        presentation.setVisible(!isEditorInFocus);
-        if (!isEditorInFocus) {
-            analyzeProjectTreeSelection();
-        }
-        presentation.setEnabled(isEnable);
-    }
-
 }
diff --git a/...ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunJUnitTestAction.java b/...ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunJUnitTestAction.java
@@ -14,7 +14,6 @@
 import com.google.web.bindery.event.shared.EventBus;
 
 import org.eclipse.che.ide.api.action.ActionEvent;
-import org.eclipse.che.ide.api.action.Presentation;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.debug.DebugConfigurationsManager;
 import org.eclipse.che.ide.api.notification.NotificationManager;
@@ -27,8 +26,6 @@
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import javax.validation.constraints.NotNull;
-
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
@@ -68,13 +65,4 @@ public void actionPerformed(ActionEvent e) {
         actionPerformed(frameworkAndTestName, false);
     }
 
-    @Override
-    public void updateInPerspective(@NotNull ActionEvent e) {
-        Presentation presentation = e.getPresentation();
-        presentation.setVisible(!isEditorInFocus);
-        if (!isEditorInFocus) {
-            analyzeProjectTreeSelection();
-        }
-        presentation.setEnabled(isEnable);
-    }
 }
diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml
@@ -25,10 +25,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-gwt</artifactId>

diff --git a/...src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/DebugTestNgTestAction.java b/...src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/DebugTestNgTestAction.java
@@ -14,7 +14,6 @@
 import com.google.web.bindery.event.shared.EventBus;
 
 import org.eclipse.che.ide.api.action.ActionEvent;
-import org.eclipse.che.ide.api.action.Presentation;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.debug.DebugConfigurationsManager;
 import org.eclipse.che.ide.api.notification.NotificationManager;
@@ -27,8 +26,6 @@
 import org.eclipse.che.plugin.testing.testng.ide.TestNgLocalizationConstant;
 import org.eclipse.che.plugin.testing.testng.ide.TestNgResources;
 
-import javax.validation.constraints.NotNull;
-
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
@@ -67,13 +64,4 @@ public void actionPerformed(ActionEvent e) {
         actionPerformed(frameworkAndTestName, true);
     }
 
-    @Override
-    public void updateInPerspective(@NotNull ActionEvent e) {
-        Presentation presentation = e.getPresentation();
-        presentation.setVisible(!isEditorInFocus);
-        if (!isEditorInFocus) {
-            analyzeProjectTreeSelection();
-        }
-        presentation.setEnabled(isEnable);
-    }
 }
diff --git a/...e/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestNgTestAction.java b/...e/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestNgTestAction.java
@@ -14,7 +14,6 @@
 import com.google.web.bindery.event.shared.EventBus;
 
 import org.eclipse.che.ide.api.action.ActionEvent;
-import org.eclipse.che.ide.api.action.Presentation;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.debug.DebugConfigurationsManager;
 import org.eclipse.che.ide.api.notification.NotificationManager;
@@ -27,8 +26,6 @@
 import org.eclipse.che.plugin.testing.testng.ide.TestNgLocalizationConstant;
 import org.eclipse.che.plugin.testing.testng.ide.TestNgResources;
 
-import javax.validation.constraints.NotNull;
-
 import static java.util.Collections.singletonList;
 import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
@@ -67,13 +64,4 @@ public void actionPerformed(ActionEvent e) {
         actionPerformed(frameworkAndTestName, false);
     }
 
-    @Override
-    public void updateInPerspective(@NotNull ActionEvent e) {
-        Presentation presentation = e.getPresentation();
-        presentation.setVisible(!isEditorInFocus);
-        if (!isEditorInFocus) {
-            analyzeProjectTreeSelection();
-        }
-        presentation.setEnabled(isEnable);
-    }
 }
diff --git a/...estng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java b/...estng-server/src/main/java/org/eclipse/che/plugin/testing/testng/server/TestNGRunner.java
@@ -149,6 +149,7 @@ private Map<String, List<String>> buildTestNgSuite(List<String> tests, TestExecu
         switch (context.getContextType()) {
             case FILE:
             case FOLDER:
+            case SET:
             case PROJECT:
                 return createContainerSuite(tests);
             case CURSOR_POSITION:

diff --git a/...e/src/main/java/org/eclipse/che/plugin/testing/ide/action/RunDebugTestAbstractAction.java b/...e/src/main/java/org/eclipse/che/plugin/testing/ide/action/RunDebugTestAbstractAction.java
@@ -22,6 +22,7 @@
 import org.eclipse.che.commons.annotation.Nullable;
 import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
 import org.eclipse.che.ide.api.action.ActionEvent;
+import org.eclipse.che.ide.api.action.Presentation;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.debug.DebugConfiguration;
 import org.eclipse.che.ide.api.debug.DebugConfigurationsManager;
@@ -37,6 +38,7 @@
 import org.eclipse.che.ide.ext.java.client.editor.JavaReconsilerEvent;
 import org.eclipse.che.ide.ext.java.client.resource.SourceFolderMarker;
 import org.eclipse.che.ide.ext.java.client.util.JavaUtil;
+import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter;
 import org.eclipse.che.ide.util.Pair;
 import org.eclipse.che.ide.util.loging.Log;
 import org.eclipse.che.plugin.testing.ide.TestServiceClient;
@@ -74,6 +76,7 @@ public abstract class RunDebugTestAbstractAction extends AbstractPerspectiveActi
     private NotificationManager              notificationManager;
     private TestExecutionContext.ContextType contextType;
     private String                           selectedNodePath;
+    private PartPresenter                    activePart;
 
     protected boolean isEnable;
     protected boolean isEditorInFocus;
@@ -103,7 +106,7 @@ public RunDebugTestAbstractAction(EventBus eventBus,
 
         eventBus.addHandler(JavaReconsilerEvent.TYPE, event -> detectTests(event.getEditor()));
         eventBus.addHandler(ActivePartChangedEvent.TYPE, event -> {
-            PartPresenter activePart = event.getActivePart();
+            activePart = event.getActivePart();
             if (activePart instanceof TextEditor) {
                 isEditorInFocus = true;
                 contextType = CURSOR_POSITION;
@@ -120,7 +123,18 @@ public RunDebugTestAbstractAction(EventBus eventBus,
     }
 
     @Override
-    public abstract void updateInPerspective(@NotNull ActionEvent event);
+    public void updateInPerspective(@NotNull ActionEvent event) {
+        Presentation presentation = event.getPresentation();
+        boolean isProjectExplorerActive = activePart instanceof ProjectExplorerPresenter;
+        presentation.setVisible(isProjectExplorerActive);
+        if (!isProjectExplorerActive) {
+            return;
+        }
+        if (!isEditorInFocus) {
+            analyzeProjectTreeSelection();
+        }
+        presentation.setEnabled(isEnable);
+    }
 
     @Override
     public abstract void actionPerformed(ActionEvent e);

diff --git a/...src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java b/...src/main/java/org/eclipse/che/plugin/testing/ide/model/GeneralTestingEventsProcessor.java
@@ -204,7 +204,6 @@ public void onTestFailed(TestFailedEvent event) {
 
         TestState testState = getStateByStateName(name);
         if (testState == null) {
-            Log.error(getClass(), "Test wasn't started: " + name);
             onTestStarted(new TestStartedEvent(name, null));
             testState = getStateByStateName(name);
         }
@@ -225,7 +224,6 @@ public void onTestFinished(TestFinishedEvent event) {
         TestState testState = getStateByStateName(name);
 
         if (testState == null) {
-            Log.error(getClass(), "Test wasn't started: " + name);
             return;
         }
 
@@ -245,7 +243,6 @@ public void onTestIgnored(TestIgnoredEvent event) {
         TestState testState = getStateByStateName(name);
 
         if (testState == null) {
-            Log.error(getClass(), "Test wasn't started: " + name);
             onTestStarted(new TestStartedEvent(name, null));
             testState = getStateByStateName(name);
         }

diff --git a/...in-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestSuiteStack.java b/...in-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/model/TestSuiteStack.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.ide.model;
 
-import org.eclipse.che.ide.util.loging.Log;
-
 import java.util.ArrayDeque;
 import java.util.Deque;
 
@@ -69,7 +67,6 @@ public TestState getCurrent() {
      */
     public TestState pop(String suiteName) {
         if (stack.isEmpty()) {
-            Log.error(getClass(), "Test suite stack is empty, unexpected suite name: " + suiteName);
             return null;
         }
 

diff --git a/...testing-shared/src/main/java/org/eclipse/che/api/testing/shared/TestExecutionContext.java b/...testing-shared/src/main/java/org/eclipse/che/api/testing/shared/TestExecutionContext.java
@@ -12,6 +12,8 @@
 
 import org.eclipse.che.dto.shared.DTO;
 
+import java.util.List;
+
 /**
  * Context which provides information about test execution.
  */
@@ -50,7 +52,17 @@ public interface TestExecutionContext {
 
     TestExecutionContext withDebugModeEnable(Boolean enable);
 
+    /**
+     * returns a list with paths of the test files relative to the project.
+     * The list should be initialized when value of {@link ContextType} is {@link ContextType.SET}
+     *
+     * @param listOfTestClasses
+     */
+    void setListOfTestClasses(List<String> listOfTestClasses);
+
+    List<String> getListOfTestClasses();
+
     enum ContextType {
-        FILE, FOLDER, PROJECT, CURSOR_POSITION
+        FILE, FOLDER, PROJECT, CURSOR_POSITION, SET
     }
 }