Bug 571561: [Element Types] Simple rule configuration refactorings

- add refactoring actions for rule-based element type rules
- account for non-containment of NotRuleConfiguration::composedRule (bug 571560)

Change-Id: Ie32f0524429801ca0ccbc6b91863403161c74f7e
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>

6 files changed, 471 insertions, 47 deletions

diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath
index e801ebfb468..e54abfc9d66 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/papyrus/infra/types/core/internal/ui/handlers/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
index 7fca087d880..a1e4f625c94 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,13 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)
  org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)",
  org.junit;bundle-version="[4.13.0,5.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="5.0.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.types.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.7.100,4.0.0)",
+ org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)",
+ org.eclipse.papyrus.infra.types.editor;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)"
 Export-Package: org.eclipse.papyrus.infra.types.ui.tests
 Bundle-Vendor: %providerName
@@ -19,3 +25,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui.tests;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.infra.types.ui.tests
+Import-Package: com.google.common.base;version="[30.1.0,31.0.0)"
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
index 2a532c13af5..414b4ddd276 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.ui.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.ui.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m "/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="true"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="true"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+    <booleanAttribute key="default" value="true"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.ui.tests.AllTests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.ui.tests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+    <booleanAttribute key="run_in_ui_thread" value="true"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <booleanAttribute key="useProduct" value="true"/>
 </launchConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/RuleRefactoringHandlerTest.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/RuleRefactoringHandlerTest.java
new file mode 100644
index 00000000000..2e31f944d8f
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/RuleRefactoringHandlerTest.java
@@ -0,0 +1,396 @@
+/*****************************************************************************
+ * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Christian W. Damus - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.types.core.internal.ui.handlers.tests;
+
+import static org.eclipse.papyrus.junit.matchers.MoreMatchers.eEqualTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.net.URL;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.emf.common.ui.URIEditorInput;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.internal.ui.handlers.RuleRefactoringHandler.OperationKind;
+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedSwitch;
+import org.eclipse.papyrus.junit.utils.rules.AnnotationRule;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ISources;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test cases for the rule refactoring handlers.
+ */
+public class RuleRefactoringHandlerTest {
+
+	@Rule
+	public final AnnotationRule<OperationKind> refactoringKind = AnnotationRule.create(Refactoring.class, null);
+
+	private String commandID;
+
+	private IEditorPart editor;
+	private EditingDomain domain;
+	private ElementTypeSetConfiguration fixture;
+	private ElementTypeSetConfiguration originalState;
+	private ElementTypeSetConfiguration newState;
+	private RuleBasedTypeConfiguration type;
+	private RuleConfiguration rule;
+	private boolean skipUndoRedo;
+	private ECrossReferenceAdapter xrefs;
+
+	public RuleRefactoringHandlerTest() {
+		super();
+	}
+
+	@Refactoring(OperationKind.NEGATE)
+	@Test
+	public void negate() {
+		execute(rule);
+
+		NotRuleConfiguration notRule = getNegatingRule(rule);
+		assertThat("Rule not negated", notRule, notNullValue());
+
+		if (RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION__COMPOSED_RULE.isContainment()) {
+			assertThat("Rule lost in space", rule.eContainer().eContainer(), sameInstance(type));
+		}
+	}
+
+	@Refactoring(OperationKind.NEGATE)
+	@Test
+	public void negate_notRule() {
+		NotRuleConfiguration notRule = wrapInNot();
+
+		execute(notRule);
+
+		assertThat("Rule not negated", rule.eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.NEGATE)
+	@Test
+	public void negate_negatedRule() {
+		NotRuleConfiguration notRule = wrapInNot();
+
+		if (!RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION__COMPOSED_RULE.isContainment()) {
+			// The not rule detached the object, so put it in the resource for the handler to find
+			// the editing domain context. cf. bug 571560
+			notRule.eResource().getContents().add(rule);
+		}
+
+		execute(rule);
+
+		assertThat("Rule not negated", rule.eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.ADD_TO_AND)
+	@Test
+	public void addToAnd() {
+		execute(rule);
+
+		assertThat("Rule not wrapped in 'and'", rule.eContainer(), instanceOf(AndRuleConfiguration.class));
+		assertThat("Rule lost in space", rule.eContainer().eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.ADD_TO_AND)
+	@Test
+	public void alreadyInAnd() {
+		wrapInAnd();
+
+		assertDisabled(rule);
+	}
+
+	@Refactoring(OperationKind.ADD_TO_OR)
+	@Test
+	public void addToOr() {
+		execute(rule);
+
+		assertThat("Rule not wrapped in 'or'", rule.eContainer(), instanceOf(OrRuleConfiguration.class));
+		assertThat("Rule lost in space", rule.eContainer().eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.ADD_TO_OR)
+	@Test
+	public void alreadyInOr() {
+		wrapInOr();
+
+		assertDisabled(rule);
+	}
+
+	@Refactoring(OperationKind.PULL_UP_OPERAND)
+	@Test
+	public void pullUpAnd() {
+		AndRuleConfiguration andRule = wrapInAnd();
+
+		execute(andRule);
+
+		assertThat("And rule not elided", rule.eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.PULL_UP_OPERAND)
+	@Test
+	public void pullUpAndMultiple() {
+		AndRuleConfiguration andRule = wrapInAnd();
+		andRule.getComposedRules().add(RuleBasedFactory.eINSTANCE.createNotRuleConfiguration());
+
+		assertDisabled(andRule);
+	}
+
+	@Refactoring(OperationKind.PULL_UP_OPERAND)
+	@Test
+	public void pullUpOr() {
+		OrRuleConfiguration orRule = wrapInOr();
+
+		execute(orRule);
+
+		assertThat("Or", rule.eContainer(), sameInstance(type));
+	}
+
+	@Refactoring(OperationKind.PULL_UP_OPERAND)
+	@Test
+	public void pullUpOrMultiple() {
+		OrRuleConfiguration orRule = wrapInOr();
+		orRule.getComposedRules().add(RuleBasedFactory.eINSTANCE.createNotRuleConfiguration());
+
+		assertDisabled(orRule);
+	}
+
+	@Refactoring(OperationKind.PULL_UP_OPERAND)
+	@Test
+	public void pullUpNot() {
+		NotRuleConfiguration notRule = wrapInNot();
+
+		assertDisabled(notRule);
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void createHandler() throws CoreException {
+		switch (refactoringKind.get()) {
+		case NEGATE:
+			commandID = "org.eclipse.papyrus.infra.types.ui.commands.negateRule"; //$NON-NLS-1$
+			break;
+		case ADD_TO_AND:
+			commandID = "org.eclipse.papyrus.infra.types.ui.commands.addToAndRule"; //$NON-NLS-1$
+			break;
+		case ADD_TO_OR:
+			commandID = "org.eclipse.papyrus.infra.types.ui.commands.addToOrRule"; //$NON-NLS-1$
+			break;
+		case PULL_UP_OPERAND:
+			commandID = "org.eclipse.papyrus.infra.types.ui.commands.pullUpOperandRule"; //$NON-NLS-1$
+			break;
+		}
+	}
+
+	@Before
+	public void loadFixture() throws PartInitException, IOException {
+		// Ensure a file: URI so that the editing domain doesn't think it's read-only,
+		// which would then result in no commands being executable
+		URL url = FileLocator.toFileURL(RuleRefactoringHandlerTest.class.getResource("test.elementtypesconfigurations"));
+		URI uri = URI.createURI(url.toExternalForm(), true);
+
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null) {
+			window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
+		}
+
+		editor = window.getActivePage().openEditor(new URIEditorInput(uri), "org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditorID");
+		domain = ((IEditingDomainProvider) editor).getEditingDomain();
+
+		Resource resource = domain.getResourceSet().getResource(uri, true);
+		fixture = (ElementTypeSetConfiguration) resource.getContents().get(0);
+		type = (RuleBasedTypeConfiguration) fixture.getElementTypeConfigurations().get(0);
+		rule = type.getRuleConfiguration();
+
+		originalState = EcoreUtil.copy(fixture);
+
+		xrefs = new ECrossReferenceAdapter();
+		domain.getResourceSet().eAdapters().add(xrefs);
+	}
+
+	@After
+	public void undoAndRedo() {
+		try {
+			if (!skipUndoRedo) {
+				undo();
+				redo();
+			}
+		} finally {
+			if (editor != null) {
+				editor.getEditorSite().getPage().closeEditor(editor, false);
+			}
+		}
+	}
+
+	<T extends RuleConfiguration> T updateInitialState(BiFunction<? super RuleBasedTypeConfiguration, ? super RuleConfiguration, T> update) {
+		T result = update.apply(type, rule);
+		originalState = EcoreUtil.copy(fixture);
+		return result;
+	}
+
+	NotRuleConfiguration wrapInNot() {
+		return compose(RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION);
+	}
+
+	AndRuleConfiguration wrapInAnd() {
+		return compose(RuleBasedPackage.Literals.AND_RULE_CONFIGURATION);
+	}
+
+	OrRuleConfiguration wrapInOr() {
+		return compose(RuleBasedPackage.Literals.OR_RULE_CONFIGURATION);
+	}
+
+	<T extends RuleConfiguration> T compose(EClass compositeType) {
+		@SuppressWarnings("unchecked")
+		T result = (T) updateInitialState((type, rule) -> {
+			return new RuleBasedSwitch<RuleConfiguration>() {
+				@Override
+				public RuleConfiguration caseNotRuleConfiguration(NotRuleConfiguration object) {
+					object.setComposedRule(rule);
+					type.setRuleConfiguration(object);
+					return object;
+				}
+
+				@Override
+				public RuleConfiguration caseCompositeRuleConfiguration(CompositeRuleConfiguration object) {
+					object.getComposedRules().add(rule);
+					type.setRuleConfiguration(object);
+					return object;
+				}
+			}.doSwitch(RuleBasedFactory.eINSTANCE.create(compositeType));
+		});
+		return result;
+	}
+
+	void execute(RuleConfiguration rule) {
+		// In case execution fails, there will be no point in testing undo/redo after the fact
+		skipUndoRedo = true;
+
+		IStructuredSelection selection = new StructuredSelection(rule);
+		((ISelectionProvider) editor).setSelection(selection);
+
+		ICommandService commandService = editor.getSite().getService(ICommandService.class);
+		Command command = commandService.getCommand(commandID);
+
+		IEvaluationContext context = new EvaluationContext(null, selection);
+		context.addVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME, selection);
+		ExecutionEvent event = new ExecutionEvent(command, Map.of(), this, context);
+
+		assertThat("Cannot execute refactoring handler", command.isEnabled(), is(true));
+		try {
+			command.executeWithChecks(event);
+		} catch (NotDefinedException | NotEnabledException | NotHandledException | ExecutionException e) {
+			throw new AssertionError("Failed to execute refactoring handler", e);
+		}
+
+		// This test will perform the undo/redo assertion after the fact
+		skipUndoRedo = false;
+
+		newState = EcoreUtil.copy(fixture);
+	}
+
+	void assertDisabled(RuleConfiguration rule) {
+		// This test will skip the undo/redo assertion after the fact
+		skipUndoRedo = true;
+
+		IStructuredSelection selection = new StructuredSelection(rule);
+		((ISelectionProvider) editor).setSelection(selection);
+
+		ICommandService commandService = editor.getSite().getService(ICommandService.class);
+		Command command = commandService.getCommand(commandID);
+
+		assertThat("Can execute refactoring handler", command.isEnabled(), is(false));
+	}
+
+	void undo() {
+		assertThat("Cannot undo refactoring command", domain.getCommandStack().canUndo(), is(true));
+		domain.getCommandStack().undo();
+
+		assertThat("Undo did not revert to original state", fixture, eEqualTo(originalState));
+	}
+
+	void redo() {
+		assertThat("Cannot redo refactoring command", domain.getCommandStack().canRedo(), is(true));
+		domain.getCommandStack().redo();
+
+		assertThat("Redo did not restore to new state", fixture, eEqualTo(newState));
+	}
+
+	NotRuleConfiguration getNegatingRule(RuleConfiguration rule) {
+		return xrefs.getInverseReferences(rule, RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION__COMPOSED_RULE, true).stream()
+				.map(EStructuralFeature.Setting::getEObject)
+				.map(NotRuleConfiguration.class::cast)
+				.findFirst()
+				.orElse(null);
+	}
+
+	//
+	// Nested types
+	//
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	public @interface Refactoring {
+		OperationKind value();
+	}
+
+}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/test.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/test.elementtypesconfigurations
new file mode 100644
index 00000000000..8aea208a39a
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/tests/test.elementtypesconfigurations
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:invariantcontainerrule="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1" xmlns:rulebased="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1" xmi:id="_vsk9QHkMEeutlP5NaIjAJg" identifier="org.eclipse.papyrus.infra.types.ui.tests.Set" name="Test Fixture" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_2TOhIHkMEeutlP5NaIjAJg" identifier="org.eclipse.papyrus.infra.types.ui.tests.type" name="Test Type" hint="" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <ruleConfiguration xmi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_61_hsHkMEeutlP5NaIjAJg">
+      <permissions xmi:type="invariantcontainerrule:HierarchyPermission" xmi:id="_72XZkHkMEeutlP5NaIjAJg" containerType="uml.Package" permitted="true"/>
+    </ruleConfiguration>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java
index 560333c92ba..28ab15104b2 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
- * 
+ * Copyright (c) 2010, 2021 CEA LIST, Christian W. Damus, and others.
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -10,11 +10,12 @@
  *
  * Contributors:
  *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *  
+ *  Christian W. Damus - bugs 485220, 571561
+ *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.types.ui.tests;
 
+import org.eclipse.papyrus.infra.types.core.internal.ui.handlers.tests.RuleRefactoringHandlerTest;
 import org.eclipse.papyrus.infra.types.tests.ElementTypesRegistryTests;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.junit.runner.RunWith;
@@ -25,7 +26,10 @@ import org.junit.runners.Suite.SuiteClasses;
  * All tests for this fragment
  */
 @RunWith(ClassificationSuite.class)
-@SuiteClasses({ ElementTypesRegistryTests.class })
+@SuiteClasses({
+		ElementTypesRegistryTests.class,
+		RuleRefactoringHandlerTest.class,
+})
 public class AllTests {
 
 }