elements = new ArrayList<>();
@@ -110,21 +123,28 @@ public void before() throws CoreException {
elements.add(createConfigElementMockForConfigProvider(launchDescTypeId_no1, launchConfigProvider_no1));
elements.add(createConfigElementMockForDescriptorType(launchDescTypeId_no2, descriptor_no2));
elements.add(createConfigElementMockForConfigProvider(launchDescTypeId_no2, launchConfigProvider_no2));
- ILaunchManager launchManager = createLaunchManagerMock(launchConfigTypes, preferredMode_no1, preferredMode_no2,
- runMode, debugMode);
- ILaunchTargetManager targetManager = createLaunchTargetManagerMock();
+ launchManagerMock = createLaunchManagerMock(launchConfigTypes, preferredMode_no1, preferredMode_no2, runMode,
+ debugMode);
+ targetManagerMock = createLaunchTargetManagerMock();
doReturn(elements.toArray(IConfigurationElement[]::new)).when(extension).getConfigurationElements();
// Mock Launch bar manager
- launchBarManagerMock = createLaunchBarManagerMock(extensionPoint, launchManager, targetManager);
+ launchBarManagerMock = createLaunchBarManagerMock(extensionPoint, launchManagerMock, targetManagerMock);
// Initial LaunchBarManager
launchBarManagerMock.init();
}
@After
- public void after() {
+ public void after() throws BackingStoreException {
+ launchBarManagerMock.getPreferenceStore().node(getNode(launchDescTypeId_no1, launchObject_no1)).clear();
+ launchBarManagerMock.getPreferenceStore().node(getNode(launchDescTypeId_no2, launchObject_no2)).clear();
+ launchBarManagerMock.getPreferenceStore().flush();
launchBarManagerMock.dispose();
}
+ private String getNode(String descTypeId, String descName) {
+ return String.format("%s:%s", descTypeId, descName);//$NON-NLS-1$
+ }
+
@Test
public void startupTest() throws Exception {
// Make sure the manager starts up and defaults everything to null
@@ -486,6 +506,119 @@ public void preferredLaunchModeTest_storedModeNotNull() throws CoreException {
assertEquals(preferredMode_no1, activeMode.getIdentifier());
}
+ /**
+ *
+ * Test that when activeLaunchDescriptorChanged event is fired,launch bar has
+ * a stable/correct state.
+ *
+ * Verifies that when "activeLaunchDescriptorChanged" event is fired, Launch bar
+ * manager has finished update launch mode and launch target for that descriptor
+ *
+ * @throws CoreException
+ */
+ @Test
+ public void launchBarStateTest_LaunchDescriptorChanged() throws CoreException {
+ // Dummy listener to collect data from the launch bar
+ AtomicReference>> launchBarState = new AtomicReference<>();
+ launchBarState.set(new ArrayList<>());
+ ILaunchBarListener launchBarListener = createLaunchBarListener(launchBarState);
+ // Add initial active value to launch bar
+ ILaunchDescriptor desc_no1 = launchBarManagerMock.launchObjectAdded(launchObject_no1);
+ ILaunchTarget target_no1 = targetManagerMock.getLaunchTarget(targetTypeId, targetId_no1);
+ launchBarManagerMock.setActiveLaunchTarget(target_no1);
+ // Change active values on launch bar
+ launchBarManagerMock.launchObjectAdded(launchObject_no2);
+ ILaunchTarget target_no2 = targetManagerMock.getLaunchTarget(targetTypeId, targetId_no2);
+ launchBarManagerMock.setActiveLaunchTarget(target_no2);
+ launchBarManagerMock.setActiveLaunchMode(launchManagerMock.getLaunchMode(runMode));
+ // Add launch bar listener and start test
+ launchBarManagerMock.addListener(launchBarListener);
+ // Change active launch descriptor
+ launchBarManagerMock.setActiveLaunchDescriptor(desc_no1);
+ // Launch bar state when receive the event notification should be:
+ // launch descriptor: launchObject_no1
+ // launch target: targetId_no1
+ // launch mode: preferredMode_no1
+ for (var stateMap : launchBarState.get()) {
+ assertEquals(launchObject_no1, ((ILaunchDescriptor) stateMap.get(attr_activeDesc)).getName());
+ assertEquals(targetId_no1, ((ILaunchTarget) stateMap.get(attr_activeTarget)).getId());
+ assertEquals(preferredMode_no1, ((ILaunchMode) stateMap.get(attr_activeMode)).getIdentifier());
+ }
+ }
+
+ /**
+ *
+ * Test that when activeLaunchTargetChanged event is fired,launch bar has
+ * a stable/correct state.
+ *
+ * Verifies that when "activeLaunchTargetChanged" event is fired, Launch bar
+ * manager has finished update launch mode for that descriptor
+ *
+ * @throws CoreException
+ */
+ @Test
+ public void launchBarStateTest_LaunchTargetChanged() throws CoreException {
+ // Dummy listener to collect data from the launch bar
+ AtomicReference>> launchBarState = new AtomicReference<>();
+ launchBarState.set(new ArrayList<>());
+ ILaunchBarListener launchBarListener = createLaunchBarListener(launchBarState);
+ // Add initial active value to launch bar
+ launchBarManagerMock.launchObjectAdded(launchObject_no1);
+ ILaunchTarget target_no1 = targetManagerMock.getLaunchTarget(targetTypeId, targetId_no1);
+ launchBarManagerMock.setActiveLaunchTarget(target_no1);
+ // Change active values on launch bar
+ ILaunchTarget target_local = targetManagerMock.getLocalLaunchTarget();
+ launchBarManagerMock.setActiveLaunchTarget(target_local);
+ // Add launch bar listener and start test
+ launchBarManagerMock.addListener(launchBarListener);
+ // Change active launch target
+ launchBarManagerMock.setActiveLaunchTarget(target_no1);
+ // Launch bar state should be:
+ // launch descriptor: launchObject_no1
+ // launch target: targetId_no1
+ // launch mode: preferredMode_no1
+ for (var stateMap : launchBarState.get()) {
+ assertEquals(launchObject_no1, ((ILaunchDescriptor) stateMap.get(attr_activeDesc)).getName());
+ assertEquals(targetId_no1, ((ILaunchTarget) stateMap.get(attr_activeTarget)).getId());
+ assertEquals(preferredMode_no1, ((ILaunchMode) stateMap.get(attr_activeMode)).getIdentifier());
+ }
+ }
+
+ /**
+ *
+ * Test that when activeLaunchModeChanged event is fired, launch bar has
+ * a stable/correct state.
+ *
+ * Verifies that when "activeLaunchModeChanged" event is fired, all active
+ * fields in launch bar manager are up-to-date
+ *
+ * @throws CoreException
+ */
+ @Test
+ public void launchBarStateTest_LaunchModeChanged() throws CoreException {
+ // Dummy listener to collect data from the launch bar
+ AtomicReference>> launchBarState = new AtomicReference<>();
+ launchBarState.set(new ArrayList<>());
+ ILaunchBarListener launchBarListener = createLaunchBarListener(launchBarState);
+ // Add initial active value to launch bar
+ launchBarManagerMock.launchObjectAdded(launchObject_no1);
+ ILaunchTarget target_no1 = targetManagerMock.getLaunchTarget(targetTypeId, targetId_no1);
+ launchBarManagerMock.setActiveLaunchTarget(target_no1);
+ // Add launch bar listener and start test
+ launchBarManagerMock.addListener(launchBarListener);
+ // Change active mode
+ launchBarManagerMock.setActiveLaunchMode(launchManagerMock.getLaunchMode(runMode));
+ // Launch bar state should be:
+ // launch descriptor: launchObject_no1
+ // launch target: targetId_no1
+ // launch mode: Run
+ for (var stateMap : launchBarState.get()) {
+ assertEquals(launchObject_no1, ((ILaunchDescriptor) stateMap.get(attr_activeDesc)).getName());
+ assertEquals(targetId_no1, ((ILaunchTarget) stateMap.get(attr_activeTarget)).getId());
+ assertEquals(runMode, ((ILaunchMode) stateMap.get(attr_activeMode)).getIdentifier());
+ }
+ }
+
private ILaunchDescriptor createLaunchDescriptorMock(Object launchObject) throws CoreException {
ILaunchDescriptorType descriptorType = mock(ILaunchDescriptorType.class);
ILaunchDescriptor descriptor = mock(ILaunchDescriptor.class);
@@ -506,7 +639,7 @@ private ILaunchConfigurationType createLaunchConfigType(String launchConfigTypeI
}
private ILaunchConfigurationProvider creatLaunchConfigProvier(ILaunchConfigurationType launchConfigType,
- ILaunchDescriptor desc, String preferredMode) throws CoreException {
+ ILaunchDescriptor desc, String preferredMode, String supportTargetTypeId) throws CoreException {
ILaunchConfigurationProvider configProvider = mock(ILaunchConfigurationProvider.class);
ILaunchConfiguration launchConfig = mock(ILaunchConfiguration.class);
doReturn(launchConfig).when(configProvider).getLaunchConfiguration(eq(desc), any(ILaunchTarget.class));
@@ -515,7 +648,8 @@ private ILaunchConfigurationProvider creatLaunchConfigProvier(ILaunchConfigurati
doReturn(launchConfig).when(desc).getAdapter(ILaunchConfiguration.class);
doAnswer(invocation -> {
ILaunchTarget target = (ILaunchTarget) invocation.getArguments()[1];
- return target.getTypeId().equals(ILaunchTargetManager.localLaunchTargetTypeId);
+ return target.getTypeId().equals(supportTargetTypeId)
+ || target.getTypeId().equals(ILaunchTargetManager.localLaunchTargetTypeId);
}).when(configProvider).supports(eq(desc), any(ILaunchTarget.class));
doReturn(preferredMode).when(configProvider).getPreferredLaunchModeId(eq(desc), any(ILaunchTarget.class));
return configProvider;
@@ -542,13 +676,26 @@ private IConfigurationElement createConfigElementMockForConfigProvider(String de
private ILaunchTargetManager createLaunchTargetManagerMock() {
ILaunchTargetManager targetManager = mock(ILaunchTargetManager.class);
- ILaunchTarget localTarget = mock(ILaunchTarget.class);
- doReturn(ILaunchTargetManager.localLaunchTargetTypeId).when(localTarget).getTypeId();
- doReturn("Local").when(localTarget).getId(); //$NON-NLS-1$
- doReturn(new ILaunchTarget[] { localTarget }).when(targetManager).getLaunchTargets();
+ ILaunchTarget localTarget = createLaunchTargetMock(ILaunchTargetManager.localLaunchTargetTypeId, "Local");//$NON-NLS-1$
+ ILaunchTarget dummyTarget_no1 = createLaunchTargetMock(targetTypeId, targetId_no1);
+ ILaunchTarget dummyTarget_no2 = createLaunchTargetMock(targetTypeId, targetId_no2);
+ doReturn(new ILaunchTarget[] { localTarget, dummyTarget_no1, dummyTarget_no2 }).when(targetManager)
+ .getLaunchTargets();
+ doReturn(localTarget).when(targetManager).getLocalLaunchTarget();
+ doReturn(localTarget).when(targetManager).getLaunchTarget(ILaunchTargetManager.localLaunchTargetTypeId,
+ "Local");
+ doReturn(dummyTarget_no1).when(targetManager).getLaunchTarget(targetTypeId, targetId_no1);
+ doReturn(dummyTarget_no2).when(targetManager).getLaunchTarget(targetTypeId, targetId_no2);
return targetManager;
}
+ private ILaunchTarget createLaunchTargetMock(String typeId, String id) {
+ ILaunchTarget localTarget = mock(ILaunchTarget.class);
+ doReturn(typeId).when(localTarget).getTypeId();
+ doReturn(id).when(localTarget).getId(); //$NON-NLS-1$
+ return localTarget;
+ }
+
private ILaunchManager createLaunchManagerMock(Map launchConfigTypes,
String... supportModes) throws CoreException {
ILaunchManager launchManager = mock(ILaunchManager.class);
@@ -593,6 +740,40 @@ private ILaunchMode createLaunchModeMock(String identifier) {
return mode;
}
+ /**
+ * @param launchBarState variable to collect data
+ */
+ private ILaunchBarListener createLaunchBarListener(AtomicReference>> launchBarState) {
+ return new ILaunchBarListener() {
+ @Override
+ public void activeLaunchDescriptorChanged(ILaunchDescriptor descriptor) {
+ Map state = new HashMap<>();
+ state.put(attr_activeDesc, descriptor);
+ state.put(attr_activeTarget, launchBarManagerMock.getActiveLaunchTarget());
+ state.put(attr_activeMode, launchBarManagerMock.getActiveLaunchMode());
+ launchBarState.get().add(state);
+ }
+
+ @Override
+ public void activeLaunchModeChanged(ILaunchMode mode) {
+ Map state = new HashMap<>();
+ state.put(attr_activeDesc, launchBarManagerMock.getActiveLaunchDescriptor());
+ state.put(attr_activeTarget, launchBarManagerMock.getActiveLaunchTarget());
+ state.put(attr_activeMode, mode);
+ launchBarState.get().add(state);
+ }
+
+ @Override
+ public void activeLaunchTargetChanged(ILaunchTarget target) {
+ Map state = new HashMap<>();
+ state.put(attr_activeDesc, launchBarManagerMock.getActiveLaunchDescriptor());
+ state.put(attr_activeTarget, target);
+ state.put(attr_activeMode, launchBarManagerMock.getActiveLaunchMode());
+ launchBarState.get().add(state);
+ }
+ };
+ }
+
// TODO - test that changing active target type produces a different launch
// config type
// TODO - test that settings are maintained after a restart
diff --git a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index 5f4935e223e..212d445830a 100644
--- a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.100.qualifier
Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.34.0,4.0.0)",
diff --git a/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java b/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
index e17b9c63881..09019f6da09 100644
--- a/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
+++ b/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
@@ -496,12 +496,12 @@ public void setActiveLaunchDescriptor(ILaunchDescriptor descriptor) throws CoreE
doSetActiveLaunchDescriptor(descriptor);
// store in persistent storage
storeActiveDescriptor(activeLaunchDesc);
- // Send notifications
- fireActiveLaunchDescriptorChanged();
// Set active target
syncActiveTarget();
// Set active mode
syncActiveMode();
+ // Send notifications
+ fireActiveLaunchDescriptorChanged();
}
private void doSetActiveLaunchDescriptor(ILaunchDescriptor descriptor) {