Skip to content

Commit

Permalink
Scalafmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@muuki88
muuki88 committed Jan 13, 2018
1 parent 8e8b4fa commit ab453e9
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 146 deletions.
14 changes: 7 additions & 7 deletions src/main/scala/rocks/muki/graphql/package.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ package object graphql {
val labels = gqlSchemas.schemas.map(_.label)
// create a depended parser. A label can only be selected once
schemaLabelParser(labels).flatMap {
case selectedLabel if labels.contains(selectedLabel) =>
success(schemaOrError(selectedLabel, gqlSchemas)) ~ schemaLabelParser(
labels.filterNot(_ == selectedLabel)).map(label =>
schemaOrError(label, gqlSchemas))
case selectedLabel =>
failure(
s"$selectedLabel is not available. Use: [${labels.mkString(" | ")}]")
case selectedLabel if labels.contains(selectedLabel) =>
success(schemaOrError(selectedLabel, gqlSchemas)) ~ schemaLabelParser(
labels.filterNot(_ == selectedLabel)).map(label =>
schemaOrError(label, gqlSchemas))
case selectedLabel =>
failure(
s"$selectedLabel is not available. Use: [${labels.mkString(" | ")}]")
}
}

Expand Down
30 changes: 15 additions & 15 deletions src/test/scala/rocks/muki/graphql/codegen/BuilderSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,33 @@ class BuilderSpec extends WordSpec with Matchers with EitherValues {
"Builder" should {
"fail with non-existent schema" in {
val result = Builder(new File("schema-file-does-not-exist"))
.generate[Tree.Api]
.generate[Tree.Api]

result.left.value.message should startWith(
"Failed to read schema-file-does-not-exist: schema-file-does-not-exist")
"Failed to read schema-file-does-not-exist: schema-file-does-not-exist")

}

"fail with non-existent query" in {
val result = Builder(StarWarsSchema)
.withQuery(new File("query-file-does-not-exist"))
.generate[Tree.Api]
.withQuery(new File("query-file-does-not-exist"))
.generate[Tree.Api]

result.left.value.message should startWith(
"Failed to read query-file-does-not-exist: query-file-does-not-exist")
"Failed to read query-file-does-not-exist: query-file-does-not-exist")
}

"validate query documents" in {
val scala.util.Success(query) =
QueryParser.parse("""
QueryParser.parse("""
query HeroName($episdoe: Episode!) {
hero(episode: $episode) {
name
}
}
""")
val expectedMessage =
"""Invalid query: Variable '$episode' is not defined by operation 'HeroName'. (line 3, column 25):
"""Invalid query: Variable '$episode' is not defined by operation 'HeroName'. (line 3, column 25):
| hero(episode: $episode) {
| ^
| (line 2, column 9):
Expand All @@ -63,20 +63,20 @@ class BuilderSpec extends WordSpec with Matchers with EitherValues {
| query HeroName($episdoe: Episode!) {
| ^""".stripMargin
val Left(failure) =
Builder(StarWarsSchema).withQuery(query).generate[Tree.Api]
Builder(StarWarsSchema).withQuery(query).generate[Tree.Api]

failure should be(Failure(expectedMessage))
}

"merge query documents" in {
val tree = Builder(StarWarsSchema)
.withQuery(
new File("src/test/resources/starwars/HeroAndFriends.graphql"))
.withQuery(
new File("src/test/resources/starwars/HeroNameQuery.graphql"))
.generate[Tree.Api]
.right
.value
.withQuery(
new File("src/test/resources/starwars/HeroAndFriends.graphql"))
.withQuery(
new File("src/test/resources/starwars/HeroNameQuery.graphql"))
.generate[Tree.Api]
.right
.value

val names = tree.operations.flatMap(_.name)
names should contain only ("HeroAndFriends", "HeroNameQuery")
Expand Down
30 changes: 15 additions & 15 deletions src/test/scala/rocks/muki/graphql/codegen/CodegenBaseSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import scala.meta._
import sangria.schema.Schema

abstract class CodegenBaseSpec(name: String,
schema: Option[Schema[_, _]] = None)
schema: Option[Schema[_, _]] = None)
extends WordSpec {
def this(name: String, schema: Schema[_, _]) = this(name, Some(schema))

Expand All @@ -41,20 +41,20 @@ abstract class CodegenBaseSpec(name: String,
if expected.exists
} {
s"generate code for ${input.getName}" in {
val generator = ScalametaGenerator(s"${name}Api")
val builder = schema match {
case Some(schema) => Builder(schema)
case None => Builder(new File(inputDir, "schema.graphql"))
}
val Right(out) = builder
.withQuery(input)
.generate(generator)
val actual = out.show[Syntax]

if (actual.trim != contentOf(expected).trim)
println(actual)

assert(actual.trim == contentOf(expected).trim)
val generator = ScalametaGenerator(s"${name}Api")
val builder = schema match {
case Some(schema) => Builder(schema)
case None => Builder(new File(inputDir, "schema.graphql"))
}
val Right(out) = builder
.withQuery(input)
.generate(generator)
val actual = out.show[Syntax]

if (actual.trim != contentOf(expected).trim)
println(actual)

assert(actual.trim == contentOf(expected).trim)
}
}
}
Expand Down
56 changes: 28 additions & 28 deletions src/test/scala/rocks/muki/graphql/codegen/starwars/TestData.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ object TestData {
}

case class Human(id: String,
name: Option[String],
friends: List[String],
appearsIn: List[Episode.Value],
homePlanet: Option[String])
name: Option[String],
friends: List[String],
appearsIn: List[Episode.Value],
homePlanet: Option[String])
extends Character
case class Droid(id: String,
name: Option[String],
friends: List[String],
appearsIn: List[Episode.Value],
primaryFunction: Option[String])
name: Option[String],
friends: List[String],
appearsIn: List[Episode.Value],
primaryFunction: Option[String])
extends Character

case class DeferFriends(friends: List[String])
Expand All @@ -58,15 +58,15 @@ object TestData {
homePlanet = Some("Tatooine")
),
Human(id = "1001",
name = Some("Darth Vader"),
friends = List("1004"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = Some("Tatooine")),
name = Some("Darth Vader"),
friends = List("1004"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = Some("Tatooine")),
Human(id = "1002",
name = Some("Han Solo"),
friends = List("1000", "1003", "2001"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = None),
name = Some("Han Solo"),
friends = List("1000", "1003", "2001"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = None),
Human(
id = "1003",
name = Some("Leia Organa"),
Expand All @@ -75,10 +75,10 @@ object TestData {
homePlanet = Some("Alderaan")
),
Human(id = "1004",
name = Some("Wilhuff Tarkin"),
friends = List("1001"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = None),
name = Some("Wilhuff Tarkin"),
friends = List("1001"),
appearsIn = List(Episode.NEWHOPE, Episode.EMPIRE, Episode.JEDI),
homePlanet = None),
Droid(
id = "2000",
name = Some("C-3PO"),
Expand All @@ -97,11 +97,11 @@ object TestData {

class FriendsResolver extends DeferredResolver[Any] {
override def resolve(deferred: Vector[Deferred[Any]],
ctx: Any,
queryState: Any)(implicit ec: ExecutionContext) =
ctx: Any,
queryState: Any)(implicit ec: ExecutionContext) =
deferred map {
case DeferFriends(friendIds) ⇒
Future.fromTry(Try(friendIds map (id ⇒ characters.find(_.id == id))))
case DeferFriends(friendIds) ⇒
Future.fromTry(Try(friendIds map (id ⇒ characters.find(_.id == id))))
}
}

Expand All @@ -111,13 +111,13 @@ object TestData {

def getHuman(id: String): Option[Human] =
characters
.find(c ⇒ c.isInstanceOf[Human] && c.id == id)
.asInstanceOf[Option[Human]]
.find(c ⇒ c.isInstanceOf[Human] && c.id == id)
.asInstanceOf[Option[Human]]

def getDroid(id: String): Option[Droid] =
characters
.find(c ⇒ c.isInstanceOf[Droid] && c.id == id)
.asInstanceOf[Option[Droid]]
.find(c ⇒ c.isInstanceOf[Droid] && c.id == id)
.asInstanceOf[Option[Droid]]

def getCharacters(ids: Seq[String]): Seq[Character] =
ids.flatMap(id ⇒ characters.find(_.id == id))
Expand Down
Loading

0 comments on commit ab453e9

Please sign in to comment.