From 9c0e58c48da4cdbae7c96ef45fc15cd7aff4301f Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Tue, 28 Sep 2010 00:51:25 +0000 Subject: Cleaning up the contents of test. including "CheckEither", written against scalacheck 1.2 in the year 471 AD. Removed all the duplicates I could find, mostly between pending and files. Renamed a bunch of tests so they wouldn't look like likely duplicates next time around. Nominated somebody else to do this once in a while. No review. --- test/files/run/bug3150.scala | 10 ++ test/files/run/lazy-override-run.check | 3 + test/files/run/lazy-override-run.scala | 26 ++++ test/files/run/lazy-override.check | 3 - test/files/run/lazy-override.scala | 26 ---- test/files/run/lists-run.scala | 210 +++++++++++++++++++++++++++++++++ test/files/run/lists.scala | 210 --------------------------------- test/files/run/t2316.scala | 32 ----- test/files/run/t2316_run.scala | 32 +++++ 9 files changed, 281 insertions(+), 271 deletions(-) create mode 100644 test/files/run/bug3150.scala create mode 100644 test/files/run/lazy-override-run.check create mode 100644 test/files/run/lazy-override-run.scala delete mode 100644 test/files/run/lazy-override.check delete mode 100644 test/files/run/lazy-override.scala create mode 100644 test/files/run/lists-run.scala delete mode 100644 test/files/run/lists.scala delete mode 100644 test/files/run/t2316.scala create mode 100644 test/files/run/t2316_run.scala (limited to 'test/files/run') diff --git a/test/files/run/bug3150.scala b/test/files/run/bug3150.scala new file mode 100644 index 0000000000..034703b5f7 --- /dev/null +++ b/test/files/run/bug3150.scala @@ -0,0 +1,10 @@ +object Test { + case object Bob { override def equals(other: Any) = true } + def f(x: Any) = x match { case Bob => Bob } + + def main(args: Array[String]): Unit = { + assert(f(Bob) eq Bob) + assert(f(0) eq Bob) + assert(f(Nil) eq Bob) + } +} diff --git a/test/files/run/lazy-override-run.check b/test/files/run/lazy-override-run.check new file mode 100644 index 0000000000..a8f658d7b5 --- /dev/null +++ b/test/files/run/lazy-override-run.check @@ -0,0 +1,3 @@ +a.x=/*A.x*/2 +b.x=/*B.x*/3 +b.z=/*B.z/3 diff --git a/test/files/run/lazy-override-run.scala b/test/files/run/lazy-override-run.scala new file mode 100644 index 0000000000..e5884257a8 --- /dev/null +++ b/test/files/run/lazy-override-run.scala @@ -0,0 +1,26 @@ +class A { + lazy val x: Int = { print("/*A.x*/"); 2 } + lazy val y: Int = { print("/*A.y*/"); 2 } + lazy val z: Int = { print("/*A.z*/"); 2 } +} + +class B extends A { + override lazy val x: Int = { print("/*B.x*/"); 3 } + override lazy val y: Int = { print("/*B.y*/"); 3 } + override lazy val z: Int = { print("/*B.z/"); 3 } +} + + + + +object Test extends Application { + val a = new A + print("a.x=") + println(a.x) + + val b = new B + print("b.x=") + println(b.x) + print("b.z=") + println(b.z) +} diff --git a/test/files/run/lazy-override.check b/test/files/run/lazy-override.check deleted file mode 100644 index a8f658d7b5..0000000000 --- a/test/files/run/lazy-override.check +++ /dev/null @@ -1,3 +0,0 @@ -a.x=/*A.x*/2 -b.x=/*B.x*/3 -b.z=/*B.z/3 diff --git a/test/files/run/lazy-override.scala b/test/files/run/lazy-override.scala deleted file mode 100644 index e5884257a8..0000000000 --- a/test/files/run/lazy-override.scala +++ /dev/null @@ -1,26 +0,0 @@ -class A { - lazy val x: Int = { print("/*A.x*/"); 2 } - lazy val y: Int = { print("/*A.y*/"); 2 } - lazy val z: Int = { print("/*A.z*/"); 2 } -} - -class B extends A { - override lazy val x: Int = { print("/*B.x*/"); 3 } - override lazy val y: Int = { print("/*B.y*/"); 3 } - override lazy val z: Int = { print("/*B.z/"); 3 } -} - - - - -object Test extends Application { - val a = new A - print("a.x=") - println(a.x) - - val b = new B - print("b.x=") - println(b.x) - print("b.z=") - println(b.z) -} diff --git a/test/files/run/lists-run.scala b/test/files/run/lists-run.scala new file mode 100644 index 0000000000..6c9b55961e --- /dev/null +++ b/test/files/run/lists-run.scala @@ -0,0 +1,210 @@ +//############################################################################ +// Lists +//############################################################################ + +//############################################################################ + +import testing.SUnit._ + +/** Test the Scala implementation of class scala.List. + * + * @author Stephane Micheloud + */ +object Test extends TestConsoleMain { + def suite = new TestSuite( + Test_multiset, // multiset operations: union, intersect, diff + Test1, //count, exists, filter, .. + Test2, //#468 + Test3, //#1691 + Test4, //#1721 + Test5 + ) +} + +object Test_multiset extends TestCase("multiset") with Assert { + override def enableStackTrace = false + override def runTest { + def isSubListOf[A](thiz: List[A], that: List[A]): Boolean = + thiz forall (that contains _) + val xs = List(1, 1, 2) + val ys = List(1, 2, 2, 3) + assertEquals("xs_union_ys", List(1, 1, 2, 1, 2, 2, 3), xs union ys) + assertEquals("ys_union_xs", List(1, 2, 2, 3, 1, 1, 2), ys union xs) + assertEquals("xs_intersect_ys", List(1, 2), xs intersect ys) + assertEquals("ys_intersect_xs", List(1, 2), ys intersect xs) + assertEquals("xs_diff_ys", List(1), xs diff ys) + assertEquals("ys_diff_xs", List(2, 3), ys diff xs) + assertTrue("xs_subset_ys", isSubListOf(xs -- ys, xs diff ys)) + + val zs = List(0, 1, 1, 2, 2, 2) + assertEquals("zs_union_ys", List(0, 1, 1, 2, 2, 2, 1, 2, 2, 3), zs union ys) + assertEquals("ys_union_zs", List(1, 2, 2, 3, 0, 1, 1, 2, 2, 2), ys union zs) + assertEquals("zs_intersect_ys", List(1, 2, 2), zs intersect ys) + assertEquals("ys_intersect_zs", List(1, 2, 2), ys intersect zs) + assertEquals("zs_diff_ys", List(0, 1, 2), zs diff ys) + assertEquals("ys_diff_zs", List(3), ys diff zs) + assertTrue("xs_subset_ys", isSubListOf(zs -- ys, zs diff ys)) + + val ws = List(2) + assertEquals("ws_union_ys", List(2, 1, 2, 2, 3), ws union ys) + assertEquals("ys_union_ws", List(1, 2, 2, 3, 2), ys union ws) + assertEquals("ws_intersect_ys", List(2), ws intersect ys) + assertEquals("ys_intersect_ws", List(2), ys intersect ws) + assertEquals("ws_diff_ys", List(), ws diff ys) + assertEquals("ys_diff_ws", List(1, 2, 3), ys diff ws) + assertTrue("ws_subset_ys", isSubListOf(ws -- ys, ws diff ys)) + + val vs = List(3, 2, 2, 1) + assertEquals("xs_union_vs", List(1, 1, 2, 3, 2, 2, 1), xs union vs) + assertEquals("vs_union_xs", List(3, 2, 2, 1, 1, 1, 2), vs union xs) + assertEquals("xs_intersect_vs", List(1, 2), xs intersect vs) + assertEquals("vs_intersect_xs", List(2, 1), vs intersect xs) + assertEquals("xs_diff_vs", List(1), xs diff vs) + assertEquals("vs_diff_xs", List(3, 2), vs diff xs) + assertTrue("xs_subset_vs", isSubListOf(xs -- vs, xs diff vs)) + + // tests adapted from Thomas Jung + assertTrue( + "be symmetric after sorting", { + def sort(zs: List[Int]) = zs sort ( _ > _ ) + sort(xs intersect ys) == sort(ys intersect xs) + }) + assertTrue( + "obey min cardinality", { + def cardinality[A](zs: List[A], e: A): Int = zs count (e == _) + val intersection = xs intersect ys + xs forall (e => cardinality(intersection, e) == (cardinality(xs, e) +min cardinality(ys, e))) + }) + assertTrue( + "maintain order", { + val intersection = xs intersect ys + val unconsumed = xs.foldLeft(intersection){(rest, e) => + if (! rest.isEmpty && e == rest.head) rest.tail else rest + } + unconsumed.isEmpty + }) + assertTrue( + "has the list as again intersection", + xs == (xs intersect xs) + ) + } +} + +object Test1 extends TestCase("ctor") with Assert { + override def enableStackTrace = false + override def runTest { + val xs1 = List(1, 2, 3) + val xs2 = List('a', 'b') + val xs3 = List(List(1, 2), List(4, 5)) + val xs4 = List(2, 4, 6, 8) + val xs5 = List(List(3, 4), List(3), List(4, 5)) + + { + val n1 = xs1 count { e => e % 2 != 0 } + val n2 = xs4 count { e => e < 5 } + assertEquals("check_count", 4, n1 + n2) + } + { + val b1 = xs1 exists { e => e % 2 == 0 } + val b2 = xs4 exists { e => e == 5 } + assertEquals("check_exists", false , b1 & b2) + } + { + val ys1 = xs1 filter { e => e % 2 == 0 } + val ys2 = xs4 filter { e => e < 5 } + assertEquals("check_filter", 3, ys1.length + ys2.length) + } + { + val n1 = xs1.foldLeft(0)((e1, e2) => e1 + e2) + val ys1 = xs4.foldLeft(List[Int]())((e1, e2) => e2 :: e1) + assertEquals("check_foldLeft", 10, n1 + ys1.length) + } + { + val b1 = xs1 forall { e => e < 10} + val b2 = xs4 forall { e => e % 2 == 0 } + assertEquals("check_forall", true, b1 & b2) + } + { + val ys1 = xs1 filterNot { e => e % 2 != 0 } + val ys2 = xs4 filterNot { e => e < 5 } + assertEquals("check_remove", 3, ys1.length + ys2.length) + } + { + val ys1 = xs1 zip xs2 + val ys2 = xs1 zip xs3 + assertEquals("check_zip", 4, ys1.length + ys2.length) + } + { + val ys1 = xs1.zipAll(xs2, 0, '_') + val ys2 = xs2.zipAll(xs1, '_', 0) + val ys3 = xs1.zipAll(xs3, 0, List(-1)) + assertEquals("check_zipAll", 9, ys1.length + ys2.length + ys3.length) + } + } +} + +object Test2 extends TestCase("t0468") with Assert { + override def enableStackTrace = false + override def runTest { + val xs1 = List(1, 2, 3) + val xs2 = List(0) + + val ys1 = xs1 ::: List(4) + assertEquals("check_:::", List(1, 2, 3, 4), ys1) + + val ys2 = ys1 - 4 + assertEquals("check_-", xs1, ys2) + + val n2 = (xs1 ++ ys1).length + val n3 = (xs1 ++ Nil).length + val n4 = (xs1 ++ ((new collection.mutable.ArrayBuffer[Int]) + 0)).length + assertEquals("check_++", 14, n2 + n3 + n4) + } +} + +object Test3 extends TestCase("t1691") with Assert { + override def enableStackTrace = false + override def runTest { + try { + List.range(1, 10, 0) + } catch { + case e: IllegalArgumentException => () + case _ => throw new Error("List.range(1, 10, 0)") + } + try { + List.range(1, 10, x => 4) + } catch { + case e: IllegalArgumentException => () + case _ => throw new Error("List.range(1, 10, x => 4)") + } + assertEquals(List.range(10, 0, x => x - 2), + List(10, 8, 6, 4, 2)) + } +} + +object Test4 extends TestCase("t1721") with Assert { + override def enableStackTrace = false + override def runTest { + assertTrue(List(1,2,3).endsWith(List(2,3))) + assertFalse(List(1,2,3).endsWith(List(1,3))) + assertTrue(List(1,2,3).endsWith(List())) + assertFalse(List(1,2,3).endsWith(List(0,1,2,3))) + assertTrue(List(1,2,3).endsWith(List(1,2,3))) + assertFalse(List().endsWith(List(1,2,3))) + assertTrue(List().endsWith(List())) + } +} + +object Test5 extends TestCase("list pattern matching") { + def show(xs: List[String]) = xs match { + case "foo" :: args => args.toString + case List(x) => x.toString + case Nil => "Nil" + } + override def runTest { + assert(show(List()) == "Nil") + assert(show(List("a")) == "a") + assert(show(List("foo", "b")) == "List(b)") + } +} diff --git a/test/files/run/lists.scala b/test/files/run/lists.scala deleted file mode 100644 index 6c9b55961e..0000000000 --- a/test/files/run/lists.scala +++ /dev/null @@ -1,210 +0,0 @@ -//############################################################################ -// Lists -//############################################################################ - -//############################################################################ - -import testing.SUnit._ - -/** Test the Scala implementation of class scala.List. - * - * @author Stephane Micheloud - */ -object Test extends TestConsoleMain { - def suite = new TestSuite( - Test_multiset, // multiset operations: union, intersect, diff - Test1, //count, exists, filter, .. - Test2, //#468 - Test3, //#1691 - Test4, //#1721 - Test5 - ) -} - -object Test_multiset extends TestCase("multiset") with Assert { - override def enableStackTrace = false - override def runTest { - def isSubListOf[A](thiz: List[A], that: List[A]): Boolean = - thiz forall (that contains _) - val xs = List(1, 1, 2) - val ys = List(1, 2, 2, 3) - assertEquals("xs_union_ys", List(1, 1, 2, 1, 2, 2, 3), xs union ys) - assertEquals("ys_union_xs", List(1, 2, 2, 3, 1, 1, 2), ys union xs) - assertEquals("xs_intersect_ys", List(1, 2), xs intersect ys) - assertEquals("ys_intersect_xs", List(1, 2), ys intersect xs) - assertEquals("xs_diff_ys", List(1), xs diff ys) - assertEquals("ys_diff_xs", List(2, 3), ys diff xs) - assertTrue("xs_subset_ys", isSubListOf(xs -- ys, xs diff ys)) - - val zs = List(0, 1, 1, 2, 2, 2) - assertEquals("zs_union_ys", List(0, 1, 1, 2, 2, 2, 1, 2, 2, 3), zs union ys) - assertEquals("ys_union_zs", List(1, 2, 2, 3, 0, 1, 1, 2, 2, 2), ys union zs) - assertEquals("zs_intersect_ys", List(1, 2, 2), zs intersect ys) - assertEquals("ys_intersect_zs", List(1, 2, 2), ys intersect zs) - assertEquals("zs_diff_ys", List(0, 1, 2), zs diff ys) - assertEquals("ys_diff_zs", List(3), ys diff zs) - assertTrue("xs_subset_ys", isSubListOf(zs -- ys, zs diff ys)) - - val ws = List(2) - assertEquals("ws_union_ys", List(2, 1, 2, 2, 3), ws union ys) - assertEquals("ys_union_ws", List(1, 2, 2, 3, 2), ys union ws) - assertEquals("ws_intersect_ys", List(2), ws intersect ys) - assertEquals("ys_intersect_ws", List(2), ys intersect ws) - assertEquals("ws_diff_ys", List(), ws diff ys) - assertEquals("ys_diff_ws", List(1, 2, 3), ys diff ws) - assertTrue("ws_subset_ys", isSubListOf(ws -- ys, ws diff ys)) - - val vs = List(3, 2, 2, 1) - assertEquals("xs_union_vs", List(1, 1, 2, 3, 2, 2, 1), xs union vs) - assertEquals("vs_union_xs", List(3, 2, 2, 1, 1, 1, 2), vs union xs) - assertEquals("xs_intersect_vs", List(1, 2), xs intersect vs) - assertEquals("vs_intersect_xs", List(2, 1), vs intersect xs) - assertEquals("xs_diff_vs", List(1), xs diff vs) - assertEquals("vs_diff_xs", List(3, 2), vs diff xs) - assertTrue("xs_subset_vs", isSubListOf(xs -- vs, xs diff vs)) - - // tests adapted from Thomas Jung - assertTrue( - "be symmetric after sorting", { - def sort(zs: List[Int]) = zs sort ( _ > _ ) - sort(xs intersect ys) == sort(ys intersect xs) - }) - assertTrue( - "obey min cardinality", { - def cardinality[A](zs: List[A], e: A): Int = zs count (e == _) - val intersection = xs intersect ys - xs forall (e => cardinality(intersection, e) == (cardinality(xs, e) -min cardinality(ys, e))) - }) - assertTrue( - "maintain order", { - val intersection = xs intersect ys - val unconsumed = xs.foldLeft(intersection){(rest, e) => - if (! rest.isEmpty && e == rest.head) rest.tail else rest - } - unconsumed.isEmpty - }) - assertTrue( - "has the list as again intersection", - xs == (xs intersect xs) - ) - } -} - -object Test1 extends TestCase("ctor") with Assert { - override def enableStackTrace = false - override def runTest { - val xs1 = List(1, 2, 3) - val xs2 = List('a', 'b') - val xs3 = List(List(1, 2), List(4, 5)) - val xs4 = List(2, 4, 6, 8) - val xs5 = List(List(3, 4), List(3), List(4, 5)) - - { - val n1 = xs1 count { e => e % 2 != 0 } - val n2 = xs4 count { e => e < 5 } - assertEquals("check_count", 4, n1 + n2) - } - { - val b1 = xs1 exists { e => e % 2 == 0 } - val b2 = xs4 exists { e => e == 5 } - assertEquals("check_exists", false , b1 & b2) - } - { - val ys1 = xs1 filter { e => e % 2 == 0 } - val ys2 = xs4 filter { e => e < 5 } - assertEquals("check_filter", 3, ys1.length + ys2.length) - } - { - val n1 = xs1.foldLeft(0)((e1, e2) => e1 + e2) - val ys1 = xs4.foldLeft(List[Int]())((e1, e2) => e2 :: e1) - assertEquals("check_foldLeft", 10, n1 + ys1.length) - } - { - val b1 = xs1 forall { e => e < 10} - val b2 = xs4 forall { e => e % 2 == 0 } - assertEquals("check_forall", true, b1 & b2) - } - { - val ys1 = xs1 filterNot { e => e % 2 != 0 } - val ys2 = xs4 filterNot { e => e < 5 } - assertEquals("check_remove", 3, ys1.length + ys2.length) - } - { - val ys1 = xs1 zip xs2 - val ys2 = xs1 zip xs3 - assertEquals("check_zip", 4, ys1.length + ys2.length) - } - { - val ys1 = xs1.zipAll(xs2, 0, '_') - val ys2 = xs2.zipAll(xs1, '_', 0) - val ys3 = xs1.zipAll(xs3, 0, List(-1)) - assertEquals("check_zipAll", 9, ys1.length + ys2.length + ys3.length) - } - } -} - -object Test2 extends TestCase("t0468") with Assert { - override def enableStackTrace = false - override def runTest { - val xs1 = List(1, 2, 3) - val xs2 = List(0) - - val ys1 = xs1 ::: List(4) - assertEquals("check_:::", List(1, 2, 3, 4), ys1) - - val ys2 = ys1 - 4 - assertEquals("check_-", xs1, ys2) - - val n2 = (xs1 ++ ys1).length - val n3 = (xs1 ++ Nil).length - val n4 = (xs1 ++ ((new collection.mutable.ArrayBuffer[Int]) + 0)).length - assertEquals("check_++", 14, n2 + n3 + n4) - } -} - -object Test3 extends TestCase("t1691") with Assert { - override def enableStackTrace = false - override def runTest { - try { - List.range(1, 10, 0) - } catch { - case e: IllegalArgumentException => () - case _ => throw new Error("List.range(1, 10, 0)") - } - try { - List.range(1, 10, x => 4) - } catch { - case e: IllegalArgumentException => () - case _ => throw new Error("List.range(1, 10, x => 4)") - } - assertEquals(List.range(10, 0, x => x - 2), - List(10, 8, 6, 4, 2)) - } -} - -object Test4 extends TestCase("t1721") with Assert { - override def enableStackTrace = false - override def runTest { - assertTrue(List(1,2,3).endsWith(List(2,3))) - assertFalse(List(1,2,3).endsWith(List(1,3))) - assertTrue(List(1,2,3).endsWith(List())) - assertFalse(List(1,2,3).endsWith(List(0,1,2,3))) - assertTrue(List(1,2,3).endsWith(List(1,2,3))) - assertFalse(List().endsWith(List(1,2,3))) - assertTrue(List().endsWith(List())) - } -} - -object Test5 extends TestCase("list pattern matching") { - def show(xs: List[String]) = xs match { - case "foo" :: args => args.toString - case List(x) => x.toString - case Nil => "Nil" - } - override def runTest { - assert(show(List()) == "Nil") - assert(show(List("a")) == "a") - assert(show(List("foo", "b")) == "List(b)") - } -} diff --git a/test/files/run/t2316.scala b/test/files/run/t2316.scala deleted file mode 100644 index a3d5bf890b..0000000000 --- a/test/files/run/t2316.scala +++ /dev/null @@ -1,32 +0,0 @@ -case class T1(source: String) - -object T1 { - implicit def T1FromT2(implicit t2: T2) = new T1(t2.source) -} - -case class T2(source: String) - -object A { - def requireT1(implicit t1: T1) = t1 - - object B1 { - implicit val t2_b1 = new T2("from B1") - requireT1 - } - - object B2 { - def t1 = { - implicit val t2_b2 = new T2("from B2") - // Implicits.cacheResult returns T1.T1FromT2(t2_b1) here, which is bogus. Even though T1.T1FromT2 was found - // outside of the scope of A.B1, this implicit expression should _not_ be cached, as it includes the bound - // variable t2_b1 from this scope. - requireT1 - } - } -} - -object Test { - def main(args: Array[String]) { - assert(A.B2.t1.source == "from B2") - } -} \ No newline at end of file diff --git a/test/files/run/t2316_run.scala b/test/files/run/t2316_run.scala new file mode 100644 index 0000000000..a3d5bf890b --- /dev/null +++ b/test/files/run/t2316_run.scala @@ -0,0 +1,32 @@ +case class T1(source: String) + +object T1 { + implicit def T1FromT2(implicit t2: T2) = new T1(t2.source) +} + +case class T2(source: String) + +object A { + def requireT1(implicit t1: T1) = t1 + + object B1 { + implicit val t2_b1 = new T2("from B1") + requireT1 + } + + object B2 { + def t1 = { + implicit val t2_b2 = new T2("from B2") + // Implicits.cacheResult returns T1.T1FromT2(t2_b1) here, which is bogus. Even though T1.T1FromT2 was found + // outside of the scope of A.B1, this implicit expression should _not_ be cached, as it includes the bound + // variable t2_b1 from this scope. + requireT1 + } + } +} + +object Test { + def main(args: Array[String]) { + assert(A.B2.t1.source == "from B2") + } +} \ No newline at end of file -- cgit v1.2.3