From d037fcb99dfc94691783094d811cb60f2241aebb Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 8 Jan 2018 00:19:46 -0800 Subject: Consolidate `Cross` and `CrossModule`, eliminate now-unused `map`/`flatMap`/`filter` APIs --- core/src/test/scala/mill/define/CrossTests.scala | 138 --------------------- .../scala/mill/discover/CrossModuleTests.scala | 11 +- core/src/test/scala/mill/util/TestGraphs.scala | 26 ++-- 3 files changed, 17 insertions(+), 158 deletions(-) delete mode 100644 core/src/test/scala/mill/define/CrossTests.scala (limited to 'core/src/test') diff --git a/core/src/test/scala/mill/define/CrossTests.scala b/core/src/test/scala/mill/define/CrossTests.scala deleted file mode 100644 index 5c0f5c08..00000000 --- a/core/src/test/scala/mill/define/CrossTests.scala +++ /dev/null @@ -1,138 +0,0 @@ -package mill.define - -import utest._ - -object CrossTests extends TestSuite{ - - val tests = Tests{ - - def assertEquals[T](value: Cross[T], value1: Cross[T]) = { - assert(value == value1) - } - 'single - assertEquals( - for(a <- Cross(1, 2, 3)) yield a.toString, - Cross(List((List(1), "1"), (List(2), "2"), (List(3), "3"))) - ) - - 'double - assertEquals( - for{ - a <- Cross(1, 2, 3) - b <- Cross("A", "B", "C") - } yield b * a, - Cross( - List( - (List("A", 1), "A"), - (List("B", 1), "B"), - (List("C", 1), "C"), - (List("A", 2), "AA"), - (List("B", 2), "BB"), - (List("C", 2), "CC"), - (List("A", 3), "AAA"), - (List("B", 3), "BBB"), - (List("C", 3), "CCC") - ) - ) - ) - - - 'triple - assertEquals( - for{ - a <- Cross(1, 2) - b <- Cross("A", "B") - c <- Cross(true, false) - } yield b * a + c, - Cross( - List( - (List(true, "A", 1), "Atrue"), - (List(false, "A", 1), "Afalse"), - (List(true, "B", 1), "Btrue"), - (List(false, "B", 1), "Bfalse"), - (List(true, "A", 2), "AAtrue"), - (List(false, "A", 2), "AAfalse"), - (List(true, "B", 2), "BBtrue"), - (List(false, "B", 2), "BBfalse") - ) - ) - ) - - - 'filter - assertEquals( - for{ - a <- Cross(1, 2, 3) - b <- Cross("A", "B", "C") - if !(a == 2 && b == "B") - } yield b * a, - Cross( - List( - (List("A", 1), "A"), - (List("B", 1), "B"), - (List("C", 1), "C"), - (List("A", 2), "AA"), - (List("C", 2), "CC"), - (List("A", 3), "AAA"), - (List("B", 3), "BBB"), - (List("C", 3), "CCC") - ) - ) - ) - - - 'middleFilter- assertEquals( - for{ - a <- Cross(1, 2, 3) - if a != 2 - b <- Cross("A", "B", "C") - } yield b * a, - Cross( - List( - (List("A", 1), "A"), - (List("B", 1), "B"), - (List("C", 1), "C"), - (List("A", 3), "AAA"), - (List("B", 3), "BBB"), - (List("C", 3), "CCC") - ) - ) - ) - - - 'nestedComprehension1 - assertEquals( - for{ - (a, b) <- for(a <- Cross(1, 2); b <- Cross("A", "B")) yield (a, b) - c <- Cross(true, false) - } yield b * a + c, - Cross( - List( - (List(true, "A", 1), "Atrue"), - (List(false, "A", 1), "Afalse"), - (List(true, "B", 1), "Btrue"), - (List(false, "B", 1), "Bfalse"), - (List(true, "A", 2), "AAtrue"), - (List(false, "A", 2), "AAfalse"), - (List(true, "B", 2), "BBtrue"), - (List(false, "B", 2), "BBfalse") - ) - ) - ) - - 'nestedComprehension2 - assertEquals( - for{ - a <- Cross(1, 2) - (b, c) <- for(b <- Cross("A", "B"); c <- Cross(true, false)) yield (b, c) - } yield b * a + c, - Cross( - List( - (List(true, "A", 1), "Atrue"), - (List(false, "A", 1), "Afalse"), - (List(true, "B", 1), "Btrue"), - (List(false, "B", 1), "Bfalse"), - (List(true, "A", 2), "AAtrue"), - (List(false, "A", 2), "AAfalse"), - (List(true, "B", 2), "BBtrue"), - (List(false, "B", 2), "BBfalse") - ) - ) - ) - - } -} diff --git a/core/src/test/scala/mill/discover/CrossModuleTests.scala b/core/src/test/scala/mill/discover/CrossModuleTests.scala index ff3b52b1..9848b9f4 100644 --- a/core/src/test/scala/mill/discover/CrossModuleTests.scala +++ b/core/src/test/scala/mill/discover/CrossModuleTests.scala @@ -1,20 +1,17 @@ package mill.discover -import mill.{Module, T} -import mill.define.Cross import mill.define.Segment import mill.define.Segment.Label -import mill.util.TestUtil.test import utest._ import mill.util.TestGraphs._ import mill.util.TestUtil -object CrossModuleTests extends TestSuite{ +object CrossTests extends TestSuite{ val tests = Tests{ 'cross - { object outer extends TestUtil.BaseModule { - object crossed extends mill.CrossModule[CrossedModule]("2.10.6", "2.11.8", "2.12.4") + 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 } @@ -42,8 +39,8 @@ object CrossModuleTests extends TestSuite{ 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.CrossModule[CrossModule](crossMatrix:_*) - case class CrossModule(platform: String, scalaVersion: String) extends mill.Module{ + 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 } } diff --git a/core/src/test/scala/mill/util/TestGraphs.scala b/core/src/test/scala/mill/util/TestGraphs.scala index 3ddae02d..f2c67583 100644 --- a/core/src/test/scala/mill/util/TestGraphs.scala +++ b/core/src/test/scala/mill/util/TestGraphs.scala @@ -1,6 +1,6 @@ package mill.util import TestUtil.test -import mill.define.CrossModule +import mill.define.Cross import mill.{Module, T} /** @@ -192,8 +192,8 @@ object TestGraphs{ object singleCross extends TestUtil.BaseModule { - object cross extends mill.CrossModule[CrossModule]("210", "211", "212") - class CrossModule(scalaVersion: String) extends Module{ + object cross extends mill.Cross[Cross]("210", "211", "212") + class Cross(scalaVersion: String) extends Module{ def suffix = T{ scalaVersion } } } @@ -203,27 +203,27 @@ object TestGraphs{ platform <- Seq("jvm", "js", "native") if !(platform == "native" && scalaVersion != "212") } yield (scalaVersion, platform) - object cross extends mill.CrossModule[CrossModule](crossMatrix:_*) - class CrossModule(scalaVersion: String, platform: String) extends Module{ + object cross extends mill.Cross[Cross](crossMatrix:_*) + class Cross(scalaVersion: String, platform: String) extends Module{ def suffix = T{ scalaVersion + "_" + platform } } } object indirectNestedCrosses extends TestUtil.BaseModule { - object cross extends mill.CrossModule[CrossModule]("210", "211", "212") - class CrossModule(scalaVersion: String) extends mill.Module{ - object cross2 extends mill.CrossModule[CrossModule]("jvm", "js", "native") - class CrossModule(platform: String) extends mill.Module{ + object cross extends mill.Cross[Cross]("210", "211", "212") + class Cross(scalaVersion: String) extends mill.Module{ + object cross2 extends mill.Cross[Cross]("jvm", "js", "native") + class Cross(platform: String) extends mill.Module{ def suffix = T{ scalaVersion + "_" + platform } } } } object nestedCrosses extends TestUtil.BaseModule { - object cross extends mill.CrossModule[CrossModule]("210", "211", "212") - class CrossModule(scalaVersion: String) extends mill.Module{ - object cross2 extends mill.CrossModule[CrossModule]("jvm", "js", "native") - class CrossModule(platform: String) extends mill.Module{ + object cross extends mill.Cross[Cross]("210", "211", "212") + class Cross(scalaVersion: String) extends mill.Module{ + object cross2 extends mill.Cross[Cross]("jvm", "js", "native") + class Cross(platform: String) extends mill.Module{ def suffix = T{ scalaVersion + "_" + platform } } } -- cgit v1.2.3