added a test in TestSuite for equaling null.

tinkerpop · Nov 1, 2011 · 699a462 · 699a462
1 parent ced219b
commit 699a462
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/blueprints-core/src/main/java/com/tinkerpop/blueprints/pgm/impls/tg/TinkerEdge.java b/blueprints-core/src/main/java/com/tinkerpop/blueprints/pgm/impls/tg/TinkerEdge.java
@@ -48,7 +48,7 @@ public String toString() {
     }
 
     public boolean equals(final Object object) {
-        return object instanceof TinkerEdge && ((TinkerEdge) object).getId().equals(this.getId());
+        return null != object && object instanceof TinkerEdge && ((TinkerEdge) object).getId().equals(this.getId());
     }
 
 }
diff --git a/blueprints-core/src/main/java/com/tinkerpop/blueprints/pgm/impls/tg/TinkerVertex.java b/blueprints-core/src/main/java/com/tinkerpop/blueprints/pgm/impls/tg/TinkerVertex.java
@@ -62,6 +62,6 @@ public String toString() {
     }
 
     public boolean equals(final Object object) {
-        return object instanceof TinkerVertex && ((TinkerVertex) object).getId().equals(this.getId());
+        return null != object && object instanceof TinkerVertex && ((TinkerVertex) object).getId().equals(this.getId());
     }
 }
diff --git a/blueprints-test/src/main/java/com/tinkerpop/blueprints/pgm/EdgeTestSuite.java b/blueprints-test/src/main/java/com/tinkerpop/blueprints/pgm/EdgeTestSuite.java
@@ -31,6 +31,7 @@ public void testEdgeEquality() {
         assertEquals(e, v.getOutEdges().iterator().next());
         assertEquals(e, u.getInEdges().iterator().next());
         assertEquals(v.getOutEdges().iterator().next(), u.getInEdges().iterator().next());
+        assertFalse(e.equals(null));
         Set<Edge> set = new HashSet<Edge>();
         set.add(e);
         set.add(e);

diff --git a/blueprints-test/src/main/java/com/tinkerpop/blueprints/pgm/VertexTestSuite.java b/blueprints-test/src/main/java/com/tinkerpop/blueprints/pgm/VertexTestSuite.java
@@ -42,6 +42,7 @@ public void testVertexEquality() {
         assertEquals(graph.getVertex(u.getId()), graph.getVertex(u.getId()));
         assertEquals(graph.getVertex(v.getId()), graph.getVertex(u.getId()));
         assertEquals(graph.getVertex(v.getId()), graph.getVertex(v.getId()));
+        assertFalse(v.equals(null));
 
         graph.clear();