From b9785280a7138a2bb52060faf94807aa0d07dec1 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 24 Aug 2011 17:11:55 +0000 Subject: Renamed tests named bugXXX to tXXX, no review. --- test/disabled/pos/bug2919.scala | 12 ------------ test/disabled/pos/bug531.scala | 10 ---------- test/disabled/pos/bug532.scala | 10 ---------- test/disabled/pos/t2919.scala | 12 ++++++++++++ test/disabled/pos/t531.scala | 10 ++++++++++ test/disabled/pos/t532.scala | 10 ++++++++++ test/disabled/run/bug4279.scala | 38 -------------------------------------- test/disabled/run/t4279.scala | 38 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 test/disabled/pos/bug2919.scala delete mode 100644 test/disabled/pos/bug531.scala delete mode 100644 test/disabled/pos/bug532.scala create mode 100644 test/disabled/pos/t2919.scala create mode 100644 test/disabled/pos/t531.scala create mode 100644 test/disabled/pos/t532.scala delete mode 100644 test/disabled/run/bug4279.scala create mode 100644 test/disabled/run/t4279.scala (limited to 'test/disabled') diff --git a/test/disabled/pos/bug2919.scala b/test/disabled/pos/bug2919.scala deleted file mode 100644 index 5e51cf9de7..0000000000 --- a/test/disabled/pos/bug2919.scala +++ /dev/null @@ -1,12 +0,0 @@ -import javax.xml.bind.annotation.adapters.XmlAdapter -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter - -case class Link( - @XmlJavaTypeAdapter(classOf[StringOptionAdapter]) val title: Option[String] -) - -class StringOptionAdapter extends XmlAdapter[String, Option[String]] { - def unmarshal(str: String) = error("stub") - def marshal(op: Option[String]) = error("Stub") -} - diff --git a/test/disabled/pos/bug531.scala b/test/disabled/pos/bug531.scala deleted file mode 100644 index 02763e08f1..0000000000 --- a/test/disabled/pos/bug531.scala +++ /dev/null @@ -1,10 +0,0 @@ -object Test extends App { - import scala.reflect._; - def titi = { - var truc = 0 - val tata: Code[()=>Unit] = () => { - truc = 6 - } - () - } -} diff --git a/test/disabled/pos/bug532.scala b/test/disabled/pos/bug532.scala deleted file mode 100644 index 32649b1629..0000000000 --- a/test/disabled/pos/bug532.scala +++ /dev/null @@ -1,10 +0,0 @@ -object Test extends App { - import scala.reflect._; - def titi: Unit = { - var truc = 0 - val tata: Code[()=>Unit] = () => { - truc = truc + 6 - } - () - } -} diff --git a/test/disabled/pos/t2919.scala b/test/disabled/pos/t2919.scala new file mode 100644 index 0000000000..5e51cf9de7 --- /dev/null +++ b/test/disabled/pos/t2919.scala @@ -0,0 +1,12 @@ +import javax.xml.bind.annotation.adapters.XmlAdapter +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter + +case class Link( + @XmlJavaTypeAdapter(classOf[StringOptionAdapter]) val title: Option[String] +) + +class StringOptionAdapter extends XmlAdapter[String, Option[String]] { + def unmarshal(str: String) = error("stub") + def marshal(op: Option[String]) = error("Stub") +} + diff --git a/test/disabled/pos/t531.scala b/test/disabled/pos/t531.scala new file mode 100644 index 0000000000..02763e08f1 --- /dev/null +++ b/test/disabled/pos/t531.scala @@ -0,0 +1,10 @@ +object Test extends App { + import scala.reflect._; + def titi = { + var truc = 0 + val tata: Code[()=>Unit] = () => { + truc = 6 + } + () + } +} diff --git a/test/disabled/pos/t532.scala b/test/disabled/pos/t532.scala new file mode 100644 index 0000000000..32649b1629 --- /dev/null +++ b/test/disabled/pos/t532.scala @@ -0,0 +1,10 @@ +object Test extends App { + import scala.reflect._; + def titi: Unit = { + var truc = 0 + val tata: Code[()=>Unit] = () => { + truc = truc + 6 + } + () + } +} diff --git a/test/disabled/run/bug4279.scala b/test/disabled/run/bug4279.scala deleted file mode 100644 index d0afc3a032..0000000000 --- a/test/disabled/run/bug4279.scala +++ /dev/null @@ -1,38 +0,0 @@ -import scala.tools.partest._ - -// Attempting to verify slice isn't 100,000x slower -// with views than non-views. -class Runner(num: Int, reps: Int) extends TestUtil { - var dummy = 0 - val range = Array.range(0, num) - - def iteratorSlice = { - def it = range.iterator.slice(num - 2, num) - for (i <- 1 to reps) - it foreach (dummy = _) - } - def viewSlice = { - val view = range.view.slice(num - 2, num) - for (i <- 1 to reps) - view foreach (dummy = _) - } - def straightSlice = { - val xs = range.slice(num - 2, num) - for (i <- 1 to reps) - xs foreach (dummy = _) - } - def run(multiple: Double) = { - verifySpeed(straightSlice, iteratorSlice, multiple) - verifySpeed(straightSlice, viewSlice, multiple) - } -} - -object Test { - def main(args: Array[String]): Unit = { - // warmup - { val r = new Runner(1000000, 10) ; r.straightSlice ; r.iteratorSlice ; r.viewSlice } - - new Runner(10000000, 10) run 500 - new Runner(10000000, 50) run 300 - } -} diff --git a/test/disabled/run/t4279.scala b/test/disabled/run/t4279.scala new file mode 100644 index 0000000000..d0afc3a032 --- /dev/null +++ b/test/disabled/run/t4279.scala @@ -0,0 +1,38 @@ +import scala.tools.partest._ + +// Attempting to verify slice isn't 100,000x slower +// with views than non-views. +class Runner(num: Int, reps: Int) extends TestUtil { + var dummy = 0 + val range = Array.range(0, num) + + def iteratorSlice = { + def it = range.iterator.slice(num - 2, num) + for (i <- 1 to reps) + it foreach (dummy = _) + } + def viewSlice = { + val view = range.view.slice(num - 2, num) + for (i <- 1 to reps) + view foreach (dummy = _) + } + def straightSlice = { + val xs = range.slice(num - 2, num) + for (i <- 1 to reps) + xs foreach (dummy = _) + } + def run(multiple: Double) = { + verifySpeed(straightSlice, iteratorSlice, multiple) + verifySpeed(straightSlice, viewSlice, multiple) + } +} + +object Test { + def main(args: Array[String]): Unit = { + // warmup + { val r = new Runner(1000000, 10) ; r.straightSlice ; r.iteratorSlice ; r.viewSlice } + + new Runner(10000000, 10) run 500 + new Runner(10000000, 50) run 300 + } +} -- cgit v1.2.3