From e1eb91714d2129ea460e8c4da4ff65074acb736a Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@epfl.ch>
Date: Wed, 29 Sep 2010 09:47:54 +0000
Subject: Revert changes related to #1591. no review.

---
 test/files/jvm/serialization.scala | 26 --------------------------
 test/files/pos/t1591_pos.scala     |  7 -------
 test/files/run/t1591.check         |  1 -
 test/files/run/t1591.scala         | 14 --------------
 4 files changed, 48 deletions(-)
 delete mode 100644 test/files/pos/t1591_pos.scala
 delete mode 100644 test/files/run/t1591.check
 delete mode 100644 test/files/run/t1591.scala

(limited to 'test')

diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index b8656888c6..06086f4038 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -531,31 +531,6 @@ object Test6 {
   }
 }
 
-//############################################################################
-// Nested objects cannot get readresolve automatically because after deserialization
-// they would be null (they are treated as lazy vals)
-@serializable
-class Outer {
-
-    @serializable
-    object Inner
-}
-
-object Test7 {
-  val x = new Outer
-  x.Inner // initialize
-  try {
-    val y:Outer = read(write(x))
-    if (y.Inner == null)
-      println("Inner object is null")
-  }
-  catch {
-  case e: Exception =>
-    println("Error in Test7: " + e)
-  }
-
-}
-
 //############################################################################
 // Test code
 
@@ -567,7 +542,6 @@ object Test {
     Test4_xml
     Test5
     Test6
-    Test7
   }
 }
 
diff --git a/test/files/pos/t1591_pos.scala b/test/files/pos/t1591_pos.scala
deleted file mode 100644
index 4f55d7ce19..0000000000
--- a/test/files/pos/t1591_pos.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-trait A
-
-object Test {
-    lazy val a = new A {
-        object Zenek
-    }
-}
diff --git a/test/files/run/t1591.check b/test/files/run/t1591.check
deleted file mode 100644
index 48082f72f0..0000000000
--- a/test/files/run/t1591.check
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/test/files/run/t1591.scala b/test/files/run/t1591.scala
deleted file mode 100644
index 434064a5dd..0000000000
--- a/test/files/run/t1591.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract class A {
-
-    lazy val lazyBar = bar
-
-    object bar {
-        val foo = 12
-    }
-
-}
-
-object Test extends Application {
-    val a = new A{}
-    println(a.lazyBar.foo)
-}
-- 
cgit v1.2.3