From f99c880c165513e1547fba3ffd19ea48bb16bab3 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sun, 21 Jun 2015 18:04:58 +0100 Subject: [PATCH] Add Central test --- ...hambault:argonaut-shapeless_6.1_2.11:0.2.0 | 10 ++++++ ...lt:argonaut-shapeless_6.1_2.11:0.2.0.jcabi | 10 ++++++ .../scala/coursier/test/CentralTests.scala | 31 +++++++++++-------- 3 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 create mode 100644 core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 b/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 new file mode 100644 index 000000000..5f0ead3af --- /dev/null +++ b/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 @@ -0,0 +1,10 @@ +com.chuusai:shapeless_2.11:jar:2.2.0 +com.github.alexarchambault:argonaut-shapeless_6.1_2.11:jar:0.2.0 +com.github.julien-truffaut:monocle-core_2.11:jar:1.1.0 +com.github.julien-truffaut:monocle-macro_2.11:jar:1.1.0 +io.argonaut:argonaut_2.11:jar:6.1 +org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.2 +org.scala-lang.modules:scala-xml_2.11:jar:1.0.2 +org.scala-lang:scala-library:jar:2.11.6 +org.scala-lang:scala-reflect:jar:2.11.6 +org.scalaz:scalaz-core_2.11:jar:7.1.1 diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi b/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi new file mode 100644 index 000000000..5f0ead3af --- /dev/null +++ b/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi @@ -0,0 +1,10 @@ +com.chuusai:shapeless_2.11:jar:2.2.0 +com.github.alexarchambault:argonaut-shapeless_6.1_2.11:jar:0.2.0 +com.github.julien-truffaut:monocle-core_2.11:jar:1.1.0 +com.github.julien-truffaut:monocle-macro_2.11:jar:1.1.0 +io.argonaut:argonaut_2.11:jar:6.1 +org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.2 +org.scala-lang.modules:scala-xml_2.11:jar:1.0.2 +org.scala-lang:scala-library:jar:2.11.6 +org.scala-lang:scala-reflect:jar:2.11.6 +org.scalaz:scalaz-core_2.11:jar:7.1.1 diff --git a/core/src/test/scala/coursier/test/CentralTests.scala b/core/src/test/scala/coursier/test/CentralTests.scala index af3f66447..2d1c3993e 100644 --- a/core/src/test/scala/coursier/test/CentralTests.scala +++ b/core/src/test/scala/coursier/test/CentralTests.scala @@ -15,6 +15,20 @@ object CentralTests extends TestSuite { def repr(dep: Dependency) = s"${dep.module.organization}:${dep.module.name}:${dep.`type`}:${Some(dep.classifier).filter(_.nonEmpty).map(_+":").mkString}${dep.version}" + def resolutionCheck(module: Module, version: String) = + async { + val expected = await(textResource(s"resolutions/${module.organization}:${module.name}:$version")).split('\n').toSeq + + val dep = Dependency(module, version) + val res = await(resolve(Set(dep), fetchFrom(repositories)).runF) + + val result = res.dependencies.toVector.map(repr).sorted.distinct + + for (((e, r), idx) <- expected.zip(result).zipWithIndex if e != r) + println(s"Line $idx:\n expected: $e\n got:$r") + + assert(result == expected) + } val tests = TestSuite { 'logback{ @@ -50,19 +64,10 @@ object CentralTests extends TestSuite { } } 'spark{ - async { - val expected = await(textResource("resolutions/org.apache.spark:spark-core_2.11:1.3.1")).split('\n').toSeq - - val dep = Dependency(Module("org.apache.spark", "spark-core_2.11"), "1.3.1") - val res = await(resolve(Set(dep), fetchFrom(repositories)).runF) - - val result = res.dependencies.toVector.map(repr).sorted.distinct - - for (((e, r), idx) <- expected.zip(result).zipWithIndex if e != r) - println(s"Line $idx:\n expected: $e\n got:$r") - - assert(result == expected) - } + resolutionCheck(Module("org.apache.spark", "spark-core_2.11"), "1.3.1") + } + 'argonautShapeless{ + resolutionCheck(Module("com.github.alexarchambault", "argonaut-shapeless_6.1_2.11"), "0.2.0") } }