Merge branch 'subgraph-test' of github.com:ankurdave/graphx into clean1

Conflicts:
	graph/src/main/scala/org/apache/spark/graph/impl/VertexPartition.scala

1 files changed, 11 insertions, 0 deletions

diff --git a/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala b/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala
index 47b98cfd80..2a040de7fe 100644
--- a/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala
+++ b/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala
@@ -134,4 +134,15 @@ class GraphSuite extends FunSuite with LocalSparkContext {
     }
   }
 
+  test("subgraph") {
+    withSpark(new SparkContext("local", "test")) { sc =>
+      val n = 10
+      val star = Graph(sc.parallelize((1 to n).map(x => (0: Vid, x: Vid))), "defaultValue")
+      val subgraph = star.subgraph(vpred = (vid, attr) => vid % 2 == 0)
+      assert(subgraph.vertices.collect().toSet ===
+        (0 to n / 2).map(x => (x * 2, "defaultValue")).toSet)
+      assert(subgraph.edges.collect().toSet === (1 to n / 2).map(x => Edge(0, x * 2)).toSet)
+    }
+  }
+
 }