svn commit: r1719869 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java

[mr...@apache.org]

Author: mreutegg
Date: Mon Dec 14 09:23:43 2015
New Revision: 1719869

URL: http://svn.apache.org/viewvc?rev=1719869&view=rev
Log:
OAK-3763: EmptyNodeState.equals() broken

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java   (with props)
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java?rev=1719869&r1=1719868&r2=1719869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeState.java Mon Dec 14 09:23:43 2015
@@ -186,7 +186,8 @@ public final class EmptyNodeState implem
         } else if (object instanceof NodeState) {
             NodeState that = (NodeState) object;
             return that.getPropertyCount() == 0
-                    && that.getChildNodeCount(1) == 0;
+                    && that.getChildNodeCount(1) == 0
+                    && (exists == that.exists());
         } else {
             return false;
         }

Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java?rev=1719869&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java Mon Dec 14 09:23:43 2015
@@ -0,0 +1,57 @@
+/*
+ * 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.jackrabbit.oak.plugins.memory;
+
+import java.util.HashMap;
+
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class EmptyNodeStateTest {
+
+    @Test
+    public void emptyEqualsMissing() {
+        NodeState empty = EmptyNodeState.EMPTY_NODE;
+        NodeState missing = new ModifiedNodeState(
+                EmptyNodeState.MISSING_NODE,
+                new HashMap<String, PropertyState>(),
+                new HashMap<String, MutableNodeState>());
+        assertTrue(empty.exists());
+        assertFalse(missing.exists());
+        assertFalse(missing.equals(empty));
+        assertFalse(empty.equals(missing));
+    }
+
+    @Test
+    public void missingEqualsModified() {
+        NodeState empty = new ModifiedNodeState(
+                EmptyNodeState.EMPTY_NODE,
+                new HashMap<String, PropertyState>(),
+                new HashMap<String, MutableNodeState>());
+        NodeState missing = EmptyNodeState.MISSING_NODE;
+        assertTrue(empty.exists());
+        assertFalse(missing.exists());
+        assertFalse(missing.equals(empty));
+        assertFalse(empty.equals(missing));
+    }
+}

Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/EmptyNodeStateTest.java
------------------------------------------------------------------------------
    svn:eol-style = native