From 12a8793392704adc6b469e76ac3a6d4a9bf4dda8 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 12 Jan 2018 20:37:30 -0800 Subject: fix tests --- core/src/main/scala/mill/util/Logger.scala | 2 +- .../scala/mill/discover/CrossModuleTests.scala | 116 --------------------- core/src/test/scala/mill/discover/CrossTests.scala | 116 +++++++++++++++++++++ 3 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 core/src/test/scala/mill/discover/CrossModuleTests.scala create mode 100644 core/src/test/scala/mill/discover/CrossTests.scala diff --git a/core/src/main/scala/mill/util/Logger.scala b/core/src/main/scala/mill/util/Logger.scala index b42cc907..17c66d27 100644 --- a/core/src/main/scala/mill/util/Logger.scala +++ b/core/src/main/scala/mill/util/Logger.scala @@ -90,7 +90,7 @@ case class PrintLogger(colored: Boolean, nav.left(9999) p.flush() }else{ - println() + infoStream.println() } lastLineTicker = true infoStream.println(colors.info()(s)) diff --git a/core/src/test/scala/mill/discover/CrossModuleTests.scala b/core/src/test/scala/mill/discover/CrossModuleTests.scala deleted file mode 100644 index 04c41848..00000000 --- a/core/src/test/scala/mill/discover/CrossModuleTests.scala +++ /dev/null @@ -1,116 +0,0 @@ -package mill.discover - -import mill.define.Segment -import mill.define.Segment.Label -import utest._ -import mill.util.TestGraphs._ -import mill.util.TestUtil -object CrossTests extends TestSuite{ - - val tests = Tests{ - - 'cross - { - object outer extends TestUtil.BaseModule { - object crossed extends mill.Cross[CrossedModule]("2.10.6", "2.11.8", "2.12.4") - class CrossedModule(n: String) extends mill.Module{ - def scalaVersion = n - } - } - - val discovered = Discovered.make[outer.type] - - val Some((gen, innerMirror)) = discovered - .mirror - .children - .head._2 - .asInstanceOf[Mirror[outer.type, outer.crossed.type]] - .crossChildren - - val keys = gen(outer.crossed) - assert(keys == List(List("2.10.6"), List("2.11.8"), List("2.12.4"))) - for(k <- keys){ - assert(outer.crossed(k:_*).scalaVersion == k.head) - } - } - 'doubleCross - { - object outer extends TestUtil.BaseModule { - val crossMatrix = for{ - platform <- Seq("", "sjs0.6", "native0.3") - scalaVersion <- Seq("2.10.6", "2.11.8", "2.12.4") - if !(platform == "native0.3" && scalaVersion == "2.10.6") - } yield (platform, scalaVersion) - object crossed extends mill.Cross[Cross](crossMatrix:_*) - case class Cross(platform: String, scalaVersion: String) extends mill.Module{ - def suffix = Seq(scalaVersion, platform).filter(_.nonEmpty).map("_"+_).mkString - } - } - - val Some((gen, innerMirror)) = Discovered.make[outer.type] - .mirror - .children - .head._2 - .asInstanceOf[Mirror[outer.type, outer.crossed.type]] - .crossChildren - - val keys = gen(outer.crossed) - val expectedKeys = List( - List("2.10.6", ""), - List("2.11.8", ""), - List("2.12.4", ""), - List("2.10.6", "sjs0.6"), - List("2.11.8", "sjs0.6"), - List("2.12.4", "sjs0.6"), - List("2.11.8", "native0.3"), - List("2.12.4", "native0.3") - ) - - assert(keys == expectedKeys) - for(k <- keys){ - val suffix = outer.crossed(k:_*).suffix - val expected = k.map(_.toString).filter(_.nonEmpty).map("_"+_).mkString - assert(suffix == expected) - } - } - 'crossTargetDiscovery - { - - val discovered = Discovered.mapping(singleCross) - - val segments = discovered.targets.map(_.ctx.segments.value).toSet - val expectedSegments = Set( - List(Label("cross"), Segment.Cross(List("210")), Label("suffix")), - List(Label("cross"), Segment.Cross(List("211")), Label("suffix")), - List(Label("cross"), Segment.Cross(List("212")), Label("suffix")) - ) - assert(segments == expectedSegments) - val targets = discovered.targets.toSet - val expected = Set( - singleCross.cross("210").suffix, - singleCross.cross("211").suffix, - singleCross.cross("212").suffix - ) - assert(targets == expected) - } - - 'doubleCrossTargetDiscovery - { - val discovered = Discovered.mapping(doubleCross) - val targets = discovered.targets.toSet - - val expected = Set( - doubleCross.cross("jvm", "210").suffix, - doubleCross.cross("js", "210").suffix, - doubleCross.cross("jvm", "211").suffix, - doubleCross.cross("js", "211").suffix, - doubleCross.cross("jvm", "212").suffix, - doubleCross.cross("js", "212").suffix, - doubleCross.cross("native", "212").suffix - ) - assert(targets == expected) - } - - 'nestedCrosses - { - val discovered = Discovered.mapping(nestedCrosses).targets - assert(discovered.size == 9) - } - } -} - diff --git a/core/src/test/scala/mill/discover/CrossTests.scala b/core/src/test/scala/mill/discover/CrossTests.scala new file mode 100644 index 00000000..fe9f8812 --- /dev/null +++ b/core/src/test/scala/mill/discover/CrossTests.scala @@ -0,0 +1,116 @@ +package mill.discover + +import mill.define.Segment +import mill.define.Segment.Label +import utest._ +import mill.util.TestGraphs._ +import mill.util.TestUtil +object CrossTests extends TestSuite{ + + val tests = Tests{ + + 'cross - { + object outer extends TestUtil.BaseModule { + object crossed extends mill.Cross[CrossedModule]("2.10.6", "2.11.8", "2.12.4") + class CrossedModule(n: String) extends mill.Module{ + def scalaVersion = n + } + } + + val discovered = Discovered.make[outer.type] + + val Some((gen, innerMirror)) = discovered + .mirror + .children + .head._2 + .asInstanceOf[Mirror[outer.type, outer.crossed.type]] + .crossChildren + + val keys = gen(outer.crossed) + assert(keys == List(List("2.10.6"), List("2.11.8"), List("2.12.4"))) + for(k <- keys){ + assert(outer.crossed.get(k).scalaVersion == k.head) + } + } + 'doubleCross - { + object outer extends TestUtil.BaseModule { + val crossMatrix = for{ + platform <- Seq("", "sjs0.6", "native0.3") + scalaVersion <- Seq("2.10.6", "2.11.8", "2.12.4") + if !(platform == "native0.3" && scalaVersion == "2.10.6") + } yield (platform, scalaVersion) + object crossed extends mill.Cross[Cross](crossMatrix:_*) + case class Cross(platform: String, scalaVersion: String) extends mill.Module{ + def suffix = Seq(scalaVersion, platform).filter(_.nonEmpty).map("_"+_).mkString + } + } + + val Some((gen, innerMirror)) = Discovered.make[outer.type] + .mirror + .children + .head._2 + .asInstanceOf[Mirror[outer.type, outer.crossed.type]] + .crossChildren + + val keys = gen(outer.crossed) + val expectedKeys = List( + List("2.10.6", ""), + List("2.11.8", ""), + List("2.12.4", ""), + List("2.10.6", "sjs0.6"), + List("2.11.8", "sjs0.6"), + List("2.12.4", "sjs0.6"), + List("2.11.8", "native0.3"), + List("2.12.4", "native0.3") + ) + + assert(keys == expectedKeys) + for(k <- keys){ + val suffix = outer.crossed.get(k).suffix + val expected = k.map(_.toString).filter(_.nonEmpty).map("_"+_).mkString + assert(suffix == expected) + } + } + 'crossTargetDiscovery - { + + val discovered = Discovered.mapping(singleCross) + + val segments = discovered.targets.map(_.ctx.segments.value).toSet + val expectedSegments = Set( + List(Label("cross"), Segment.Cross(List("210")), Label("suffix")), + List(Label("cross"), Segment.Cross(List("211")), Label("suffix")), + List(Label("cross"), Segment.Cross(List("212")), Label("suffix")) + ) + assert(segments == expectedSegments) + val targets = discovered.targets.toSet + val expected = Set( + singleCross.cross("210").suffix, + singleCross.cross("211").suffix, + singleCross.cross("212").suffix + ) + assert(targets == expected) + } + + 'doubleCrossTargetDiscovery - { + val discovered = Discovered.mapping(doubleCross) + val targets = discovered.targets.toSet + + val expected = Set( + doubleCross.cross("jvm", "210").suffix, + doubleCross.cross("js", "210").suffix, + doubleCross.cross("jvm", "211").suffix, + doubleCross.cross("js", "211").suffix, + doubleCross.cross("jvm", "212").suffix, + doubleCross.cross("js", "212").suffix, + doubleCross.cross("native", "212").suffix + ) + assert(targets == expected) + } + + 'nestedCrosses - { + val discovered = Discovered.mapping(nestedCrosses).targets + assert(discovered.size == 9) + } + } +} + -- cgit v1.2.3