diff options
author | Paul Phillips <paulp@improving.org> | 2010-04-05 06:24:22 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-04-05 06:24:22 +0000 |
commit | e8a121e9e1ade3f283f42fceb3c18f30a8468f57 (patch) | |
tree | fc58111a69bb8940f7c5bd341fa3a8f097955403 /test/files/run | |
parent | 28ed5c6b216463a6e5bd8f06986c35a2036bda3f (diff) | |
download | scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.gz scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.bz2 scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.zip |
If I work on this patch any longer without chec...
If I work on this patch any longer without checking in I will go
stark raving mad. It is broken up into a couple pieces. This one is
the changes to test/. It includes fixing a bunch of tests, removing
deprecated constructs, moving jars used by tests to the most specific
plausible location rather than having all jars on the classpath of all
tests, and some filesystem layout change (continuations get their whole
own srcpath.) This would be the world's most tedious review, so let's
say no review.
[Note: after this commit, I doubt things will build very smoothly until
the rest of the partest changes follow. Which should only be seconds,
but just in case.]
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/arybufgrow.scala | 2 | ||||
-rw-r--r-- | test/files/run/bug594.scala | 2 | ||||
-rw-r--r-- | test/files/run/programmatic-main.check | 2 | ||||
-rw-r--r-- | test/files/run/regularpatmat.check | 126 | ||||
-rw-r--r-- | test/files/run/t2074.scala | 3 | ||||
-rw-r--r-- | test/files/run/t2074_2.scala | 2 | ||||
-rw-r--r-- | test/files/run/t2212.scala | 10 | ||||
-rw-r--r-- | test/files/run/t2946/Parsers.scala | 4 | ||||
-rw-r--r-- | test/files/run/t2946/ResponseCommon.scala | 14 | ||||
-rw-r--r-- | test/files/run/t2946/Test.scala | 7 | ||||
-rw-r--r-- | test/files/run/unittest_collection.scala | 2 |
11 files changed, 42 insertions, 132 deletions
diff --git a/test/files/run/arybufgrow.scala b/test/files/run/arybufgrow.scala index 35b3233055..9e18435243 100644 --- a/test/files/run/arybufgrow.scala +++ b/test/files/run/arybufgrow.scala @@ -2,7 +2,7 @@ import scala.collection.mutable._; object Test extends Application { val buf = new ArrayBuffer[String]; - for(val i <- List.range(0,1000)) { + for (i <- List.range(0,1000)) { buf += "hello"; } diff --git a/test/files/run/bug594.scala b/test/files/run/bug594.scala index 0c3be3d5de..f923a3cd2a 100644 --- a/test/files/run/bug594.scala +++ b/test/files/run/bug594.scala @@ -2,7 +2,7 @@ object Test { def main(args: Array[String]): Unit = { val array = Array("one", "two", "three") val firstTwo: Array[String] = array.slice(0,2) - for(val x <- firstTwo) + for (x <- firstTwo) Console.println(x) } } diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 44e77e3311..82118f8ece 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -5,7 +5,9 @@ typer superaccessors pickler refchecks +selectiveanf liftcode +selectivecps uncurry tailcalls explicitouter diff --git a/test/files/run/regularpatmat.check b/test/files/run/regularpatmat.check deleted file mode 100644 index 3417d9a98a..0000000000 --- a/test/files/run/regularpatmat.check +++ /dev/null @@ -1,126 +0,0 @@ -pretest -passed ok -testWR_1 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_2 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_3 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_4 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWR_5 -passed ok -passed ok -passed ok -testWR_6 -passed ok -passed ok -testWR_7 -passed ok -testWR_8 -passed ok -testWS -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWT -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testWV -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBK -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBM -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -BN preTest: true -testBN -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testBO -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -testMZ - bugs #132 #133b #180 #195 #196 #398 #406 #441 -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok -passed ok diff --git a/test/files/run/t2074.scala b/test/files/run/t2074.scala deleted file mode 100644 index 60646be733..0000000000 --- a/test/files/run/t2074.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - List.range(1,11).view.patch(5, List(100,101), 2) -} diff --git a/test/files/run/t2074_2.scala b/test/files/run/t2074_2.scala index 7d1d8181d8..4999552cc4 100644 --- a/test/files/run/t2074_2.scala +++ b/test/files/run/t2074_2.scala @@ -3,6 +3,8 @@ import scala.collection.immutable.IndexedSeq import scala.collection.IndexedSeqView object Test { + val funWithCCE = List.range(1,11).view.patch(5, List(100,101), 2) + val v = new IndexedSeqView[Int, IndexedSeq[Int]] { def underlying = IndexedSeq(1,2,3) def apply(idx: Int) = underlying(idx) diff --git a/test/files/run/t2212.scala b/test/files/run/t2212.scala new file mode 100644 index 0000000000..b9c0cd776b --- /dev/null +++ b/test/files/run/t2212.scala @@ -0,0 +1,10 @@ +object Test { + def main(args: Array[String]) { + import collection.mutable._ + val x4 = LinkedList[Int](1) + println(x4) + val y4 = LinkedList[Int](1) + println(y4) + println(x4 equals y4) // or (y4 equals x4) + } +} diff --git a/test/files/run/t2946/Parsers.scala b/test/files/run/t2946/Parsers.scala new file mode 100644 index 0000000000..c0961034c4 --- /dev/null +++ b/test/files/run/t2946/Parsers.scala @@ -0,0 +1,4 @@ +class Parser { + def parse(t: Any): Unit = { + } +} diff --git a/test/files/run/t2946/ResponseCommon.scala b/test/files/run/t2946/ResponseCommon.scala new file mode 100644 index 0000000000..fa9d8acccb --- /dev/null +++ b/test/files/run/t2946/ResponseCommon.scala @@ -0,0 +1,14 @@ +trait ResponseCommon extends Parser { + private[this] var paramsParser: Parser = null + def withParamsParser(parser: Parser) = {paramsParser = parser; this} + + class Foo { + println(paramsParser) + } + + override abstract def parse(t: Any): Unit = t match { + case ("params", value: List[_]) => value.foreach {paramsParser.parse(_)} + case _ => super.parse(t) + } +} + diff --git a/test/files/run/t2946/Test.scala b/test/files/run/t2946/Test.scala new file mode 100644 index 0000000000..e9d9896a0e --- /dev/null +++ b/test/files/run/t2946/Test.scala @@ -0,0 +1,7 @@ +class Test extends Parser with ResponseCommon + +object Test { + def main(args: Array[String]) { + new Test + } +} diff --git a/test/files/run/unittest_collection.scala b/test/files/run/unittest_collection.scala index 5d7ab97425..d45c23d4b5 100644 --- a/test/files/run/unittest_collection.scala +++ b/test/files/run/unittest_collection.scala @@ -96,7 +96,7 @@ object Test { ) val tr = new TestResult() ts.run(tr) - for(val failure <- tr.failures) { + for (failure <- tr.failures) { Console.println(failure) } } |