Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Duft2016-12-06 03:03:50 -0500
committerSarika Sinha2017-01-12 05:28:06 -0500
commitb3ecd5d763b119bf9136c18b0d52385197bd643b (patch)
tree6dd01648c40d525c705bb7e95f03e14a40115f14
parent0548d360ff223dcd7dcde4ee0650a56c0807a2c3 (diff)
downloadeclipse.platform.debug-b3ecd5d763b119bf9136c18b0d52385197bd643b.tar.gz
eclipse.platform.debug-b3ecd5d763b119bf9136c18b0d52385197bd643b.tar.xz
eclipse.platform.debug-b3ecd5d763b119bf9136c18b0d52385197bd643b.zip
Initial contribution of LaunchGroupTestsY20170112-1300Y20170112-1000I20170112-2000
These contain basic test for the existing launch group functionality. No tests for the additional functionality are provided in this commit. Test for additional functionality will be in the according commits. This commit also fixes a bug in the existing functionality that marks a group as terminated too early. Bug: 508420 Change-Id: I1e1e0ae512384665f926d7225b55c701dca92409 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java4
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java4
-rw-r--r--org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java156
3 files changed, 163 insertions, 1 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
index df314a18a..2c1b519c6 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunch.java
@@ -99,7 +99,9 @@ public class GroupLaunch extends Launch implements ILaunchesListener2 {
return false;
}
}
- return true;
+ return fLaunched; // we're done only if we're already done launching.
+ // this is required for the WAIT_FOR_TERMINATION
+ // mode.
}
/**
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
index c06c6c868..2204d97f1 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
@@ -21,6 +21,7 @@ import org.eclipse.debug.tests.launching.AcceleratorSubstitutionTests;
import org.eclipse.debug.tests.launching.ArgumentParsingTests;
import org.eclipse.debug.tests.launching.LaunchConfigurationTests;
import org.eclipse.debug.tests.launching.LaunchFavoriteTests;
+import org.eclipse.debug.tests.launching.LaunchGroupTests;
import org.eclipse.debug.tests.launching.LaunchHistoryTests;
import org.eclipse.debug.tests.launching.LaunchManagerTests;
import org.eclipse.debug.tests.launching.LaunchTests;
@@ -103,5 +104,8 @@ public class AutomatedSuite extends TestSuite {
// Console view
addTest(new TestSuite(ConsoleManagerTests.class));
+
+ // Launch Groups
+ addTest(new TestSuite(LaunchGroupTests.class));
}
}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
new file mode 100644
index 000000000..7f6f828fe
--- /dev/null
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
@@ -0,0 +1,156 @@
+package org.eclipse.debug.tests.launching;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.model.IDisconnect;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.internal.core.groups.GroupLaunchConfigurationDelegate;
+import org.eclipse.debug.internal.core.groups.GroupLaunchElement;
+import org.eclipse.debug.internal.core.groups.GroupLaunchElement.GroupElementPostLaunchAction;
+import org.eclipse.debug.internal.ui.launchConfigurations.LaunchHistory;
+import org.eclipse.debug.ui.IDebugUIConstants;
+
+public class LaunchGroupTests extends AbstractLaunchTest {
+
+ private static final String GROUP_TYPE = "org.eclipse.debug.core.groups.GroupLaunchConfigurationType"; //$NON-NLS-1$
+
+ public LaunchGroupTests() {
+ super("Launch Groups Test"); //$NON-NLS-1$
+ }
+
+ private ILaunchConfiguration createLaunchGroup(GroupLaunchElement... children) throws CoreException {
+ ILaunchConfigurationWorkingCopy grp = getLaunchManager().getLaunchConfigurationType(GROUP_TYPE).newInstance(null, "Test Group"); //$NON-NLS-1$
+ GroupLaunchConfigurationDelegate.storeLaunchElements(grp, Arrays.asList(children));
+ return grp.doSave();
+ }
+
+ private GroupLaunchElement createLaunchGroupElement(ILaunchConfiguration source, GroupElementPostLaunchAction action, Object param) {
+ GroupLaunchElement e = new GroupLaunchElement();
+
+ e.name = source.getName();
+ e.data = source;
+ e.action = action;
+ e.actionParam = param;
+ e.mode = GroupLaunchElement.MODE_INHERIT;
+ e.enabled = true;
+
+ return e;
+ }
+
+ private LaunchHistory getRunLaunchHistory() {
+ LaunchHistory h = getLaunchConfigurationManager().getLaunchHistory(IDebugUIConstants.ID_RUN_LAUNCH_GROUP);
+
+ // clear the history
+ for (ILaunchConfiguration c : h.getHistory()) {
+ h.removeFromHistory(c);
+ }
+
+ return h;
+ }
+
+ public void testNone() throws Exception {
+ ILaunchConfiguration t1 = getLaunchConfiguration("Test1"); //$NON-NLS-1$
+ ILaunchConfiguration t2 = getLaunchConfiguration("Test2"); //$NON-NLS-1$
+ ILaunchConfiguration grp = createLaunchGroup(createLaunchGroupElement(t1, GroupElementPostLaunchAction.NONE, null), createLaunchGroupElement(t2, GroupElementPostLaunchAction.NONE, null));
+
+ // attention: need to do this before launching!
+ LaunchHistory runHistory = getRunLaunchHistory();
+ grp.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
+
+ ILaunchConfiguration[] history = runHistory.getHistory();
+ assertTrue("history should be size 3", history.length == 3); //$NON-NLS-1$
+ assertTrue("history[0] should be Test Group", history[0].contentsEqual(grp)); //$NON-NLS-1$
+ assertTrue("history[1] should be Test2", history[1].contentsEqual(t2)); //$NON-NLS-1$
+ assertTrue("history[2] should be Test1", history[2].contentsEqual(t1)); //$NON-NLS-1$
+ }
+
+ public void testDelay() throws Exception {
+ ILaunchConfiguration t1 = getLaunchConfiguration("Test1"); //$NON-NLS-1$
+ ILaunchConfiguration t2 = getLaunchConfiguration("Test2"); //$NON-NLS-1$
+ ILaunchConfiguration grp = createLaunchGroup(createLaunchGroupElement(t1, GroupElementPostLaunchAction.DELAY, 2), createLaunchGroupElement(t2, GroupElementPostLaunchAction.NONE, null));
+
+ long start = System.currentTimeMillis();
+ // attention: need to do this before launching!
+ LaunchHistory runHistory = getRunLaunchHistory();
+ grp.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
+
+ assertTrue("delay was not awaited", (System.currentTimeMillis() - start) > 2000); //$NON-NLS-1$
+
+ ILaunchConfiguration[] history = runHistory.getHistory();
+ assertTrue("history should be size 3", history.length == 3); //$NON-NLS-1$
+ assertTrue("history[0] should be Test Group", history[0].contentsEqual(grp)); //$NON-NLS-1$
+ assertTrue("history[1] should be Test2", history[1].contentsEqual(t2)); //$NON-NLS-1$
+ assertTrue("history[2] should be Test1", history[2].contentsEqual(t1)); //$NON-NLS-1$
+ }
+
+ public void testTerminated() throws Exception {
+ final ILaunchConfiguration t1 = getLaunchConfiguration("Test1"); //$NON-NLS-1$
+ final ILaunchConfiguration t2 = getLaunchConfiguration("Test2"); //$NON-NLS-1$
+ ILaunchConfiguration grp = createLaunchGroup(createLaunchGroupElement(t1, GroupElementPostLaunchAction.WAIT_FOR_TERMINATION, null), createLaunchGroupElement(t2, GroupElementPostLaunchAction.NONE, null));
+
+ long start = System.currentTimeMillis();
+ new Thread("Terminate Test1") { //$NON-NLS-1$
+ @Override
+ public void run() {
+ try {
+ // wait for some time
+ Thread.sleep(2000);
+
+ // now find and nuke Test1
+ for (ILaunch l : getLaunchManager().getLaunches()) {
+ if (l.getLaunchConfiguration().contentsEqual(t1)) {
+ // add a dummy process, otherwise the launch never
+ // terminates...
+ InvocationHandler handler = new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ String name = method.getName();
+ if (name.equals("equals")) { //$NON-NLS-1$
+ return args.length == 1 && proxy == args[0];
+ }
+ if (name.equals("getStreamsProxy")) { //$NON-NLS-1$
+ return null;
+ }
+ return Boolean.TRUE;
+ }
+ };
+ IProcess process = (IProcess) Proxy.newProxyInstance(LaunchGroupTests.class.getClassLoader(), new Class[] {
+ IProcess.class,
+ IDisconnect.class }, handler);
+ l.addProcess(process);
+ l.terminate();
+ }
+ }
+ } catch (Exception e) {
+ // uh oh
+ e.printStackTrace();
+ }
+ }
+ }.start();
+
+ // attention: need to do this before launching!
+ LaunchHistory runHistory = getRunLaunchHistory();
+ grp.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
+
+ assertTrue("returned before termination of Test1", (System.currentTimeMillis() - start) > 2000); //$NON-NLS-1$
+
+ // is there a way to assert that the group waited for test1 to
+ // terminate? don't think so - at least run the code path to have it
+ // covered.
+ ILaunchConfiguration[] history = runHistory.getHistory();
+ assertTrue("history should be size 3", history.length == 3); //$NON-NLS-1$
+ assertTrue("history[0] should be Test Group", history[0].contentsEqual(grp)); //$NON-NLS-1$
+ assertTrue("history[1] should be Test2", history[1].contentsEqual(t2)); //$NON-NLS-1$
+ assertTrue("history[2] should be Test1", history[2].contentsEqual(t1)); //$NON-NLS-1$
+ }
+
+}

Back to the top