#4679 implement client handling testing events

Signed-off-by: Even Vidolob <[email protected]>
eclipse-che · May 16, 2017 · f42bdcc · f42bdcc
1 parent 7a9f988
commit f42bdcc
Show file tree

Hide file tree

Showing 75 changed files with 3,482 additions and 369 deletions.
diff --git a/...rc/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllContextTestAction.java b/...rc/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllContextTestAction.java
@@ -10,14 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.junit.ide.action;
 
-import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
@@ -34,7 +27,10 @@
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import com.google.inject.Inject;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
 /**
  * @author Mirage Abeysekara
@@ -70,16 +66,18 @@ public RunAllContextTestAction(JUnitTestResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        final Selection< ? > selection = selectionAgent.getSelection();
-        final Object possibleNode = selection.getHeadElement();
-        if (possibleNode instanceof ContainerNode) {
-            Container container = ((ContainerNode)possibleNode).getData();
-            Project project = container.getProject();
-            if (project != null) {
-                Map<String, String> parameters = new HashMap<>();
-                delegate.doRunTests(e, parameters);
-            }
-        }
+//        final Selection< ? > selection = selectionAgent.getSelection();
+//        final Object possibleNode = selection.getHeadElement();
+//        if (possibleNode instanceof ContainerNode) {
+//            Container container = ((ContainerNode)possibleNode).getData();
+//            Project project = container.getProject();
+//            if (project != null) {
+//                Map<String, String> parameters = new HashMap<>();
+//                delegate.doRunTests(e, parameters);
+//            }
+//        }
+        //TODO
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/...t-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java b/...t-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java
@@ -10,9 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.junit.ide.action;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
@@ -25,8 +23,6 @@
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import com.google.inject.Inject;
-
 /**
  * @author Mirage Abeysekara
  * @author David Festal
@@ -58,8 +54,10 @@ public RunAllTestAction(JUnitTestResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Map<String, String> parameters = new HashMap<>();
-        delegate.doRunTests(e, parameters);
+//        Map<String, String> parameters = new HashMap<>();
+//        delegate.doRunTests(e, parameters);
+        //TODO
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/.../main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassContextTestAction.java b/.../main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassContextTestAction.java
@@ -10,30 +10,24 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.junit.ide.action;
 
-import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.api.resources.VirtualFile;
 import org.eclipse.che.ide.api.selection.Selection;
 import org.eclipse.che.ide.api.selection.SelectionAgent;
-import org.eclipse.che.ide.ext.java.client.util.JavaUtil;
 import org.eclipse.che.ide.resources.tree.FileNode;
 import org.eclipse.che.plugin.testing.ide.TestServiceClient;
 import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate;
 import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import com.google.inject.Inject;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
 /**
  * @author Mirage Abeysekara
@@ -69,16 +63,18 @@ public RunClassContextTestAction(JUnitTestResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        final Selection< ? > selection = selectionAgent.getSelection();
-        final Object possibleNode = selection.getHeadElement();
-        if (possibleNode instanceof FileNode) {
-            VirtualFile file = ((FileNode)possibleNode).getData();
-            String fqn = JavaUtil.resolveFQN(file);
-            Map<String, String> parameters = new HashMap<>();
-            parameters.put("fqn", fqn);
-            parameters.put("runClass", "true");
-            delegate.doRunTests(e, parameters);
-        }
+//        final Selection< ? > selection = selectionAgent.getSelection();
+//        final Object possibleNode = selection.getHeadElement();
+//        if (possibleNode instanceof FileNode) {
+//            VirtualFile file = ((FileNode)possibleNode).getData();
+//            String fqn = JavaUtil.resolveFQN(file);
+//            Map<String, String> parameters = new HashMap<>();
+//            parameters.put("fqn", fqn);
+//            parameters.put("runClass", "true");
+//            delegate.doRunTests(e, parameters);
+//        }
+        //TODO
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/...ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java b/...ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java
@@ -10,26 +10,19 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.junit.ide.action;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
-import org.eclipse.che.ide.api.editor.EditorPartPresenter;
 import org.eclipse.che.ide.api.filetypes.FileTypeRegistry;
 import org.eclipse.che.ide.api.notification.NotificationManager;
-import org.eclipse.che.ide.api.resources.VirtualFile;
 import org.eclipse.che.ide.ext.java.client.action.JavaEditorAction;
-import org.eclipse.che.ide.ext.java.client.util.JavaUtil;
 import org.eclipse.che.plugin.testing.ide.TestServiceClient;
 import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate;
 import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestLocalizationConstant;
 import org.eclipse.che.plugin.testing.junit.ide.JUnitTestResources;
 
-import com.google.inject.Inject;
-
 /**
  * @author Mirage Abeysekara
  * @author David Festal
@@ -62,13 +55,15 @@ public RunClassTestAction(JUnitTestResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        EditorPartPresenter editorPart = editorAgent.getActiveEditor();
-        final VirtualFile file = editorPart.getEditorInput().getFile();
-        String fqn = JavaUtil.resolveFQN(file);
-        Map<String, String> parameters = new HashMap<>();
-        parameters.put("fqn", fqn);
-        parameters.put("runClass", "true");
-        delegate.doRunTests(e, parameters);
+//        EditorPartPresenter editorPart = editorAgent.getActiveEditor();
+//        final VirtualFile file = editorPart.getEditorInput().getFile();
+//        String fqn = JavaUtil.resolveFQN(file);
+//        Map<String, String> parameters = new HashMap<>();
+//        parameters.put("fqn", fqn);
+//        parameters.put("runClass", "true");
+//        delegate.doRunTests(e, parameters);
+        //TODO
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/...c/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllContextTestAction.java b/...c/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllContextTestAction.java
@@ -10,14 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.testng.ide.action;
 
-import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
@@ -34,7 +27,10 @@
 import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant;
 import org.eclipse.che.plugin.testing.testng.ide.TestNGResources;
 
-import com.google.inject.Inject;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
 /**
  * @author Mirage Abeysekara
@@ -70,16 +66,18 @@ public RunAllContextTestAction(TestNGResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        final Selection< ? > selection = selectionAgent.getSelection();
-        final Object possibleNode = selection.getHeadElement();
-        if (possibleNode instanceof ContainerNode) {
-            Container container = ((ContainerNode)possibleNode).getData();
-            Project project = container.getProject();
-            if (project != null) {
-                Map<String, String> parameters = new HashMap<>();
-                delegate.doRunTests(e, parameters);
-            }
-        }
+//        final Selection< ? > selection = selectionAgent.getSelection();
+//        final Object possibleNode = selection.getHeadElement();
+//        if (possibleNode instanceof ContainerNode) {
+//            Container container = ((ContainerNode)possibleNode).getData();
+//            Project project = container.getProject();
+//            if (project != null) {
+//                Map<String, String> parameters = new HashMap<>();
+//                delegate.doRunTests(e, parameters);
+//            }
+//        }
+        //TODO
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/...-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java b/...-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java
@@ -10,9 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.testng.ide.action;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import com.google.inject.Inject;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.editor.EditorAgent;
@@ -25,8 +23,6 @@
 import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant;
 import org.eclipse.che.plugin.testing.testng.ide.TestNGResources;
 
-import com.google.inject.Inject;
-
 /**
  * @author Mirage Abeysekara
  */
