diff options
author | Doug Schaefer | 2014-09-12 02:39:55 +0000 |
---|---|---|
committer | Doug Schaefer | 2014-09-12 15:28:39 +0000 |
commit | d5b3ed1ce7a0fde221784721d11459e2284edf44 (patch) | |
tree | ae625970ce9b674d7f2f1a01afd8ab8d4bf6aa23 /launch | |
parent | 63b9ba54f56110f23d2f16c61435770e7adeb34d (diff) | |
download | org.eclipse.cdt-d5b3ed1ce7a0fde221784721d11459e2284edf44.tar.gz org.eclipse.cdt-d5b3ed1ce7a0fde221784721d11459e2284edf44.tar.xz org.eclipse.cdt-d5b3ed1ce7a0fde221784721d11459e2284edf44.zip |
Extend launch bar tests and fix up one of the Listener methods.
Change-Id: I920f7c08f30d51cff2a5188f81b85839e7d972e3
Reviewed-on: https://git.eclipse.org/r/33289
Tested-by: Hudson CI
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
Diffstat (limited to 'launch')
4 files changed, 51 insertions, 6 deletions
diff --git a/launch/org.eclipse.cdt.launchbar.core.tests/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManagerTest.java b/launch/org.eclipse.cdt.launchbar.core.tests/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManagerTest.java index 18492295be2..df03a6aeb24 100644 --- a/launch/org.eclipse.cdt.launchbar.core.tests/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManagerTest.java +++ b/launch/org.eclipse.cdt.launchbar.core.tests/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManagerTest.java @@ -30,6 +30,7 @@ import org.eclipse.cdt.launchbar.core.ILaunchObjectProvider; import org.eclipse.cdt.launchbar.core.ILaunchTarget; import org.eclipse.cdt.launchbar.core.ILaunchTargetType; import org.eclipse.cdt.launchbar.core.LaunchConfigurationProvider; +import org.eclipse.cdt.launchbar.core.internal.LaunchBarManager.Listener; import org.eclipse.core.internal.preferences.EclipsePreferences; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -507,8 +508,10 @@ public class LaunchBarManagerTest extends TestCase { @Test public void testSetActiveDescriptor() throws Exception { - TestLaunchBarManager manager = new TestLaunchBarManager(); - + final TestLaunchBarManager manager = new TestLaunchBarManager(); + ILaunchMode runMode = launchManager.getLaunchMode("run"); + ILaunchMode debugMode = launchManager.getLaunchMode("debug"); + // descriptor for the test descriptor String name = "test1"; ILaunchConfigurationType configType = manager.getLaunchManager().getLaunchConfigurationType(DEFAULT_CONFIG_TYPE_ID); @@ -520,6 +523,33 @@ public class LaunchBarManagerTest extends TestCase { ILaunchDescriptor test1 = manager.getLaunchDescriptor(testObject1); assertNotNull(test1); + final ILaunchMode[] testActiveMode = new ILaunchMode[1]; + final ILaunchDescriptor[] testActiveDesc = new ILaunchDescriptor[1]; + Listener listener = new Listener() { + @Override + public void launchTargetsChanged() { + } + + @Override + public void launchDescriptorRemoved(ILaunchDescriptor descriptor) { + } + + @Override + public void activeLaunchTargetChanged() { + } + + @Override + public void activeLaunchModeChanged() { + testActiveMode[0] = manager.getActiveLaunchMode(); + } + + @Override + public void activeLaunchDescriptorChanged() { + testActiveDesc[0] = manager.getActiveLaunchDescriptor(); + } + }; + manager.addListener(listener); + // descriptor for the default descriptor ILaunchConfigurationType defaultConfigType = mockLaunchConfigurationType("configType.default"); ILaunchConfiguration config = mockLaunchConfiguration("test2", defaultConfigType); @@ -527,20 +557,35 @@ public class LaunchBarManagerTest extends TestCase { ILaunchDescriptor test2 = manager.getLaunchDescriptor(config); assertNotNull(test2); assertNotSame(test1, test2); + manager.setActiveLaunchMode(runMode); // test2 should be active by default since it was created last assertEquals(test2, manager.getActiveLaunchDescriptor()); + assertEquals(test2, testActiveDesc[0]); assertEquals(config, manager.getActiveLaunchConfiguration()); + assertEquals(runMode, manager.getActiveLaunchMode()); + assertEquals(runMode, testActiveMode[0]); // flip to test1 + testActiveMode[0] = null; + testActiveDesc[0] = null; manager.setActiveLaunchDescriptor(test1); + manager.setActiveLaunchMode(debugMode); assertEquals(test1, manager.getActiveLaunchDescriptor()); + assertEquals(test1, testActiveDesc[0]); assertEquals(wc, manager.getActiveLaunchConfiguration()); + assertEquals(debugMode, manager.getActiveLaunchMode()); + assertEquals(debugMode, testActiveMode[0]); // and back to test2 + testActiveMode[0] = null; + testActiveDesc[0] = null; manager.setActiveLaunchDescriptor(test2); assertEquals(test2, manager.getActiveLaunchDescriptor()); + assertEquals(test2, testActiveDesc[0]); assertEquals(config, manager.getActiveLaunchConfiguration()); + assertEquals(runMode, manager.getActiveLaunchMode()); + assertEquals(runMode, testActiveMode[0]); } @Test diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java index 69fc1614db9..1d9263b7d5b 100644 --- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java +++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java @@ -54,7 +54,7 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchConfiguration // TODO make these more fine grained or break them into more focused listeners public interface Listener { - void activeConfigurationDescriptorChanged(); + void activeLaunchDescriptorChanged(); void activeLaunchModeChanged(); void activeLaunchTargetChanged(); void launchDescriptorRemoved(ILaunchDescriptor descriptor); @@ -711,7 +711,7 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchConfiguration public void updateLaunchDescriptor(ILaunchDescriptor configDesc) { for (Listener listener : listeners) { try { - listener.activeConfigurationDescriptorChanged(); + listener.activeLaunchDescriptorChanged(); } catch (Exception e) { Activator.log(e); } diff --git a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/LaunchBarControl.java b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/LaunchBarControl.java index f9a00eb4a6e..46e8cf7270b 100644 --- a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/LaunchBarControl.java +++ b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/LaunchBarControl.java @@ -110,7 +110,7 @@ public class LaunchBarControl implements Listener { } @Override - public void activeConfigurationDescriptorChanged() { + public void activeLaunchDescriptorChanged() { if (configSelector != null && !configSelector.isDisposed()) { final ILaunchDescriptor configDesc = manager.getActiveLaunchDescriptor(); configSelector.getDisplay().asyncExec(new Runnable() { diff --git a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/targetsView/LaunchTargetsNavigator.java b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/targetsView/LaunchTargetsNavigator.java index 0670cffdb3a..3efb6449da1 100644 --- a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/targetsView/LaunchTargetsNavigator.java +++ b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/targetsView/LaunchTargetsNavigator.java @@ -41,7 +41,7 @@ public class LaunchTargetsNavigator extends CommonNavigator { public void activeLaunchModeChanged() { } @Override - public void activeConfigurationDescriptorChanged() { + public void activeLaunchDescriptorChanged() { } }); |