svn commit: r768218 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/state/NameSet.java test/java/org/apache/jackrabbit/core/state/NameSetTest.java test/java/org/apache/jackrabbit/core/state/TestAll.java

[mr...@apache.org]

Author: mreutegg
Date: Fri Apr 24 08:11:44 2009
New Revision: 768218

URL: http://svn.apache.org/viewvc?rev=768218&view=rev
Log:
JCR-2081: NameSet does not implement equals(Object) and hashCode() methods

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NameSet.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NameSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NameSet.java?rev=768218&r1=768217&r2=768218&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NameSet.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NameSet.java Fri Apr 24 08:11:44 2009
@@ -226,6 +226,26 @@
         throw new UnsupportedOperationException();
     }
 
+    //--------------------------------------------------< equals and hashCode >
+
+    /**
+     * {@inheritDoc}
+     */
+    public int hashCode() {
+        return names.hashCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof NameSet) {
+            NameSet other = (NameSet) obj;
+            return this.names.equals(other.names);
+        }
+        return false;
+    }
+
     //----------------------------------------------------< Cloneable support >
 
     /**

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java?rev=768218&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java Fri Apr 24 08:11:44 2009
@@ -0,0 +1,53 @@
+/*
+ * 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.core.state;
+
+import org.apache.jackrabbit.spi.NameFactory;
+import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
+
+import junit.framework.TestCase;
+
+/**
+ * <code>NameSetTest</code> checks if equals and hashCode semantics are correct
+ * on {@link NameSet}.
+ */
+public class NameSetTest extends TestCase {
+
+    private static final NameFactory FACTORY = NameFactoryImpl.getInstance();
+
+    private static final String NAME_STRING = "{}foo";
+
+    public void testEquals() {
+        NameSet set1 = new NameSet();
+        NameSet set2 = new NameSet();
+        assertEquals(set1, set2);
+
+        set1.add(FACTORY.create(NAME_STRING));
+        set2.add(FACTORY.create(NAME_STRING));
+        assertEquals(set1, set2);
+    }
+
+    public void testHashCode() {
+        NameSet set1 = new NameSet();
+        NameSet set2 = new NameSet();
+        assertEquals(set1.hashCode(), set2.hashCode());
+
+        set1.add(FACTORY.create(NAME_STRING));
+        set2.add(FACTORY.create(NAME_STRING));
+        assertEquals(set1.hashCode(), set2.hashCode());
+    }
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/NameSetTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java?rev=768218&r1=768217&r2=768218&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/TestAll.java Fri Apr 24 08:11:44 2009
@@ -38,6 +38,7 @@
         suite.addTestSuite(ChangeLogTest.class);
         suite.addTestSuite(DefaultISMLockingTest.class);
         suite.addTestSuite(FineGrainedISMLockingTest.class);
+        suite.addTestSuite(NameSetTest.class);
 
         return suite;
     }