Fix for MID-1917 (user photo disappearing)

Evolveum · Apr 12, 2015 · cea10af · cea10af
1 parent e733078
commit cea10af
Show file tree

Hide file tree

Showing 8 changed files with 388 additions and 2 deletions.
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/UserPhotoTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/UserPhotoTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2010-2015 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.evolveum.midpoint.repo.sql;
+
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.delta.ObjectDelta;
+import com.evolveum.midpoint.prism.util.PrismTestUtil;
+import com.evolveum.midpoint.schema.DeltaConvertor;
+import com.evolveum.midpoint.schema.GetOperationOptions;
+import com.evolveum.midpoint.schema.MidPointPrismContextFactory;
+import com.evolveum.midpoint.schema.RetrieveOption;
+import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
+import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectModificationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.fail;
+
+/**
+ * @author mederly
+ */
+@ContextConfiguration(locations = {"../../../../../ctx-test.xml"})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
+public class UserPhotoTest extends BaseSQLRepoTest {
+
+    private static final File TEST_DIR = new File("src/test/resources/photo");
+    private static final File USER_FILE = new File(TEST_DIR, "user.xml");
+    private static final File T001_ADD_EMPLOYEE_TYPE = new File(TEST_DIR, "t001-add-employeeType.xml");
+    private static final File T002_REMOVE_PHOTO = new File(TEST_DIR, "t002-remove-photo.xml");
+    private static final File T003_RE_ADD_PHOTO = new File(TEST_DIR, "t003-re-add-photo.xml");
+    private static final File T004_CHANGE_PHOTO = new File(TEST_DIR, "t004-change-photo.xml");
+
+    private String userOid;
+
+    @BeforeClass
+    public void beforeClass() throws Exception {
+        super.beforeClass();
+
+        PrismTestUtil.resetPrismContext(MidPointPrismContextFactory.FACTORY);
+    }
+
+    @Test
+    public void test010Add() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test010Add");
+
+        PrismObject<UserType> user = PrismTestUtil.parseObject(USER_FILE);
+        userOid = repositoryService.addObject(user, null, result);
+
+        checkObject(userOid, USER_FILE, result);
+        checkObjectNoPhoto(userOid, USER_FILE, result);
+    }
+
+    @Test
+    public void test020ModifyUser() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test020ModifyUser");
+
+        ObjectDelta delta = parseDelta(userOid, T001_ADD_EMPLOYEE_TYPE);
+
+        repositoryService.modifyObject(UserType.class, userOid, delta.getModifications(), result);
+        checkObject(userOid, USER_FILE, result, delta);
+    }
+
+    @Test
+    public void test030RemovePhoto() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test030RemovePhoto");
+
+        ObjectDelta delta1 = parseDelta(userOid, T001_ADD_EMPLOYEE_TYPE);
+        ObjectDelta delta2 = parseDelta(userOid, T002_REMOVE_PHOTO);
+
+        repositoryService.modifyObject(UserType.class, userOid, delta2.getModifications(), result);
+        checkObject(userOid, USER_FILE, result, delta1, delta2);
+    }
+
+    @Test
+    public void test040ReAddPhoto() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test040ReAddPhoto");
+
+        ObjectDelta delta1 = parseDelta(userOid, T001_ADD_EMPLOYEE_TYPE);
+        ObjectDelta delta2 = parseDelta(userOid, T002_REMOVE_PHOTO);
+        ObjectDelta delta3 = parseDelta(userOid, T003_RE_ADD_PHOTO);
+
+        repositoryService.modifyObject(UserType.class, userOid, delta3.getModifications(), result);
+        checkObject(userOid, USER_FILE, result, delta1, delta2, delta3);
+    }
+
+    @Test
+    public void test050ChangePhoto() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test050ReplacePhoto");
+
+        ObjectDelta delta1 = parseDelta(userOid, T001_ADD_EMPLOYEE_TYPE);
+        ObjectDelta delta2 = parseDelta(userOid, T002_REMOVE_PHOTO);
+        ObjectDelta delta3 = parseDelta(userOid, T003_RE_ADD_PHOTO);
+        ObjectDelta delta4 = parseDelta(userOid, T004_CHANGE_PHOTO);
+
+        repositoryService.modifyObject(UserType.class, userOid, delta4.getModifications(), result);
+        checkObject(userOid, USER_FILE, result, delta1, delta2, delta3, delta4);
+    }
+
+    /**
+     * Checks that after removing a user the photo is removed as well.
+     */
+    @Test
+    public void test099DeleteUser() throws Exception {
+        OperationResult result = new OperationResult(UserPhotoTest.class.getName() + ".test099DeleteUser");
+
+        repositoryService.deleteObject(UserType.class, userOid, result);
+
+        PrismObject<UserType> user = PrismTestUtil.parseObject(USER_FILE);
+        user.asObjectable().setJpegPhoto(null);
+        String oid = repositoryService.addObject(user, null, result);
+        assertEquals("Oid was changed", userOid, oid);
+
+        checkObject(userOid, user, true, result);       // there should be no photo there
+    }
+
+    protected ObjectDelta<UserType> parseDelta(String oid, File file) throws SchemaException, IOException {
+        ObjectModificationType modification = PrismTestUtil.parseAtomicValue(file, ObjectModificationType.COMPLEX_TYPE);
+        ObjectDelta<UserType> delta = DeltaConvertor.createObjectDelta(modification, UserType.class, prismContext);
+        delta.setOid(oid);
+        return delta;
+    }
+
+    private void checkObject(String oid, File file, OperationResult result) throws SchemaException, IOException, ObjectNotFoundException {
+        PrismObject<UserType> expected = PrismTestUtil.parseObject(file);
+        checkObject(oid, expected, true, result);
+    }
+
+    private void checkObjectNoPhoto(String oid, File file, OperationResult result) throws SchemaException, IOException, ObjectNotFoundException {
+        PrismObject<UserType> expected = PrismTestUtil.parseObject(file);
+        expected.asObjectable().setJpegPhoto(null);
+        checkObject(oid, expected, false, result);
+    }
+
+    private void checkObject(String oid, PrismObject<UserType> expected, boolean loadPhoto, OperationResult result) throws ObjectNotFoundException, SchemaException {
+        Collection<SelectorOptions<GetOperationOptions>> options;
+        if (loadPhoto) {
+            options = Arrays.asList(SelectorOptions.create(UserType.F_JPEG_PHOTO, GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
+        } else {
+            options = null;
+        }
+        PrismObject<UserType> real = repositoryService.getObject(UserType.class, oid, options, result);
+        ObjectDelta<UserType> delta = expected.diff(real);
+        System.out.println("Expected object = \n" + expected.debugDump());
+        System.out.println("Real object in repo = \n" + real.debugDump());
+        System.out.println("Difference = \n" + delta.debugDump());
+        if (!delta.isEmpty()) {
+            fail("Objects are not equal.\n*** Expected:\n" + expected.debugDump() + "\n*** Got:\n" + real.debugDump() + "\n*** Delta:\n" + delta.debugDump());
+        }
+    }
+
+    private void checkObject(String oid, File file, OperationResult result, ObjectDelta<UserType>... appliedDeltas) throws SchemaException, IOException, ObjectNotFoundException {
+        PrismObject<UserType> expected = PrismTestUtil.parseObject(file);
+        for (ObjectDelta<UserType> delta : appliedDeltas) {
+            delta.applyTo(expected);
+        }
+        checkObject(oid, expected, true, result);
+    }
+}
diff --git a/repo/repo-sql-impl-test/src/test/resources/photo/t001-add-employeeType.xml b/repo/repo-sql-impl-test/src/test/resources/photo/t001-add-employeeType.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<objectModification
+        xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'
+        xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <oid>48174916-4137-9830-4442-654354808381</oid>
+    <itemDelta>
+        <t:modificationType>add</t:modificationType>
+        <t:path>c:employeeNumber</t:path>
+        <t:value>en1234</t:value>
+    </itemDelta>
+</objectModification>
diff --git a/repo/repo-sql-impl-test/src/test/resources/photo/t002-remove-photo.xml b/repo/repo-sql-impl-test/src/test/resources/photo/t002-remove-photo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<objectModification
+        xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'
+        xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <oid>48174916-4137-9830-4442-654354808381</oid>
+    <itemDelta>
+        <t:modificationType>replace</t:modificationType>
+        <t:path>jpegPhoto</t:path>
+    </itemDelta>
+</objectModification>
diff --git a/repo/repo-sql-impl-test/src/test/resources/photo/t003-re-add-photo.xml b/repo/repo-sql-impl-test/src/test/resources/photo/t003-re-add-photo.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<objectModification
+        xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'
+        xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <oid>48174916-4137-9830-4442-654354808381</oid>
+    <itemDelta>
+        <t:modificationType>replace</t:modificationType>
+        <t:path>jpegPhoto</t:path>
+        <t:value>/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAIBAQIBAQICAgICAgICAwUDAwMDAwYEBAMFBwYHBwcGBwcICQsJCAgKCAcHCg0KCgsMDAwMBwkODw0MDgsMDAz/2wBDAQICAgMDAwYDAwYMCAcIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAgACADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKACiiigAooooAKKKKAP/2Q==</t:value>
+    </itemDelta>
+</objectModification>
diff --git a/repo/repo-sql-impl-test/src/test/resources/photo/t004-change-photo.xml b/repo/repo-sql-impl-test/src/test/resources/photo/t004-change-photo.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<objectModification
+        xmlns='http://midpoint.evolveum.com/xml/ns/public/common/api-types-3'
+        xmlns:c='http://midpoint.evolveum.com/xml/ns/public/common/common-3'
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <oid>48174916-4137-9830-4442-654354808381</oid>
+    <itemDelta>
+        <t:modificationType>replace</t:modificationType>
+        <t:path>jpegPhoto</t:path>
+        <t:value>/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAIBAQIBAQICAgICAgICAwUDAwMDAwYEBAMFBwYHBwcGBwcICQsJCAgKCAcHCg0KCgsMDAwMBwkODw0MDgsMDAz/2wBDAQICAgMDAwYDAwYMCAcIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAEAAQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKAP/2Q==</t:value>
+    </itemDelta>
+</objectModification>
diff --git a/repo/repo-sql-impl-test/src/test/resources/photo/user.xml b/repo/repo-sql-impl-test/src/test/resources/photo/user.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<user xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+      xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
+        oid="48174916-4137-9830-4442-654354808381">
+    <name>guybrushhh</name>
+    <fullName>
+        <t:orig>Guybrush Threepwood</t:orig>
+        <t:norm>guybrush threepwood</t:norm>
+    </fullName>
+    <givenName>
+        <t:orig>Guybrush</t:orig>
+        <t:norm>guybrush</t:norm>
+    </givenName>
+    <familyName>
+        <t:orig>Threepwood</t:orig>
+        <t:norm>threepwood</t:norm>
+    </familyName>
+    <jpegPhoto>/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAIBAQIBAQICAgICAgICAwUDAwMDAwYEBAMFBwYHBwcGBwcICQsJCAgKCAcHCg0KCgsMDAwMBwkODw0MDgsMDAz/2wBDAQICAgMDAwYDAwYMCAcIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAgACADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9/KKKKACiiigAooooAKKKKAP/2Q==</jpegPhoto>
+</user>