list up all test cases for Process test suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/dad98bc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/dad98bc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/dad98bc9 Branch: refs/heads/master Commit: dad98bc99d3462b6a345a44aa82bae639e5e5270 Parents: bc50261 Author: DO YUNG YOON <[email protected]> Authored: Wed May 3 12:33:28 2017 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Wed May 3 12:33:28 2017 +0900 ---------------------------------------------------------------------- .../scala/org/apache/s2graph/core/S2Graph.scala | 143 +++++++++++++++++++ .../core/tinkerpop/S2GraphProvider.scala | 99 +++++++++++-- 2 files changed, 231 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/dad98bc9/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala index 7d673de..66a8d46 100644 --- a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala +++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala @@ -601,6 +601,149 @@ object S2Graph { // passed: all, failed: g_VX1X_repeatXbothEXcreatedX_whereXwithoutXeXX_aggregateXeX_otherVX_emit_path, g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX /* map */ +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals", method = "*", reason = "no"), +// passed: all, failed: g_V_both_both_count, g_V_repeatXoutX_timesX3X_count, g_V_repeatXoutX_timesX8X_count + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MapTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MapKeysTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MapValuesTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$CountMatchTraversals", method = "*", reason = "no"), +// passed: all, failed: g_V_matchXa__a_both_b__b_both_cX_dedupXa_bX, g_V_matchXa_both_b__b_both_cX_dedupXa_bX_byXlabelX, + //g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX + //g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest$GreedyMatchTraversals", method = "*", reason = "no"), +// passed: all, failed: g_V_matchXa__a_both_b__b_both_cX_dedupXa_bX, g_V_matchXa_both_b__b_both_cX_dedupXa_bX_byXlabelX, g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxTest$Traversals", method = "*", reason = "no"), +// passed: all, failed: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_maxX + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest$Traversals", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest$Traversals", method = "*", reason = "no"), +// passed: all, failed: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_minX + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SumTest$Traversals", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest$Traversals", method = "*", reason = "no"), +// passed: all, failed: g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name +// +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest$Traversals", method = "*", reason = "no"), +// failed: grateful_V_out_out_profileXmetricsX, g_V_repeat_both_profileXmetricsX, grateful_V_out_out_profile, g_V_repeat_both_profile + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexTest$Traversals", method = "*", reason = "no"), +// failed: g_VX4X_bothE_otherV, g_VX1_2_3_4X_name, g_V_out_outE_inV_inE_inV_both_name, g_VX4X_bothEXcreatedX, g_VX4X_both + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ValueMapTest$Traversals", method = "*", reason = "no"), +// passed: all + + /* sideEffect */ +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTest$Traversals", method = "*", reason = "no"), +// failed: g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX, g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTestV3d0$Traversals", method = "*", reason = "no"), +// failed: g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX, g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX, + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountTest$Traversals", method = "*", reason = "no"), +// failed: g_V_both_groupCountXaX_out_capXaX_selectXkeysX_unfold_both_groupCountXaX_capXaX, g_V_both_groupCountXaX_byXlabelX_asXbX_barrier_whereXselectXaX_selectXsoftwareX_isXgtX2XXX_selectXbX_name + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest$Traversals", method = "*", reason = "no"), +// passed: all + + // new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreTest$Traversals", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphTest$Traversals", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeTest$Traversals", method = "*", reason = "no"), +// passed: all + + + /* compliance */ +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest", method = "*", reason = "no"), +// passed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest", method = "*", reason = "no"), +// failed: shouldGenerateDefaultIdOnAddVWithSpecifiedId, shouldGenerateDefaultIdOnAddVWithGeneratedCustomId, shouldGenerateDefaultIdOnGraphAddVWithGeneratedDefaultId, +// shouldGenerateDefaultIdOnAddVWithGeneratedDefaultId, shouldGenerateDefaultIdOnGraphAddVWithGeneratedCustomId, shouldGenerateDefaultIdOnGraphAddVWithSpecifiedId + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ReadOnlyStrategyProcessTest", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest", method = "*", reason = "no"), +// failed: all + +// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategyProcessTest", method = "*", reason = "no"), +// failed: all /** Structure */ new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.EdgeTest$BasicEdgeTest", method="shouldValidateIdEquality", reason="reference equals on EdgeId is not supported."), http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/dad98bc9/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/S2GraphProvider.scala ---------------------------------------------------------------------- diff --git a/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/S2GraphProvider.scala b/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/S2GraphProvider.scala index 6ac12c8..fdd04af 100644 --- a/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/S2GraphProvider.scala +++ b/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/S2GraphProvider.scala @@ -55,6 +55,10 @@ object S2GraphProvider { ColumnMeta.findOrInsert(DefaultColumn.id.get, "status", "string", useCache = false) ColumnMeta.findOrInsert(DefaultColumn.id.get, "myId", "integer", useCache = false) ColumnMeta.findOrInsert(DefaultColumn.id.get, "acl", "string", useCache = false) + ColumnMeta.findOrInsert(DefaultColumn.id.get, "some", "string", useCache = false) + ColumnMeta.findOrInsert(DefaultColumn.id.get, "this", "string", useCache = false) + ColumnMeta.findOrInsert(DefaultColumn.id.get, "that", "string", useCache = false) + ColumnMeta.findOrInsert(DefaultColumn.id.get, "any", "string", useCache = false) } // Management.deleteLabel("_s2graph") @@ -65,8 +69,12 @@ object S2GraphProvider { } def cleanupSchema: Unit = { - val columnNames = Set(S2Graph.DefaultColumnName, "person", "software", "product", "dog") - val labelNames = Set(S2Graph.DefaultLabelName, "knows", "created", "bought", "test", "self", "friends", "friend", "hate", "collaborator", "test1", "test2", "test3", "pets", "walks", "hates", "link") + val columnNames = Set(S2Graph.DefaultColumnName, "person", "software", "product", "dog", + "animal", "song", "artist", "STEPHEN") + + val labelNames = Set(S2Graph.DefaultLabelName, "knows", "created", "bought", "test", "self", "friends", "friend", "hate", "collaborator", + "test1", "test2", "test3", "pets", "walks", "hates", "link", + "codeveloper", "createdBy", "existsWith", "writtenBy", "sungBy", "followedBy", "uses") columnNames.foreach { columnName => Management.deleteColumn(S2Graph.DefaultServiceName, columnName) @@ -91,12 +99,12 @@ class S2GraphProvider extends AbstractGraphProvider { if (graph != null) { val s2Graph = graph.asInstanceOf[S2Graph] if (s2Graph.isRunning) { -// val labels = Label.findAll() -// labels.groupBy(_.hbaseTableName).values.foreach { labelsWithSameTable => -// labelsWithSameTable.headOption.foreach { label => -// s2Graph.management.truncateStorage(label.label) -// } -// } + val labels = Label.findAll() + labels.groupBy(_.hbaseTableName).values.foreach { labelsWithSameTable => + labelsWithSameTable.headOption.foreach { label => + s2Graph.management.truncateStorage(label.label) + } + } // s2Graph.shutdown(modelDataDelete = true) S2GraphProvider.cleanupSchema s2Graph.shutdown(modelDataDelete = true) @@ -181,7 +189,7 @@ class S2GraphProvider extends AbstractGraphProvider { true, defaultService.serviceName, Nil, knowsProp, "strong", None, None, options = Option("""{"skipReverse": false}""")) } - + // columns val personColumn = Management.createServiceColumn(defaultService.serviceName, "person", "integer", Seq(Prop("name", "-", "string"), Prop("age", "0", "integer"), Prop("location", "-", "string"))) val softwareColumn = Management.createServiceColumn(defaultService.serviceName, "software", "integer", @@ -189,8 +197,19 @@ class S2GraphProvider extends AbstractGraphProvider { val productColumn = Management.createServiceColumn(defaultService.serviceName, "product", "integer", Nil) val dogColumn = Management.createServiceColumn(defaultService.serviceName, "dog", "integer", Nil) + val animalColumn = Management.createServiceColumn(defaultService.serviceName, "animal", "integer", Seq(Prop("age", "0", "integer"), Prop("name", "-", "string"))) + val songColumn = Management.createServiceColumn(defaultService.serviceName, "song", "integer", + Seq(Prop("name", "-", "string"), Prop("songType", "-", "string"), Prop("performances", "0", "integer")) + ) + val artistColumn = Management.createServiceColumn(defaultService.serviceName, "artist", "integer", + Seq(Prop("name", "-", "string")) + ) + val stephenColumn = Management.createServiceColumn(defaultService.serviceName, "STEPHEN", "integer", + Seq(Prop("name", "-", "string")) + ) // val vertexColumn = Management.createServiceColumn(service.serviceName, "vertex", "integer", Seq(Prop(T.id.toString, "-1", "integer"), Prop("name", "-", "string"), Prop("age", "-1", "integer"), Prop("lang", "scala", "string"))) + // labels val createdProps = Seq(Prop("weight", "0.0", "double"), Prop("name", "-", "string")) val created = @@ -215,17 +234,20 @@ class S2GraphProvider extends AbstractGraphProvider { true, defaultService.serviceName, Nil, Seq(Prop("xxx", "-", "string")), "weak", None, None, options = Option("""{"skipReverse": true}""")) + val selfProps = Seq(Prop("__id", "-", "string"), Prop("acl", "-", "string"), + Prop("test", "-", "string"), Prop("name", "-", "string"), Prop("some", "-", "string")) + val self = if (loadGraphWith != null && loadGraphWith.value() == GraphData.CLASSIC) { mnt.createLabel("self", defaultService.serviceName, defaultServiceColumn.columnName, defaultServiceColumn.columnType, defaultService.serviceName, defaultServiceColumn.columnName, defaultServiceColumn.columnType, - true, defaultService.serviceName, Nil, Seq(Prop("acl", "-", "string")), "strong", None, None, + true, defaultService.serviceName, Nil, selfProps, "strong", None, None, options = Option("""{"skipReverse": true}""")) } else { mnt.createLabel("self", defaultService.serviceName, "person", "integer", defaultService.serviceName, "person", "integer", - true, defaultService.serviceName, Nil, Seq(Prop("acl", "-", "string")), "strong", None, None, + true, defaultService.serviceName, Nil, selfProps, "strong", None, None, options = Option("""{"skipReverse": false}""")) } @@ -326,6 +348,61 @@ class S2GraphProvider extends AbstractGraphProvider { options = Option("""{"skipReverse": false}""") ) + val codeveloper = mnt.createLabel("codeveloper", + defaultService.serviceName, "person", "integer", + defaultService.serviceName, "person", "integer", + true, defaultService.serviceName, Nil, + Seq( + Prop("year", "0", "integer") + ), "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + + val createdBy = mnt.createLabel("createdBy", + defaultService.serviceName, "software", "integer", + defaultService.serviceName, "person", "integer", + true, defaultService.serviceName, Nil, + Seq( + Prop("weight", "0.0", "double"), + Prop("year", "0", "integer"), + Prop("acl", "-", "string") + ), "strong", None, None) + + val existsWith = mnt.createLabel("existsWith", + defaultService.serviceName, defaultServiceColumn.columnName, defaultServiceColumn.columnType, + defaultService.serviceName, defaultServiceColumn.columnName, defaultServiceColumn.columnType, + true, defaultService.serviceName, Nil, Seq(Prop("time", "-", "string")), "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + + val followedBy = mnt.createLabel("followedBy", + defaultService.serviceName, "song", "integer", + defaultService.serviceName, "song", "integer", + true, defaultService.serviceName, Nil, Seq(Prop("weight", "0.0", "double")), "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + + val writtenBy = mnt.createLabel("writtenBy", + defaultService.serviceName, "song", "integer", + defaultService.serviceName, "artist", "integer", + true, defaultService.serviceName, Nil, Seq(Prop("weight", "0.0", "double")), "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + + val sungBy = mnt.createLabel("sungBy", + defaultService.serviceName, "song", "integer", + defaultService.serviceName, "artist", "integer", + true, defaultService.serviceName, Nil, Seq(Prop("weight", "0.0", "double")), "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + + val uses = mnt.createLabel("uses", + defaultService.serviceName, "person", "integer", + defaultService.serviceName, "software", "integer", + true, defaultService.serviceName, Nil, Nil, "strong", None, None, + options = Option("""{"skipReverse": false}""") + ) + super.loadGraphData(graph, loadGraphWith, testClass, testName) }
