From 20859263f2a2cf85464b333b9842bb31c020ee5e Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Mon, 15 Aug 2011 20:48:25 +0000
Subject: Removing the code which has been deprecated sin...

Removing the code which has been deprecated since 2.8.0. Contributed by
Simon Ochsenreither, although deleting code is such fun one hesitates to
call it a contribution. Still, we will. Closes SI-4860, no review.
---
 test/files/jvm/annotations.scala       | 2 +-
 test/files/jvm/backendBugUnapply.scala | 9 +++------
 test/files/jvm/bigints.scala           | 6 +++---
 test/files/jvm/manifests.scala         | 2 +-
 test/files/jvm/serialization.check     | 5 -----
 test/files/jvm/serialization.scala     | 9 ---------
 test/files/jvm/unittest_xml.scala      | 7 +++----
 7 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'test/files/jvm')

diff --git a/test/files/jvm/annotations.scala b/test/files/jvm/annotations.scala
index f32eb625e9..740a74226e 100644
--- a/test/files/jvm/annotations.scala
+++ b/test/files/jvm/annotations.scala
@@ -110,7 +110,7 @@ object Test4 {
     import java.lang.reflect.AnnotatedElement
     def printSourceAnnotation(a: Annotation) {
       val ann = a.asInstanceOf[SourceAnnotation]
-      println("@test.SourceAnnotation(mails=" + ann.mails.deepMkString("{", ",", "}") +
+      println("@test.SourceAnnotation(mails=" + ann.mails.deep.mkString("{", ",", "}") +
               ", value=" + ann.value + ")")
     }
     def printSourceAnnotations(target: AnnotatedElement) {
diff --git a/test/files/jvm/backendBugUnapply.scala b/test/files/jvm/backendBugUnapply.scala
index 5461b72f91..b4d029f478 100644
--- a/test/files/jvm/backendBugUnapply.scala
+++ b/test/files/jvm/backendBugUnapply.scala
@@ -1,14 +1,11 @@
 object Test {
-  import scala.xml.{Node,HasKeyValue}
-
-  def domatch(x:Node): Node = {
-    val hasBar = new HasKeyValue("bar")
+  import scala.xml.{Node,UnprefixedAttribute}
 
+  def domatch(x:Node) =
     x match {
-      case Node("foo", hasBar(z), _*) => z
+      case Node("foo", UnprefixedAttribute("bar", z, _), _*) => z
       case _ => null
     }
-  }
 
   def main(args: Array[String]): Unit = {
     println(domatch(<foo bar="baz"><hi/></foo>))
diff --git a/test/files/jvm/bigints.scala b/test/files/jvm/bigints.scala
index 4f6a06b7e1..f0d05f8b71 100644
--- a/test/files/jvm/bigints.scala
+++ b/test/files/jvm/bigints.scala
@@ -41,11 +41,11 @@ object Test_BigDecimal {
     println("z <= 3 = " + (z <= 3))
     println("3 < z = " + (3 < z))
 
-    val a: BigDecimal= Math.MAX_LONG
+    val a: BigDecimal= Long.MaxValue
     val b: BigDecimal = 1
     val c = a - b
-    println("c > MAX_LONG = " + (c > Math.MAX_LONG))
-    println("c <= MAX_LONG = " + (c <= Math.MAX_LONG))
+    println("c > MAX_LONG = " + (c > Long.MaxValue))
+    println("c <= MAX_LONG = " + (c <= Long.MaxValue))
   }
 }
 
diff --git a/test/files/jvm/manifests.scala b/test/files/jvm/manifests.scala
index 8b6c00f9a5..6bbea4d052 100644
--- a/test/files/jvm/manifests.scala
+++ b/test/files/jvm/manifests.scala
@@ -70,7 +70,7 @@ object Test2 {
   println()
 
   def loadArray[T](x: Array[Byte])(implicit m: reflect.Manifest[Array[T]]) =
-    load[Array[T]](x)(m).deepToString
+    load[Array[T]](x)(m).deep.toString
   println("Array()="+loadArray[Int](dump(Array(): Array[Int])))
   println("Array(true)="+loadArray[Boolean](dump(Array(true))))
   println("Array(a)="+loadArray[Char](dump(Array('a'))))
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index 0717de2a8e..8704bcc643 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -2,11 +2,6 @@ a1 = Array[1,2,3]
 _a1 = Array[1,2,3]
 arrayEquals(a1, _a1): true
 
-c1 = Cell(a)
-_c1 = Cell(a)
-c1 eq _c1: false, _c1 eq c1: false
-c1 equals _c1: true, _c1 equals c1: true
-
 e1 = Left(1)
 _e1 = Left(1)
 e1 eq _e1: false, _e1 eq e1: false
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 6a4e37bda9..1056f99848 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -56,15 +56,6 @@ object Test1_scala {
     println("arrayEquals(a1, _a1): " + arrayEquals(a1, _a1))
     println()
 
-    // Cell
-    val c1 = new Cell('a')
-    val _c1: Cell[Char] = read(write(c1))
-    println("c1 = " + c1)
-    println("_c1 = " + _c1)
-    println("c1 eq _c1: " + (c1 eq _c1) + ", _c1 eq c1: " + (_c1 eq c1))
-    println("c1 equals _c1: " + (c1 equals _c1) + ", _c1 equals c1: " + (_c1 equals c1))
-    println()
-
     // Either
     val e1 = Left(1)
     val _e1: Either[Int, String] = read(write(e1))
diff --git a/test/files/jvm/unittest_xml.scala b/test/files/jvm/unittest_xml.scala
index e3d69115bc..7163ce2d88 100644
--- a/test/files/jvm/unittest_xml.scala
+++ b/test/files/jvm/unittest_xml.scala
@@ -9,17 +9,16 @@ object Test {
 
   object MetaDataTest {
 
-    import scala.xml.{ HasKeyValue, TopScope, NamespaceBinding, Node, Atom, Text }
+    import scala.xml.{ TopScope, NamespaceBinding, Node, Atom, Text }
 
     def domatch(x:Node): Node = {
-      val hasBar = new HasKeyValue("bar")
       x match {
-        //case Node("foo", hasBar(z), _*) => z
-            case Node("foo", md, _*) if !hasBar.unapplySeq(md).isEmpty =>
+            case Node("foo", md @ UnprefixedAttribute(_, value, _), _*) if !value.isEmpty =>
                  md("bar")(0)
             case _ => new Atom(3)
       }
     }
+
     def run() {
 
       var x: MetaData         = Null
-- 
cgit v1.2.3