@@ -57,8 +53,8 @@ public RunAllTestAction(TestNGResources resources,
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        Map<String, String> parameters = new HashMap<>();
-        delegate.doRunTests(e, parameters);
+//        Map<String, String> parameters = new HashMap<>();
+//        delegate.doRunTests(e, parameters);
     }
 
     @Override

diff --git a/...main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassContextTestAction.java b/...main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassContextTestAction.java
@@ -10,32 +10,27 @@
  *******************************************************************************/
 package org.eclipse.che.plugin.testing.testng.ide.action;
 
-import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
+import com.google.inject.Inject;
+import org.eclipse.che.api.testing.shared.TestExecutionContext;
 import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
-import org.eclipse.che.ide.api.editor.EditorAgent;
 import org.eclipse.che.ide.api.notification.NotificationManager;
 import org.eclipse.che.ide.api.resources.VirtualFile;
 import org.eclipse.che.ide.api.selection.Selection;
 import org.eclipse.che.ide.api.selection.SelectionAgent;
-import org.eclipse.che.ide.ext.java.client.util.JavaUtil;
+import org.eclipse.che.ide.dto.DtoFactory;
 import org.eclipse.che.ide.resources.tree.FileNode;
-import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
 import org.eclipse.che.plugin.testing.ide.TestServiceClient;
 import org.eclipse.che.plugin.testing.ide.action.RunTestActionDelegate;
 import org.eclipse.che.plugin.testing.ide.view.TestResultPresenter;
 import org.eclipse.che.plugin.testing.testng.ide.TestNGLocalizationConstant;
 import org.eclipse.che.plugin.testing.testng.ide.TestNGResources;
 
-import com.google.inject.Inject;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
 
 /**
  * @author Mirage Abeysekara
@@ -48,39 +43,39 @@ public class RunClassContextTestAction extends AbstractPerspectiveAction
     private final TestServiceClient     service;
     private final AppContext            appContext;
     private final SelectionAgent        selectionAgent;
+    private final DtoFactory dtoFactory;
     private final RunTestActionDelegate delegate;
 
     @Inject
     public RunClassContextTestAction(TestNGResources resources,
                                      NotificationManager notificationManager,
-                                     EditorAgent editorAgent,
                                      AppContext appContext,
                                      TestResultPresenter presenter,
                                      TestServiceClient service,
-                                     DtoUnmarshallerFactory dtoUnmarshallerFactory,
                                      SelectionAgent selectionAgent,
-                                     TestNGLocalizationConstant localization) {
+                                     TestNGLocalizationConstant localization,
+                                     DtoFactory dtoFactory) {
         super(Arrays.asList(PROJECT_PERSPECTIVE_ID), localization.actionRunClassContextTitle(),
               localization.actionRunClassContextDescription(), null, resources.testIcon());
         this.notificationManager = notificationManager;
         this.presenter = presenter;
         this.service = service;
         this.appContext = appContext;
         this.selectionAgent = selectionAgent;
+        this.dtoFactory = dtoFactory;
         this.delegate = new RunTestActionDelegate(this);
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
         final Selection< ? > selection = selectionAgent.getSelection();
         final Object possibleNode = selection.getHeadElement();
+        TestExecutionContext context = dtoFactory.createDto(TestExecutionContext.class);
         if (possibleNode instanceof FileNode) {
             VirtualFile file = ((FileNode)possibleNode).getData();
-            String fqn = JavaUtil.resolveFQN(file);
-            Map<String, String> parameters = new HashMap<>();
-            parameters.put("fqn", fqn);
-            parameters.put("runClass", "true");
-            delegate.doRunTests(e, parameters);
+            context.setTestType(TestExecutionContext.TestType.FILE);
+            context.setFilePath(file.getLocation().toString());
+            delegate.doRunTests(e, context);
         }
     }