svn commit: r1653809 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java

[mr...@apache.org]

Author: mreutegg
Date: Thu Jan 22 10:52:46 2015
New Revision: 1653809

URL: http://svn.apache.org/r1653809
Log:
OAK-2435: UpdateOp.Key.equals() incorrect

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java   (with props)
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1653809&r1=1653808&r2=1653809&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java Thu Jan 22 10:52:46 2015
@@ -368,7 +368,7 @@ public final class UpdateOp {
             if (obj instanceof Key) {
                 Key other = (Key) obj;
                 return name.equals(other.name) &&
-                        revision != null ? revision.equals(other.revision) : other.revision == null;
+                        (revision != null ? revision.equals(other.revision) : other.revision == null);
             }
             return false;
         }

Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java?rev=1653809&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/UpdateOpTest.java Thu Jan 22 10:52:46 2015
@@ -0,0 +1,61 @@
+/*
+ * 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.document;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for UpdateOp
+ */
+public class UpdateOpTest {
+
+    @Test
+    public void keyEquals() {
+        Revision r1 = Revision.newRevision(1);
+        Revision r2 = Revision.newRevision(1);
+
+        UpdateOp.Key k1 = new UpdateOp.Key("foo", null);
+        UpdateOp.Key k2 = new UpdateOp.Key("bar", null);
+        assertFalse(k1.equals(k2));
+        assertFalse(k2.equals(k1));
+
+        UpdateOp.Key k3 = new UpdateOp.Key("foo", null);
+        assertTrue(k1.equals(k3));
+        assertTrue(k3.equals(k1));
+        
+        UpdateOp.Key k4 = new UpdateOp.Key("foo", r1);
+        assertFalse(k4.equals(k3));
+        assertFalse(k3.equals(k4));
+        
+        UpdateOp.Key k5 = new UpdateOp.Key("foo", r2);
+        assertFalse(k5.equals(k4));
+        assertFalse(k4.equals(k5));
+        
+        UpdateOp.Key k6 = new UpdateOp.Key("foo", r1);
+        assertTrue(k6.equals(k4));
+        assertTrue(k4.equals(k6));
+
+        UpdateOp.Key k7 = new UpdateOp.Key("bar", r1);
+        assertFalse(k7.equals(k6));
+        assertFalse(k6.equals(k7));
+    }
+
+    
+}

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