Commit 57a10073 by Harish Butani

ignore result structType name differences when checking GremlinQueryResults

parent 9853d9d1
package org.apache.hadoop.metadata.query package org.apache.hadoop.metadata.query
import com.thinkaurelius.titan.core.TitanGraph import com.thinkaurelius.titan.core.TitanGraph
import org.apache.hadoop.metadata.json._
import org.apache.hadoop.metadata.query.Expressions._ import org.apache.hadoop.metadata.query.Expressions._
import org.apache.hadoop.metadata.types.TypeSystem import org.apache.hadoop.metadata.types.TypeSystem
import org.json4s.NoTypeHints
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.scalatest._ import org.scalatest._
import org.scalatest.junit.JUnitRunner import org.scalatest.junit.JUnitRunner
import org.json4s.native.Serialization.writePretty
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class GremlinTest extends FunSuite with BeforeAndAfterAll { class GremlinTest extends FunSuite with BeforeAndAfterAll {
...@@ -25,10 +22,14 @@ class GremlinTest extends FunSuite with BeforeAndAfterAll { ...@@ -25,10 +22,14 @@ class GremlinTest extends FunSuite with BeforeAndAfterAll {
g.shutdown() g.shutdown()
} }
val STRUCT_NAME_REGEX = (TypeUtils.TEMP_STRUCT_NAME_PREFIX + "\\d+").r
def validateJson(r : GremlinQueryResult, expected : String = null) : Unit = { def validateJson(r : GremlinQueryResult, expected : String = null) : Unit = {
val rJ = r.toJson val rJ = r.toJson
if ( expected != null ) { if ( expected != null ) {
Assertions.assert(rJ == expected) val a = STRUCT_NAME_REGEX.replaceAllIn(rJ, "")
val b = STRUCT_NAME_REGEX.replaceAllIn(expected, "")
Assertions.assert(a == b)
} else { } else {
println(rJ) println(rJ)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment