Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Aug 8, 2017
2 parents 1f3048b + 036d44c commit 31cb73a
Show file tree
Hide file tree
Showing 5 changed files with 415 additions and 24 deletions.
10 changes: 8 additions & 2 deletions infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
View file
Expand Up @@ -132,6 +132,9 @@ <T> T unmarshal(@NotNull XNode xnode, @NotNull Class<T> beanClass, @NotNull Pars
}

private <T> T unmarshalInternal(@NotNull XNode xnode, @NotNull Class<T> beanClass, @NotNull ParsingContext pc) throws SchemaException {
if (beanClass == null) {
throw new IllegalStateException("No bean class for node: " + xnode.debugDump());
}
if (xnode instanceof RootXNode) {
XNode subnode = ((RootXNode) xnode).getSubnode();
if (subnode == null) {
Expand Down Expand Up @@ -163,8 +166,11 @@ private <T> T unmarshalInternal(@NotNull XNode xnode, @NotNull Class<T> beanClas
}
} else {

if (beanClass.getPackage().getName().equals("java.lang")) {
// We obviously have primitive data type, but we have are asked to unmarshall from map xnode
if (beanClass.getPackage() == null || beanClass.getPackage().getName().equals("java.lang")) {
// We obviously have primitive data type, but we are asked to unmarshall from map xnode
// NOTE: this may happen in XML when we have "empty" element, but it has some whitespace in it
// such as those troublesome newlines. This also happens if there is "empty" element
// but it contains an expression (so it is not PrimitiveXNode but MapXNode).
// TODO: more robust implementation
// TODO: look for "value" subnode with primitive value and try that.
// This is most likely attempt to parse primitive value with dynamic expression.
Expand Down
114 changes: 96 additions & 18 deletions infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2013 Evolveum
* Copyright (c) 2010-2017 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -72,6 +72,16 @@
public class TestParseDiffPatch {

private static final String TEST_DIR = "src/test/resources/diff/";

private static final File USER_BEFORE_FILE = new File(TEST_DIR, "user-before.xml");
private static final File USER_AFTER_FILE = new File(TEST_DIR, "user-after.xml");
private static final File TASK_BEFORE_FILE = new File(TEST_DIR, "task-before.xml");
private static final File TASK_AFTER_FILE = new File(TEST_DIR, "task-after.xml");
private static final File RESOURCE_BEFORE_FILE = new File(TEST_DIR, "resource-before.xml");
private static final File RESOURCE_AFTER_FILE = new File(TEST_DIR, "resource-after.xml");
private static final File RESOURCE_AFTER_CONST_FILE = new File(TEST_DIR, "resource-after-const.xml");
private static final File RESOURCE_AFTER_NS_CHANGE_FILE = new File(TEST_DIR, "resource-after-ns-change.xml");
private static final String RESOURCE_OID = "ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff";

@BeforeSuite
public void setup() throws SchemaException, SAXException, IOException {
Expand All @@ -83,11 +93,9 @@ public void setup() throws SchemaException, SAXException, IOException {
public void testUserCredentialsDiff() throws Exception {
System.out.println("===[ testUserCredentialsDiff ]===");

PrismObject<UserType> userBefore = PrismTestUtil.parseObject(
new File(TEST_DIR, "user-before.xml"));
PrismObject<UserType> userBefore = PrismTestUtil.parseObject(USER_BEFORE_FILE);
userBefore.checkConsistence();
PrismObject<UserType> userAfter = PrismTestUtil.parseObject(
new File(TEST_DIR, "user-after.xml"));
PrismObject<UserType> userAfter = PrismTestUtil.parseObject(USER_AFTER_FILE);
userAfter.checkConsistence();

ObjectDelta<UserType> userDelta = userBefore.diff(userAfter);
Expand All @@ -113,8 +121,7 @@ public void testUserCredentialsDiff() throws Exception {
public void testAssignmentActivationDiff() throws Exception {
System.out.println("===[ testUserCredentialsDiff ]===");

PrismObject<UserType> userBefore = PrismTestUtil.parseObject(
new File(TEST_DIR, "user-before.xml"));
PrismObject<UserType> userBefore = PrismTestUtil.parseObject(USER_BEFORE_FILE);
PrismObject<UserType> userAfter = userBefore.clone();
AssignmentType assignmentBefore = new AssignmentType();
ActivationType activation = new ActivationType();
Expand Down Expand Up @@ -333,7 +340,7 @@ public void testTask() throws SchemaException, SAXException, IOException, JAXBEx

// WHEN

ObjectDelta<TaskType> diffDelta = DiffUtil.diff(new File(TEST_DIR, "task-before.xml"),
ObjectDelta<TaskType> diffDelta = DiffUtil.diff(TASK_BEFORE_FILE,
new File(TEST_DIR, "task-after.xml"), TaskType.class, getPrismContext());

// THEN
Expand Down Expand Up @@ -368,7 +375,7 @@ public void testTask() throws SchemaException, SAXException, IOException, JAXBEx

// ROUNDTRIP

PrismObject<TaskType> taskPatch = PrismTestUtil.parseObject(new File(TEST_DIR, "task-before.xml"));
PrismObject<TaskType> taskPatch = PrismTestUtil.parseObject(TASK_BEFORE_FILE);
taskPatch.checkConsistence();

// patch
Expand All @@ -379,7 +386,7 @@ public void testTask() throws SchemaException, SAXException, IOException, JAXBEx

diffDelta.checkConsistence();
taskPatch.checkConsistence();
PrismObject<TaskType> taskAfter = PrismTestUtil.parseObject(new File(TEST_DIR, "task-after.xml"));
PrismObject<TaskType> taskAfter = PrismTestUtil.parseObject(TASK_AFTER_FILE);
taskAfter.checkConsistence();

assertTrue("Not equivalent",taskPatch.equivalent(taskAfter));
Expand All @@ -401,11 +408,11 @@ public void testTask() throws SchemaException, SAXException, IOException, JAXBEx
}

@Test
public void testResource() throws SchemaException, SAXException, IOException, JAXBException {
public void testResource() throws Exception {
System.out.println("===[ testResource ]===");

PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-before.xml"));
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-after.xml"));
PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(RESOURCE_BEFORE_FILE);
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(RESOURCE_AFTER_FILE);

resourceBefore.checkConsistence();
resourceAfter.checkConsistence();
Expand All @@ -427,7 +434,7 @@ public void testResource() throws SchemaException, SAXException, IOException, JA
resourceBefore.checkConsistence();
resourceAfter.checkConsistence();

assertEquals("Wrong delta OID", "ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff", resourceDelta.getOid());
assertEquals("Wrong delta OID", RESOURCE_OID, resourceDelta.getOid());
assertEquals("Wrong change type", ChangeType.MODIFY, resourceDelta.getChangeType());
Collection<? extends ItemDelta> modifications = resourceDelta.getModifications();
assertEquals("Unexpected number of modifications", 7, modifications.size());
Expand All @@ -447,6 +454,77 @@ public void testResource() throws SchemaException, SAXException, IOException, JA
resourceAfter.checkConsistence();
}

@Test
public void testResourceConst() throws Exception {
System.out.println("===[ testResourceConst ]===");

PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(RESOURCE_BEFORE_FILE);
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(RESOURCE_AFTER_CONST_FILE);

resourceBefore.checkConsistence();
resourceAfter.checkConsistence();

// sanity
assertFalse("Equals does not work", resourceBefore.equals(resourceAfter));

// WHEN

ObjectDelta<ResourceType> resourceDelta = resourceBefore.diff(resourceAfter);

// THEN

System.out.println("DELTA:");
System.out.println(resourceDelta.debugDump());

resourceDelta.checkConsistence();
resourceDelta.assertDefinitions(true);
resourceBefore.checkConsistence();
resourceAfter.checkConsistence();

assertEquals("Wrong delta OID", RESOURCE_OID, resourceDelta.getOid());
assertEquals("Wrong change type", ChangeType.MODIFY, resourceDelta.getChangeType());
Collection<? extends ItemDelta> modifications = resourceDelta.getModifications();
assertEquals("Unexpected number of modifications", 2, modifications.size());
assertConfigurationPropertyChange(resourceDelta, "host");
assertConfigurationPropertyChange(resourceDelta, "port");

resourceDelta.checkConsistence();
resourceBefore.checkConsistence();
resourceAfter.checkConsistence();
}

@Test
public void testResourceConstLiteral() throws Exception {
System.out.println("===[ testResourceConstLiteral ]===");

PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(RESOURCE_BEFORE_FILE);
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(RESOURCE_AFTER_CONST_FILE);

// WHEN

ObjectDelta<ResourceType> resourceDelta = resourceBefore.diff(resourceAfter, true, true);

// THEN

System.out.println("DELTA:");
System.out.println(resourceDelta.debugDump());

resourceDelta.checkConsistence();
resourceDelta.assertDefinitions(true);
resourceBefore.checkConsistence();
resourceAfter.checkConsistence();

assertEquals("Wrong delta OID", RESOURCE_OID, resourceDelta.getOid());
assertEquals("Wrong change type", ChangeType.MODIFY, resourceDelta.getChangeType());
Collection<? extends ItemDelta> modifications = resourceDelta.getModifications();
assertEquals("Unexpected number of modifications", 2, modifications.size());
assertConfigurationPropertyChange(resourceDelta, "host");
assertConfigurationPropertyChange(resourceDelta, "port");

resourceDelta.checkConsistence();
resourceBefore.checkConsistence();
resourceAfter.checkConsistence();
}

private void assertConfigurationPropertyChange(ObjectDelta<ResourceType> resourceDelta, String propName) {
resourceDelta.checkConsistence();
Expand All @@ -470,8 +548,8 @@ private ItemPath pathTimeouts(String last) {
public void testResourceRoundTrip() throws SchemaException, SAXException, IOException, JAXBException {
System.out.println("===[ testResourceRoundTrip ]===");

PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-before.xml"));
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-after.xml"));
PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(RESOURCE_BEFORE_FILE);
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(RESOURCE_AFTER_FILE);

resourceBefore.checkConsistence();
resourceAfter.checkConsistence();
Expand Down Expand Up @@ -538,8 +616,8 @@ public void testResourceRoundTrip() throws SchemaException, SAXException, IOExce
public void testResourceNsChange() throws SchemaException, SAXException, IOException, JAXBException {
System.out.println("===[ testResourceNsChange ]===");

PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-before.xml"));
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(new File(TEST_DIR, "resource-after-ns-change.xml"));
PrismObject<ResourceType> resourceBefore = PrismTestUtil.parseObject(RESOURCE_BEFORE_FILE);
PrismObject<ResourceType> resourceAfter = PrismTestUtil.parseObject(RESOURCE_AFTER_NS_CHANGE_FILE);

resourceBefore.checkConsistence();
resourceAfter.checkConsistence();
Expand Down

0 comments on commit 31cb73a

Please sign in to comment.