Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

[S2GRAPH-62] Test all versions #45

Open
HyunsungJo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[S2GRAPH-62] Test all versions #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ lazy val commonSettings = Seq(
version := "0.12.1-SNAPSHOT",
scalacOptions := Seq("-language:postfixOps", "-unchecked", "-deprecation", "-feature", "-Xlint"),
javaOptions ++= collection.JavaConversions.propertiesAsScalaMap(System.getProperties).map { case (key, value) => "-D" + key + "=" + value }.toSeq,
testOptions in Test += Tests.Argument("-oDF"),
testOptions in Test ++= Seq(
Tests.Argument("-oDF"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "CommonTest"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "V1Test"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "V2Test"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "V3Test"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "V4Test"),
Tests.Argument(TestFrameworks.ScalaTest, "-n", "HBaseTest")
),
parallelExecution in Test := false,
resolvers ++= Seq(
Resolver.mavenLocal,
Expand Down
2 changes: 2 additions & 0 deletions s2core/src/main/scala/org/apache/s2graph/core/GraphExceptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@ object GraphExceptions {
case class FetchTimeoutException(msg: String) extends Exception(msg)

case class DropRequestException(msg: String) extends Exception(msg)

case class UnsupportedVersionException(msg: String) extends Exception(msg)
}
2 changes: 1 addition & 1 deletion s2core/src/main/scala/org/apache/s2graph/core/rest/RestHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class RestHandler(graph: Graph)(implicit ec: ExecutionContext) {
}
}

private def getVertices(jsValue: JsValue) = {
def getVertices(jsValue: JsValue) = {
val jsonQuery = jsValue
val ts = System.currentTimeMillis()
val props = "{}"
Expand Down
13 changes: 13 additions & 0 deletions s2core/src/test/scala/org/apache/s2graph/core/CommonTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.apache.s2graph.core
Copy link
Contributor

@SteamShon SteamShon Apr 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we missed out Apacche license header here. please sbt runRatTask and examine rat.out to check apache license header.


import org.scalatest.Tag

/**
Copy link
Contributor

@SteamShon SteamShon Apr 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

guess we need to remove auto generated author field. I know other sources have it now, but they also need to be removed eventually.

* @author Junki Kim (wishoping@gmail.com), Hyunsung Jo (hyunsung.jo@gmail.com) on 2016/Feb/23.
*/
object CommonTest extends Tag("CommonTest")
object V1Test extends Tag("V1Test")
object V2Test extends Tag("V2Test")
object V3Test extends Tag("V3Test")
object V4Test extends Tag("V4Test")
object HBaseTest extends Tag("HBaseTest")
Loading