429826: [Read-Only] Orthogonal Classification of Read-Only Concerns

https://bugs.eclipse.org/bugs/show_bug.cgi?id=429826

Add classification of orthogonal axes of concern to the API for read-only queries.

2 files changed, 13 insertions, 11 deletions

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManagerTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManagerTest.java
index 585d7e5309f..d8d7623db63 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManagerTest.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReadOnlyManagerTest.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
 import org.eclipse.papyrus.junit.utils.rules.ProjectFixture;
 import org.eclipse.uml2.uml.Model;
 import org.junit.After;
@@ -55,27 +56,27 @@ public class ReadOnlyManagerTest {
 	@Test
 	public void testIsReadOnlyEObject() {
 		setReadOnly(project.getFile(model.eResource().getURI()));
-		assertThat(fixture.isReadOnly(model).or(false), is(true));
+		assertThat(fixture.isReadOnly(ReadOnlyAxis.anyAxis(), model).or(false), is(true));
 	}
 
 	@Test
 	public void testCanMakeWritableEObject() {
 		setReadOnly(project.getFile(model.eResource().getURI()));
-		assertThat(fixture.canMakeWritable(model).or(false), is(true));
+		assertThat(fixture.canMakeWritable(ReadOnlyAxis.anyAxis(), model).or(false), is(true));
 	}
 
 	@Test
 	public void testAnyReadOnlyURIs() {
 		URI uri = model.eResource().getURI();
 		setReadOnly(project.getFile(uri));
-		assertThat(fixture.anyReadOnly(new URI[]{ uri }).or(false), is(true));
+		assertThat(fixture.anyReadOnly(ReadOnlyAxis.anyAxis(), new URI[]{ uri }).or(false), is(true));
 	}
 
 	@Test
 	public void testCanMakeWritableURIs() {
 		URI uri = model.eResource().getURI();
 		setReadOnly(project.getFile(uri));
-		assertThat(fixture.canMakeWritable(new URI[]{ uri }).or(false), is(true));
+		assertThat(fixture.canMakeWritable(ReadOnlyAxis.anyAxis(), new URI[]{ uri }).or(false), is(true));
 	}
 
 	//
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReferencedModelReadOnlyHandlerTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReferencedModelReadOnlyHandlerTest.java
index 6f638990388..b8bd67a125b 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReferencedModelReadOnlyHandlerTest.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/ReferencedModelReadOnlyHandlerTest.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.papyrus.infra.emf.readonly;
 
+import static org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis.discretionAxes;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -124,8 +125,8 @@ public class ReferencedModelReadOnlyHandlerTest {
 	public void testCrossReferencedWorkspaceModelElementsMadeWritable() {
 		Property ssn = person.getAttribute("ssn", null);
 		assumeReadOnly(ssn.getType());
-		assertThat(fixture.canMakeWritable(ssn.getType()).or(false), is(true));
-		assertThat(fixture.makeWritable(ssn.getType()).or(false), is(true));
+		assertThat(fixture.canMakeWritable(discretionAxes(), ssn.getType()).or(false), is(true));
+		assertThat(fixture.makeWritable(discretionAxes(), ssn.getType()).or(false), is(true));
 		assertNotReadOnly(ssn.getType());
 		assertNotReadOnly(person.getAttribute("registered", null).getType());
 	}
@@ -174,8 +175,8 @@ public class ReferencedModelReadOnlyHandlerTest {
 	public void testObjectURIsWithFragment() {
 		Property ssn = person.getAttribute("ssn", null);
 		URI uri = EcoreUtil.getURI(ssn);
-		assertThat(fixture.anyReadOnly(new URI[]{ uri }).or(false), is(false));
-		assertThat(fixture.canMakeWritable(new URI[]{ uri }).or(true), is(false));
+		assertThat(fixture.anyReadOnly(discretionAxes(), new URI[]{ uri }).or(false), is(false));
+		assertThat(fixture.canMakeWritable(discretionAxes(), new URI[]{ uri }).or(true), is(false));
 	}
 	
 	//
@@ -310,17 +311,17 @@ public class ReferencedModelReadOnlyHandlerTest {
 	}
 
 	void assertReadOnly(EObject object) {
-		Optional<Boolean> status = fixture.isReadOnly(object);
+		Optional<Boolean> status = fixture.isReadOnly(discretionAxes(), object);
 		assertThat("Not read-only", status.or(false), is(true));
 	}
 
 	void assertNotReadOnly(EObject object) {
-		Optional<Boolean> status = fixture.isReadOnly(object);
+		Optional<Boolean> status = fixture.isReadOnly(discretionAxes(), object);
 		assertThat("Should not be either read-only or definitely writable", status.isPresent(), is(false));
 	}
 
 	void assumeReadOnly(EObject object) {
-		Optional<Boolean> status = fixture.isReadOnly(object);
+		Optional<Boolean> status = fixture.isReadOnly(discretionAxes(), object);
 		assumeThat("Not read-only", status.or(false), is(true));
 	}