Author: hasan
Date: Fri May 7 18:38:05 2010
New Revision: 942171
URL: http://svn.apache.org/viewvc?rev=942171&view=rev
Log:
CLEREZZA-209: fixed equals method of GraphNode
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java?rev=942171&r1=942170&r2=942171&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
Fri May 7 18:38:05 2010
@@ -607,7 +607,7 @@ public class GraphNode {
*/
@Override
public boolean equals(Object obj) {
- if (!(obj.getClass().equals(getClass()))) {
+ if (obj == null || !(obj.getClass().equals(getClass()))) {
return false;
}
GraphNode other = (GraphNode)obj;
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java?rev=942171&r1=942170&r2=942171&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
Fri May 7 18:38:05 2010
@@ -245,6 +245,20 @@ public class TestGraphNode {
Assert.assertTrue(node.getGraph().contains(expectedTriple11));
}
+ @Test
+ public void equality() {
+ MGraph g = new SimpleMGraph();
+ BNode bNode1 = new BNode() {};
+ BNode bNode2 = new BNode() {};
+ UriRef property1 = new UriRef("http://example.org/property1";);
+ GraphNode n = new GraphNode(bNode1, g);
+ n.addProperty(property1, bNode2);
+ Assert.assertTrue(n.equals(new GraphNode(bNode1, g)));
+ Assert.assertFalse(n.equals(new GraphNode(bNode2, g)));
+ GraphNode n2 = null;
+ Assert.assertFalse(n.equals(n2));
+ }
+
private Set<Resource> createSet(Iterator<? extends Resource> resources)
{
Set<Resource> set = new HashSet<Resource>();
while (resources.hasNext()) {
