[481731] Have LockedTabBarTest unregister permissionProviderDescriptor

- This allows to have
PropertyViewOnModelExplorerSelectionWithLockedObjectTest test pass in
the suite.

Bug: 481731
Change-Id: I7620ce55f5c6d42470f882c43bb3590d89368144
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
(cherry picked from commit c90732ceb6fc490bac8f91b865979bf1a6fee8a8)

1 files changed, 15 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/LockedTabBarTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/LockedTabBarTest.java
index 6c7c158827..12f6246307 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/LockedTabBarTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/LockedTabBarTest.java
@@ -20,6 +20,7 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.ExtenderConstants
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionProvider;
 import org.eclipse.sirius.ecore.extender.business.api.permission.PermissionAuthorityRegistry;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.DefaultPermissionProvider;
+import org.eclipse.sirius.ecore.extender.business.internal.permission.PermissionProviderDescriptor;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.PermissionService;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.ReadOnlyPermissionAuthority;
 import org.eclipse.sirius.ecore.extender.business.internal.permission.descriptors.StandalonePermissionProviderDescriptor;
@@ -97,6 +98,8 @@ public class LockedTabBarTest extends AbstractSiriusSwtBotGefTestCase {
 
     private SWTBotSiriusDiagramEditor editor;
 
+    private PermissionProviderDescriptor permissionProviderDescriptor;
+
     @Override
     protected void onSetUpBeforeClosingWelcomePage() throws Exception {
         copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL, SESSION_FILE, VSM_FILE);
@@ -190,8 +193,8 @@ public class LockedTabBarTest extends AbstractSiriusSwtBotGefTestCase {
     private void initCustomPermissionAuthority() {
         ReadOnlyPermissionAuthority readOnlyPermissionAuthority = new ReadOnlyPermissionAuthority();
         IPermissionProvider permissionProvider = new DefaultPermissionProvider(readOnlyPermissionAuthority);
-        StandalonePermissionProviderDescriptor permissionProviderDescriptor = new StandalonePermissionProviderDescriptor("org.eclipse.sirius.tree.tests.forbiddenPermissionAuthorityProvider",
-                ExtenderConstants.HIGHEST_PRIORITY, permissionProvider);
+        permissionProviderDescriptor = new StandalonePermissionProviderDescriptor("org.eclipse.sirius.tree.tests.forbiddenPermissionAuthorityProvider", ExtenderConstants.HIGHEST_PRIORITY,
+                permissionProvider);
         PermissionService.addExtension(permissionProviderDescriptor);
     }
 
@@ -281,12 +284,21 @@ public class LockedTabBarTest extends AbstractSiriusSwtBotGefTestCase {
         SWTBotUtils.waitAllUiEvents();
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        PermissionService.removeExtension(permissionProviderDescriptor);
+        permissionProviderDescriptor = null;
+        editor = null;
+        localSession = null;
+        sessionAirdResource = null;
+        super.tearDown();
+    }
+
     /**
      * A matcher that returns all {@link MenuItem}s except the ones having the
      * given tooltip.
      * 
      * @author alagarde
-     * 
      */
     private static final class AllItemsExcept extends BaseMatcher<MenuItem> {