summaryrefslogtreecommitdiff
path: root/test/pending/run
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-10-04 20:28:56 -0700
committerPaul Phillips <paulp@improving.org>2012-10-04 21:28:45 -0700
commit5240da5073168424db50b969c1bbf7089d0a4242 (patch)
treedc2d8a1ce08200db02ff433f26a5dcacaab150e9 /test/pending/run
parent6d6c182ae1b25919c573373ea27759041f579e4c (diff)
downloadscala-5240da5073168424db50b969c1bbf7089d0a4242.tar.gz
scala-5240da5073168424db50b969c1bbf7089d0a4242.tar.bz2
scala-5240da5073168424db50b969c1bbf7089d0a4242.zip
Moved a bunch of passing tests out of pending.
If the test names can be believed, this covers SI-294 SI-1751 SI-1782 SI-2318 SI-3897 SI-4649 SI-4786 SI-5293 SI-5399 SI-5418 SI-5606 SI-5610 SI-5639 Most of these were moved to pending in 1729b26500 due to failures of unknown cause. It was suggested they be brought back "as soon as possible" and that was three months ago; I suppose it's now possible. If they need to be disabled again, please move them to test/disabled, not to test/pending. "disabled" should mean a formerly passing test in limbo; "pending" tests document bugs which await fixing. I also removed some dead files in test/ - the files with a "cmds" extension are from a failed experiment and do not do anything.
Diffstat (limited to 'test/pending/run')
-rw-r--r--test/pending/run/reify_implicits-new.check1
-rw-r--r--test/pending/run/reify_implicits-new.scala16
-rw-r--r--test/pending/run/reify_implicits-old.check1
-rw-r--r--test/pending/run/reify_implicits-old.scala15
-rw-r--r--test/pending/run/t2318.check2
-rw-r--r--test/pending/run/t2318.scala38
-rw-r--r--test/pending/run/t3897.check8
-rw-r--r--test/pending/run/t3897/J_2.java27
-rw-r--r--test/pending/run/t3897/a_1.scala8
-rw-r--r--test/pending/run/t3897/a_2.scala23
-rw-r--r--test/pending/run/t5293-map.scala88
-rw-r--r--test/pending/run/t5293.scala83
-rw-r--r--test/pending/run/t5418.check0
-rw-r--r--test/pending/run/t5418.scala8
-rw-r--r--test/pending/run/t5610a.check1
-rw-r--r--test/pending/run/t5610a.scala19
16 files changed, 0 insertions, 338 deletions
diff --git a/test/pending/run/reify_implicits-new.check b/test/pending/run/reify_implicits-new.check
deleted file mode 100644
index e3aeb20f6b..0000000000
--- a/test/pending/run/reify_implicits-new.check
+++ /dev/null
@@ -1 +0,0 @@
-x = List(1, 2, 3, 4)
diff --git a/test/pending/run/reify_implicits-new.scala b/test/pending/run/reify_implicits-new.scala
deleted file mode 100644
index 42a1deef26..0000000000
--- a/test/pending/run/reify_implicits-new.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import scala.reflect.{ClassTag, classTag}
-import scala.reflect.runtime.universe._
-import scala.tools.reflect.Eval
-
-object Test extends App {
- reify {
- implicit def arrayWrapper[A : ClassTag](x: Array[A]) =
- new {
- def sort(p: (A, A) => Boolean) = {
- util.Sorting.stableSort(x, p); x
- }
- }
- val x = Array(2, 3, 1, 4)
- println("x = "+ x.sort((x: Int, y: Int) => x < y).toList)
- }.eval
-} \ No newline at end of file
diff --git a/test/pending/run/reify_implicits-old.check b/test/pending/run/reify_implicits-old.check
deleted file mode 100644
index e3aeb20f6b..0000000000
--- a/test/pending/run/reify_implicits-old.check
+++ /dev/null
@@ -1 +0,0 @@
-x = List(1, 2, 3, 4)
diff --git a/test/pending/run/reify_implicits-old.scala b/test/pending/run/reify_implicits-old.scala
deleted file mode 100644
index 8ff256d2d4..0000000000
--- a/test/pending/run/reify_implicits-old.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-import scala.reflect.runtime.universe._
-import scala.tools.reflect.Eval
-
-object Test extends App {
- reify {
- implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
- new {
- def sort(p: (A, A) => Boolean) = {
- util.Sorting.stableSort(x, p); x
- }
- }
- val x = Array(2, 3, 1, 4)
- println("x = "+ x.sort((x: Int, y: Int) => x < y).toList)
- }.eval
-} \ No newline at end of file
diff --git a/test/pending/run/t2318.check b/test/pending/run/t2318.check
deleted file mode 100644
index a486f1ac47..0000000000
--- a/test/pending/run/t2318.check
+++ /dev/null
@@ -1,2 +0,0 @@
-bar
-bar
diff --git a/test/pending/run/t2318.scala b/test/pending/run/t2318.scala
deleted file mode 100644
index e42cbb9680..0000000000
--- a/test/pending/run/t2318.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-import java.security._
-
-object Test {
- trait Bar { def bar: Unit }
-
- object Mgr extends SecurityManager {
- override def checkPermission(perm: Permission) = perm match {
- case _: java.lang.RuntimePermission => ()
- case _: java.io.FilePermission => ()
- case x: java.security.AccessControlException if x.getName contains ".networkaddress." => () // generality ftw
- case _ => super.checkPermission(perm)
- }
- }
-
- def t1() = {
- val p = Runtime.getRuntime().exec("ls");
- type Destroyable = { def destroy() : Unit }
- def doDestroy( obj : Destroyable ) : Unit = obj.destroy();
- doDestroy( p );
- }
- def t2() = {
- System.setSecurityManager(Mgr)
-
- val b = new Bar { def bar = println("bar") }
- b.bar
-
- val structural = b.asInstanceOf[{ def bar: Unit }]
- structural.bar
- }
-
- def main(args: Array[String]) {
- // figuring this will otherwise break on windows
- try t1()
- catch { case _: java.io.IOException => () }
-
- t2()
- }
-}
diff --git a/test/pending/run/t3897.check b/test/pending/run/t3897.check
deleted file mode 100644
index 244b83716f..0000000000
--- a/test/pending/run/t3897.check
+++ /dev/null
@@ -1,8 +0,0 @@
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(One$$messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
-(messages,scala.collection.mutable.MutableList<java.lang.String>)
diff --git a/test/pending/run/t3897/J_2.java b/test/pending/run/t3897/J_2.java
deleted file mode 100644
index 178412dc92..0000000000
--- a/test/pending/run/t3897/J_2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import java.lang.reflect.*;
-
-public class J_2 {
- public void f1(Class<?> clazz) {
- Field[] fields = clazz.getDeclaredFields();
- for (int i = 0 ; i < fields.length; i++) {
- String name = fields[i].getName();
- if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
- else System.out.println("(" + name + "," + fields[i].getGenericType() + ")");
- }
- }
- public void f2(Class<?> clazz) {
- Method[] methods = clazz.getDeclaredMethods();
- for (int i = 0 ; i < methods.length; i++) {
- String name = methods[i].getName();
- if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
- else System.out.println("(" + name + "," + methods[i].getGenericReturnType() + ")");
- }
- }
-
- public void javaRun() {
- f1(One.class);
- f2(One.class);
- f1(Two.class);
- f2(Two.class);
- }
-} \ No newline at end of file
diff --git a/test/pending/run/t3897/a_1.scala b/test/pending/run/t3897/a_1.scala
deleted file mode 100644
index 4da959e2ac..0000000000
--- a/test/pending/run/t3897/a_1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-class One {
- private val messages = new collection.mutable.MutableList[String]
- List("a") foreach { messages += _ }
-}
-
-class Two {
- private val messages = new collection.mutable.MutableList[String]
-}
diff --git a/test/pending/run/t3897/a_2.scala b/test/pending/run/t3897/a_2.scala
deleted file mode 100644
index 4d9e59ef05..0000000000
--- a/test/pending/run/t3897/a_2.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-object Test {
- def f1(clazz: Class[_]) = (
- clazz.getDeclaredFields.toList
- . filterNot (_.getName contains "bitmap$")
- . map (f => (f.getName, f.getGenericType))
- . foreach (println)
- )
- def f2(clazz: Class[_]) = (
- clazz.getDeclaredMethods.toList
- . filterNot (_.getName contains "bitmap$")
- . map (f => (f.getName, f.getGenericReturnType))
- . foreach (println)
- )
-
- def main(args: Array[String]): Unit = {
- f1(classOf[One])
- f2(classOf[One])
- f1(classOf[Two])
- f2(classOf[Two])
-
- new J_2().javaRun
- }
-}
diff --git a/test/pending/run/t5293-map.scala b/test/pending/run/t5293-map.scala
deleted file mode 100644
index 2707aed07e..0000000000
--- a/test/pending/run/t5293-map.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-import scala.collection.JavaConverters._
-
-
-
-object Test extends App {
-
- def bench(label: String)(body: => Unit): Long = {
- val start = System.nanoTime
-
- 0.until(10).foreach(_ => body)
-
- val end = System.nanoTime
-
- //println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
- end - start
- }
-
- def benchJava(values: java.util.Map[Int, Int]) = {
- bench("Java Map") {
- val m = new java.util.HashMap[Int, Int]
-
- m.putAll(values)
- }
- }
-
- def benchScala(values: Iterable[(Int, Int)]) = {
- bench("Scala Map") {
- val m = new scala.collection.mutable.HashMap[Int, Int]
-
- m ++= values
- }
- }
-
- def benchScalaSorted(values: Iterable[(Int, Int)]) = {
- bench("Scala Map sorted") {
- val m = new scala.collection.mutable.HashMap[Int, Int]
-
- m ++= values.toArray.sorted
- }
- }
-
- def benchScalaPar(values: Iterable[(Int, Int)]) = {
- bench("Scala ParMap") {
- val m = new scala.collection.parallel.mutable.ParHashMap[Int, Int] map { x => x }
-
- m ++= values
- }
- }
-
- val total = 50000
- val values = (0 until total) zip (0 until total)
- val map = scala.collection.mutable.HashMap.empty[Int, Int]
-
- map ++= values
-
- // warmup
- for (x <- 0 until 5) {
- benchJava(map.asJava)
- benchScala(map)
- benchScalaPar(map)
- benchJava(map.asJava)
- benchScala(map)
- benchScalaPar(map)
- }
-
- val javamap = benchJava(map.asJava)
- val scalamap = benchScala(map)
- val scalaparmap = benchScalaPar(map)
-
- // println(javamap)
- // println(scalamap)
- // println(scalaparmap)
-
- assert(scalamap < (javamap * 10), "scalamap: " + scalamap + " vs. javamap: " + javamap)
- assert(scalaparmap < (javamap * 10), "scalaparmap: " + scalaparmap + " vs. javamap: " + javamap)
-}
-
-
-
-
-
-
-
-
diff --git a/test/pending/run/t5293.scala b/test/pending/run/t5293.scala
deleted file mode 100644
index 01ead45d2a..0000000000
--- a/test/pending/run/t5293.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-import scala.collection.JavaConverters._
-
-
-
-object Test extends App {
-
- def bench(label: String)(body: => Unit): Long = {
- val start = System.nanoTime
-
- 0.until(10).foreach(_ => body)
-
- val end = System.nanoTime
-
- //println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
- end - start
- }
-
- def benchJava(values: java.util.Collection[Int]) = {
- bench("Java Set") {
- val set = new java.util.HashSet[Int]
-
- set.addAll(values)
- }
- }
-
- def benchScala(values: Iterable[Int]) = {
- bench("Scala Set") {
- val set = new scala.collection.mutable.HashSet[Int]
-
- set ++= values
- }
- }
-
- def benchScalaSorted(values: Iterable[Int]) = {
- bench("Scala Set sorted") {
- val set = new scala.collection.mutable.HashSet[Int]
-
- set ++= values.toArray.sorted
- }
- }
-
- def benchScalaPar(values: Iterable[Int]) = {
- bench("Scala ParSet") {
- val set = new scala.collection.parallel.mutable.ParHashSet[Int] map { x => x }
-
- set ++= values
- }
- }
-
- val values = 0 until 50000
- val set = scala.collection.mutable.HashSet.empty[Int]
-
- set ++= values
-
- // warmup
- for (x <- 0 until 5) {
- benchJava(set.asJava)
- benchScala(set)
- benchScalaPar(set)
- benchJava(set.asJava)
- benchScala(set)
- benchScalaPar(set)
- }
-
- val javaset = benchJava(set.asJava)
- val scalaset = benchScala(set)
- val scalaparset = benchScalaPar(set)
-
- assert(scalaset < (javaset * 8), "scalaset: " + scalaset + " vs. javaset: " + javaset)
- assert(scalaparset < (javaset * 8), "scalaparset: " + scalaparset + " vs. javaset: " + javaset)
-}
-
-
-
-
-
-
-
-
diff --git a/test/pending/run/t5418.check b/test/pending/run/t5418.check
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/pending/run/t5418.check
+++ /dev/null
diff --git a/test/pending/run/t5418.scala b/test/pending/run/t5418.scala
deleted file mode 100644
index e3cb20cf82..0000000000
--- a/test/pending/run/t5418.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.reflect.runtime.universe._
-import scala.tools.reflect.Eval
-
-object Test extends App {
- reify {
- new Object().getClass
- }.eval
-} \ No newline at end of file
diff --git a/test/pending/run/t5610a.check b/test/pending/run/t5610a.check
deleted file mode 100644
index 2aa46b3b91..0000000000
--- a/test/pending/run/t5610a.check
+++ /dev/null
@@ -1 +0,0 @@
-Stroke a kitten
diff --git a/test/pending/run/t5610a.scala b/test/pending/run/t5610a.scala
deleted file mode 100644
index f20b295762..0000000000
--- a/test/pending/run/t5610a.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-object Test extends App {
- class Result(_str: => String) {
- lazy val str = _str
- }
-
- def foo(str: => String)(i: Int) = new Result(str)
-
- def bar(f: Int => Result) = f(42)
-
- var test: String = null
- val result = bar(foo(test))
- test = "bar"
-
- if (result.str == null) {
- println("Destroy ALL THE THINGS!!!")
- } else {
- println("Stroke a kitten")
- }
-} \ No newline at end of file