Refactored due to is-model constant name change
This commit is contained in:
parent
05279d72fa
commit
83deeb649b
|
@ -281,9 +281,9 @@ public class ERManagementTest extends ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> additionalProperties = new HashMap<>(consistsOf.getAdditionalProperties());
|
Map<String, Object> additionalProperties = new HashMap<>(consistsOf.getAdditionalProperties());
|
||||||
additionalProperties.remove(Element.SUPERCLASSES_PROPERTY);
|
additionalProperties.remove(Element.SUPERTYPES_PROPERTY);
|
||||||
Map<String, Object> gotAdditionalProperties = new HashMap<>(gotConsistsOf.getAdditionalProperties());
|
Map<String, Object> gotAdditionalProperties = new HashMap<>(gotConsistsOf.getAdditionalProperties());
|
||||||
gotAdditionalProperties.remove(Element.SUPERCLASSES_PROPERTY);
|
gotAdditionalProperties.remove(Element.SUPERTYPES_PROPERTY);
|
||||||
Assert.assertTrue(additionalProperties.size()==gotAdditionalProperties.size());
|
Assert.assertTrue(additionalProperties.size()==gotAdditionalProperties.size());
|
||||||
for(String key : additionalProperties.keySet()) {
|
for(String key : additionalProperties.keySet()) {
|
||||||
Assert.assertTrue(gotAdditionalProperties.containsKey(key));
|
Assert.assertTrue(gotAdditionalProperties.containsKey(key));
|
||||||
|
|
|
@ -34,8 +34,8 @@ public class InvalidOperationTest extends ERManagementTest {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(InvalidOperationTest.class);
|
private static Logger logger = LoggerFactory.getLogger(InvalidOperationTest.class);
|
||||||
|
|
||||||
public static final String ACTIVATES = "{\"propagationConstraint\":{\"" + Element.CLASS_PROPERTY + "\":\"PropagationConstraint\",\"add\":\"propagate\",\"remove\":\"cascade\",\"delete\":\"cascade\"},\"" + Element.CLASS_PROPERTY + "\":\"Activates\",\"source\":{\"" + Element.CLASS_PROPERTY + "\":\"Configuration\",\"uuid\":\"CONFIGURATION_UUID\"},\"target\":{\"uuid\":\"ESERVICE_UUID\",\"" + Element.CLASS_PROPERTY + "\":\"EService\"}}";
|
public static final String ACTIVATES = "{\"propagationConstraint\":{\"" + Element.TYPE_PROPERTY + "\":\"PropagationConstraint\",\"add\":\"propagate\",\"remove\":\"cascade\",\"delete\":\"cascade\"},\"" + Element.TYPE_PROPERTY + "\":\"Activates\",\"source\":{\"" + Element.TYPE_PROPERTY + "\":\"Configuration\",\"uuid\":\"CONFIGURATION_UUID\"},\"target\":{\"uuid\":\"ESERVICE_UUID\",\"" + Element.TYPE_PROPERTY + "\":\"EService\"}}";
|
||||||
public static final String ACTOR = "{\"" + Element.CLASS_PROPERTY + "\":\"Actor\",\"metadata\":null,\"consistsOf\":[{\"" + Element.CLASS_PROPERTY + "\":\"IsIdentifiedBy\",\"metadata\":null,\"propagationConstraint\":{\"" + Element.CLASS_PROPERTY + "\":\"PropagationConstraint\",\"remove\":\"cascade\",\"delete\":\"cascade\",\"add\":\"propagate\"},\"source\":{\"" + Element.CLASS_PROPERTY + "\":\"Actor\",\"metadata\":null},\"target\":{\"" + Element.CLASS_PROPERTY + "\":\"ContactFacet\",\"metadata\":null,\"title\":\"Dr.\",\"name\":\"Frosini\",\"middleName\":null,\"surname\":null,\"eMail\":\"luca.frosini@isti.cnr.it\"}}],\"isRelatedTo\":[]}";
|
public static final String ACTOR = "{\"" + Element.TYPE_PROPERTY + "\":\"Actor\",\"metadata\":null,\"consistsOf\":[{\"" + Element.TYPE_PROPERTY + "\":\"IsIdentifiedBy\",\"metadata\":null,\"propagationConstraint\":{\"" + Element.TYPE_PROPERTY + "\":\"PropagationConstraint\",\"remove\":\"cascade\",\"delete\":\"cascade\",\"add\":\"propagate\"},\"source\":{\"" + Element.TYPE_PROPERTY + "\":\"Actor\",\"metadata\":null},\"target\":{\"" + Element.TYPE_PROPERTY + "\":\"ContactFacet\",\"metadata\":null,\"title\":\"Dr.\",\"name\":\"Frosini\",\"middleName\":null,\"surname\":null,\"eMail\":\"luca.frosini@isti.cnr.it\"}}],\"isRelatedTo\":[]}";
|
||||||
|
|
||||||
@Test(expected = SchemaViolationException.class)
|
@Test(expected = SchemaViolationException.class)
|
||||||
public void createInvalidIsRealtedTo() throws Exception {
|
public void createInvalidIsRealtedTo() throws Exception {
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue