incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1451551 - /sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
Date Fri, 01 Mar 2013 10:08:06 GMT
Author: cziegeler
Date: Fri Mar  1 10:08:06 2013
New Revision: 1451551

URL: http://svn.apache.org/r1451551
Log:
SLING-2761 : JcrResourceProvider.create should filter protected properties

Added:
    sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
  (with props)

Added: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java?rev=1451551&view=auto
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
(added)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
Fri Mar  1 10:08:06 2013
@@ -0,0 +1,255 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.sling.jcr.resource.internal;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeType;
+
+import org.apache.jackrabbit.util.Text;
+import org.apache.sling.api.resource.ModifiableValueMap;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
+import org.apache.sling.jcr.resource.JcrResourceUtil;
+
+public class JcrModifiableValueMapTest extends RepositoryTestBase {
+
+    private String rootPath;
+
+    private Node rootNode;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        rootPath = "/test_" + System.currentTimeMillis();
+        rootNode = getSession().getRootNode().addNode(rootPath.substring(1),
+            "nt:unstructured");
+
+        final Map<String, Object> values = this.initialSet();
+        for(Map.Entry<String, Object> entry : values.entrySet()) {
+            JcrResourceUtil.setProperty(rootNode, entry.getKey().toString(), entry.getValue());
+        }
+        getSession().save();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (rootNode != null) {
+            rootNode.remove();
+            getSession().save();
+        }
+        super.tearDown();
+    }
+
+    private Map<String, Object> initialSet() {
+        final Map<String, Object> values = new HashMap<String, Object>();
+        values.put("string", "test");
+        values.put("long", 1L);
+        values.put("bool", Boolean.TRUE);
+        return values;
+    }
+
+    public void testPut()
+    throws Exception {
+        getSession().refresh(false);
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(this.rootNode, null);
+        assertContains(pvm, initialSet());
+        assertNull(pvm.get("something"));
+
+        // now put two values and check set again
+        pvm.put("something", "Another value");
+        pvm.put("string", "overwrite");
+
+        final Map<String, Object> currentlyStored = this.initialSet();
+        currentlyStored.put("something", "Another value");
+        currentlyStored.put("string", "overwrite");
+        assertContains(pvm, currentlyStored);
+
+        getSession().save();
+        assertContains(pvm, currentlyStored);
+
+        final ModifiableValueMap pvm2 = new JcrModifiableValueMap(this.rootNode, null);
+        assertContains(pvm2, currentlyStored);
+    }
+
+    public void testSerializable()
+    throws Exception {
+        this.rootNode.getSession().refresh(false);
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(this.rootNode, null);
+        assertContains(pvm, initialSet());
+        assertNull(pvm.get("something"));
+
+        // now put a serializable object
+        final List<String> strings = new ArrayList<String>();
+        strings.add("a");
+        strings.add("b");
+        pvm.put("something", strings);
+
+        // check if we get the list again
+        @SuppressWarnings("unchecked")
+        final List<String> strings2 = (List<String>) pvm.get("something");
+        assertEquals(strings, strings2);
+
+        getSession().save();
+
+        final ModifiableValueMap pvm2 = new JcrModifiableValueMap(this.rootNode, null);
+        // check if we get the list again
+        @SuppressWarnings("unchecked")
+        final List<String> strings3 = (List<String>) pvm2.get("something", Serializable.class);
+        assertEquals(strings, strings3);
+
+    }
+
+    public void testExceptions() throws Exception {
+        this.rootNode.getSession().refresh(false);
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(this.rootNode, null);
+        try {
+            pvm.put(null, "something");
+            fail("Put with null key");
+        } catch (NullPointerException iae) {}
+        try {
+            pvm.put("something", null);
+            fail("Put with null value");
+        } catch (NullPointerException iae) {}
+        try {
+            pvm.put("something", pvm);
+            fail("Put with non serializable");
+        } catch (IllegalArgumentException iae) {}
+    }
+
+    private Set<String> getMixinNodeTypes(final Node node) throws RepositoryException
{
+        final Set<String> mixinTypes = new HashSet<String>();
+        for(final NodeType mixinNodeType : node.getMixinNodeTypes() ) {
+            mixinTypes.add(mixinNodeType.getName());
+        }
+        return mixinTypes;
+    }
+
+    public void testMixins() throws Exception {
+        this.rootNode.getSession().refresh(false);
+        final Node testNode = this.rootNode.addNode("testMixins" + System.currentTimeMillis());
+        testNode.getSession().save();
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(testNode, null);
+
+        final String[] types = pvm.get("jcr:mixinTypes", String[].class);
+        final Set<String> exNodeTypes = getMixinNodeTypes(testNode);
+
+        assertEquals(exNodeTypes.size(), (types == null ? 0 : types.length));
+        if ( types != null ) {
+            for(final String name : types) {
+                assertTrue(exNodeTypes.contains(name));
+            }
+            String[] newTypes = new String[types.length + 1];
+            System.arraycopy(types, 0, newTypes, 0, types.length);
+            newTypes[types.length] = "mix:referenceable";
+            pvm.put("jcr:mixinTypes", newTypes);
+        } else {
+            pvm.put("jcr:mixinTypes", "mix:referenceable");
+        }
+        getSession().save();
+
+        final Set<String> newNodeTypes = getMixinNodeTypes(testNode);
+        assertEquals(newNodeTypes.size(), exNodeTypes.size() + 1);
+    }
+
+    private static final String TEST_PATH = "a<a";
+
+    private static final String VALUE = "value";
+    private static final String VALUE1 = "value";
+    private static final String VALUE2 = "value";
+    private static final String VALUE3 = "my title";
+    private static final String PROP1 = "-prop";
+    private static final String PROP2 = "1prop";
+    private static final String PROP3 = "jcr:title";
+
+    public void testNamesReverse() throws Exception {
+        this.rootNode.getSession().refresh(false);
+
+        final Node testNode = this.rootNode.addNode("nameTest" + System.currentTimeMillis());
+        testNode.getSession().save();
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(testNode, null);
+        pvm.put(TEST_PATH, VALUE);
+        pvm.put(PROP1, VALUE1);
+        pvm.put(PROP2, VALUE2);
+        pvm.put(PROP3, VALUE3);
+        getSession().save();
+
+        // read with property map
+        final ValueMap vm = new JcrModifiableValueMap(testNode, null);
+        assertEquals(VALUE, vm.get(TEST_PATH));
+        assertEquals(VALUE1, vm.get(PROP1));
+        assertEquals(VALUE2, vm.get(PROP2));
+        assertEquals(VALUE3, vm.get(PROP3));
+
+        // read properties
+        assertEquals(VALUE, testNode.getProperty(TEST_PATH).getString());
+        assertEquals(VALUE1, testNode.getProperty(PROP1).getString());
+        assertEquals(VALUE2, testNode.getProperty(PROP2).getString());
+        assertEquals(VALUE3, testNode.getProperty(PROP3).getString());
+    }
+
+    /**
+     * Checks property names encoding, see SLING-2502.
+     */
+    public void testNamesUpdate() throws Exception {
+        this.rootNode.getSession().refresh(false);
+
+        final Node testNode = this.rootNode.addNode("nameUpdateTest"
+                + System.currentTimeMillis());
+        testNode.setProperty(PROP3, VALUE);
+        testNode.getSession().save();
+
+        final ModifiableValueMap pvm = new JcrModifiableValueMap(testNode, null);
+        pvm.put(PROP3, VALUE3);
+        pvm.put("jcr:a:b", VALUE3);
+        pvm.put("jcr:", VALUE3);
+        getSession().save();
+
+        // read with property map
+        final ValueMap vm = new JcrModifiableValueMap(testNode, null);
+        assertEquals(VALUE3, vm.get(PROP3));
+        assertEquals(VALUE3, vm.get("jcr:a:b"));
+        assertEquals(VALUE3, vm.get("jcr:"));
+
+        // read properties
+        assertEquals(VALUE3, testNode.getProperty(PROP3).getString());
+        assertEquals(VALUE3, testNode.getProperty("jcr:"+Text.escapeIllegalJcrChars("a:b")).getString());
+        assertEquals(VALUE3, testNode.getProperty(Text.escapeIllegalJcrChars("jcr:")).getString());
+        assertFalse(testNode.hasProperty(Text.escapeIllegalJcrChars(PROP3)));
+        assertFalse(testNode.hasProperty(Text.escapeIllegalJcrChars("jcr:a:b")));
+    }
+
+    /**
+     * Check that the value map contains all supplied values
+     */
+    private void assertContains(ValueMap map, Map<String, Object> values) {
+        for(Map.Entry<String, Object> entry : values.entrySet()) {
+            final Object stored = map.get(entry.getKey());
+            assertEquals(values.get(entry.getKey()), stored);
+        }
+    }
+}

Propchange: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrModifiableValueMapTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message