Skip to content
Browse files

Fixed #377 -- PropertyFilteredIterable is no longer a type requiremen…

…t. Cherry picked to 2.4.0-SNAPSHOT.
  • Loading branch information...
1 parent 8b49a3e commit 952b051ff917fcf56d82ca270b214f2a4b980487 @okram okram committed Mar 30, 2013
View
15 CHANGELOG.textile
@@ -5,6 +5,21 @@ h2. Blueprints 2.y.z
!https://github.com/tinkerpop/blueprints/raw/master/doc/images/blueprints-2.png!
+h3. Version 2.3.2 (NOT OFFICIALLY RELEASED YET)
+
+```xml
+<dependency>
+ <groupId>com.tinkerpop.blueprints</groupId>
+ <artifactId>blueprints-core</artifactId>
+ <version>2.3.2-SNAPSHOT</version>
+</dependency>
+```
+
+* Updated @KeyIndexableGraph@ test suite to ensure no requirement on returned @Iterable@ type
+
+
+==<hr/>==
+
h3. Version 2.3.0 (March 20, 2013)
```xml
View
7 blueprints-test/src/main/java/com/tinkerpop/blueprints/KeyIndexableGraphTestSuite.java
@@ -1,7 +1,6 @@
package com.tinkerpop.blueprints;
import com.tinkerpop.blueprints.impls.GraphTest;
-import com.tinkerpop.blueprints.util.PropertyFilteredIterable;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -136,25 +135,19 @@ public void testReIndexingOfElements() {
if (graph.getFeatures().supportsVertexKeyIndex) {
Vertex vertex = graph.addVertex(null);
vertex.setProperty("name", "marko");
- if (!graph.getFeatures().isWrapper)
- assertTrue(graph.getVertices("name", "marko") instanceof PropertyFilteredIterable);
assertEquals(count(graph.getVertices("name", "marko")), 1);
assertEquals(graph.getVertices("name", "marko").iterator().next(), vertex);
graph.createKeyIndex("name", Vertex.class);
- assertFalse(graph.getVertices("name", "marko") instanceof PropertyFilteredIterable);
assertEquals(count(graph.getVertices("name", "marko")), 1);
assertEquals(graph.getVertices("name", "marko").iterator().next(), vertex);
}
if (graph.getFeatures().supportsEdgeKeyIndex) {
Edge edge = graph.addEdge(null, graph.addVertex(null), graph.addVertex(null), "knows");
edge.setProperty("date", 2012);
- if (!graph.getFeatures().isWrapper)
- assertTrue(graph.getEdges("date", 2012) instanceof PropertyFilteredIterable);
assertEquals(count(graph.getEdges("date", 2012)), 1);
assertEquals(graph.getEdges("date", 2012).iterator().next(), edge);
graph.createKeyIndex("date", Edge.class);
- assertFalse(graph.getEdges("date", 2012) instanceof PropertyFilteredIterable);
assertEquals(count(graph.getEdges("date", 2012)), 1);
assertEquals(graph.getEdges("date", 2012).iterator().next(), edge);
}

0 comments on commit 952b051

Please sign in to comment.
Something went wrong with that request. Please try again.