title

From b4528e77302e9d745bed8c29ed298391925a8577 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 30 Jun 2010 23:56:44 +0000 Subject: Removed a test from pending which is also in fi... Removed a test from pending which is also in files. No review. --- test/pending/jvm/serialization.check | 198 ----------------- test/pending/jvm/serialization.scala | 411 ----------------------------------- 2 files changed, 609 deletions(-) delete mode 100644 test/pending/jvm/serialization.check delete mode 100644 test/pending/jvm/serialization.scala (limited to 'test/pending') diff --git a/test/pending/jvm/serialization.check b/test/pending/jvm/serialization.check deleted file mode 100644 index 397578bcba..0000000000 --- a/test/pending/jvm/serialization.check +++ /dev/null @@ -1,198 +0,0 @@ -x0 = List(1, 2, 3) -y0 = List(1, 2, 3) -x0 eq y0: false, y0 eq x0: false -x0 equals y0: true, y0 equals x0: true - -x1 = List() -y1 = List() -x1 eq y1: true, y1 eq x1: true - -x2 = None -y2 = None -x2 eq y2: true, y2 eq x2: true - -x3 = Array[1,2,3] -y3 = Array[1,2,3] -arrayEquals(x3, y3): true - -x4 = -y4 = -x4(2): 4 - y4(2): 4 - -x5 = 'hello -y5 = 'hello -x5 eq y5: true, y5 eq x5: true -x5 equals y5: true, y5 equals x5: true - -x6 = (BannerLimit,12345) -y6 = (BannerLimit,12345) -x6 eq y6: false, y6 eq x6: false -x6 equals y6: true, y6 equals x6: true - -x7 = RoundingMode -y7 = RoundingMode -x7 eq y7: true, y7 eq x7: true -x7 equals y7: true, y7 equals x7: true - -x8 = WeekDay -y8 = WeekDay -x8 eq y8: true, y8 eq x8: true -x8 equals y8: true, y8 equals x8: true - -x9 = UP -y9 = UP -x9 eq y9: true, y9 eq x9: true -x9 equals y9: true, y9 equals x9: true - -x10 = WeekDay(0) -y10 = WeekDay(0) -x10 eq y10: true, y10 eq x10: true -x10 equals y10: true, y10 equals x10: true - -x9 eq x10: false, x10 eq x9: false -x9 equals x10: false, x10 equals x9: false -x9 eq y10: false, y10 eq x9: false -x9 equals y10: false, y10 equals x9: false - -x = List((buffers,20), (layers,2), (title,3)) -y = List((buffers,20), (layers,2), (title,3)) -x equals y: true, y equals x: true - -x = Map(2 -> C, 1 -> B, 0 -> A) -y = Map(2 -> C, 1 -> B, 0 -> A) -x equals y: true, y equals x: true - -x = Map(buffers -> 20, layers -> 2, title -> 3) -y = Map(buffers -> 20, layers -> 2, title -> 3) -x equals y: true, y equals x: true - -x = Set(2, 3) -y = Set(2, 3) -x equals y: true, y equals x: true - -x = Set(5, 3) -y = Set(5, 3) -x equals y: true, y equals x: true - -x = Queue(a, b, c) -y = Queue(a, b, c) -x equals y: true, y equals x: true - -x = Stack(a, b, c) -y = Stack(a, b, c) -x equals y: true, y equals x: true - -x = Map(42 -> FortyTwo) -y = Map(42 -> FortyTwo) -x equals y: true, y equals x: true - -x = TreeSet(0, 2) -y = TreeSet(0, 2) -x equals y: true, y equals x: true - -x = Vector(1, 2, 3) -y = Vector(1, 2, 3) -x equals y: true, y equals x: true - -x = ArrayBuffer(one, two) -y = ArrayBuffer(one, two) -x equals y: true, y equals x: true - -x = Map(title -> 3, buffers -> 20, layers -> 2) -y = Map(title -> 3, buffers -> 20, layers -> 2) -x equals y: true, y equals x: true - -x = Set(0, 8, 9) -y = Set(0, 8, 9) -x equals y: true, y equals x: true - -x = Set(layers, buffers, title) -y = Set(layers, buffers, title) -x equals y: true, y equals x: true - -x = LinkedList(2, 3) -y = LinkedList(2, 3) -x equals y: true, y equals x: true - -x = Queue(20, 2, 3) -y = Queue(20, 2, 3) -x equals y: true, y equals x: true - -x = Stack(3, 2, 20) -y = Stack(3, 2, 20) -x equals y: true, y equals x: true - -x = ListBuffer(white, black) -y = ListBuffer(white, black) -x equals y: true, y equals x: true - -x = History((Feed,hello)) -y = History((Feed,hello)) -x equals y: true, y equals x: true - -x = title -y = title -x equals y: true, y equals x: true - -x = - - - - - - - - - - - - - - - - -

Last Name	First Name
Tom	20
Bob	22
James	19

- - -y = - - - - - - - - - - - - - - - - -

Last Name	First Name
Tom	20
Bob	22
James	19

- - -x equals y: true, y equals x: true - -x = Tim -y = Tim -x equals y: true, y equals x: true - -x = Bob -y = Bob -x equals y: true, y equals x: true - -x = John -y = John -x equals y: true, y equals x: true - -x = Bill -y = Bill -x equals y: true, y equals x: true - -x = Paul -y = Paul -x equals y: true, y equals x: true - diff --git a/test/pending/jvm/serialization.scala b/test/pending/jvm/serialization.scala deleted file mode 100644 index ff9413ae4b..0000000000 --- a/test/pending/jvm/serialization.scala +++ /dev/null @@ -1,411 +0,0 @@ -//############################################################################ -// Serialization -//############################################################################ - -import java.lang.System - -object Serialize { - @throws(classOf[java.io.IOException]) - def write[A](o: A): Array[Byte] = { - val ba = new java.io.ByteArrayOutputStream(512) - val out = new java.io.ObjectOutputStream(ba) - out.writeObject(o) - out.close() - ba.toByteArray() - } - @throws(classOf[java.io.IOException]) - @throws(classOf[ClassNotFoundException]) - def read[A](buffer: Array[Byte]): A = { - val in = - new java.io.ObjectInputStream(new java.io.ByteArrayInputStream(buffer)) - in.readObject().asInstanceOf[A] - } - def check[A, B](x: A, y: B) { - println("x = " + x) - println("y = " + y) - println("x equals y: " + (x equals y) + ", y equals x: " + (y equals x)) - println() - } -} -import Serialize._ - -//############################################################################ -// Test classes in package "scala" - -object Test1_scala { - - private def arrayToString[A](arr: Array[A]): String = - arr.mkString("Array[",",","]") - - private def arrayEquals[A, B](a1: Array[A], a2: Array[B]): Boolean = - (a1.length == a2.length) && - (Iterator.range(0, a1.length) forall { i => a1(i) == a2(i) }) - - @serializable - object WeekDay extends Enumeration { - type WeekDay = Value - val Monday, Tuesday, Wednesday, Thusday, Friday, Saturday, Sunday = Value - } - import WeekDay._, BigDecimal._, RoundingMode._ - - val x0 = List(1, 2, 3) - val x1 = Nil - val x2 = None - val x3 = Array(1, 2, 3) - val x4 = { x: Int => 2 * x } - val x5 = 'hello - val x6 = ("BannerLimit", 12345) - val x7 = BigDecimal.RoundingMode - val x8 = WeekDay - val x9 = UP // named element - val x10 = Monday // unamed element - - try { - val y0: List[Int] = read(write(x0)) - val y1: List[Nothing] = read(write(x1)) - val y2: Option[Nothing] = read(write(x2)) - val y3: Array[Int] = read(write(x3)) - val y4: Function[Int, Int] = read(write(x4)) - val y5: Symbol = read(write(x5)) - val y6: (String, Int) = read(write(x6)) - val y7: RoundingMode.type = read(write(x7)) - val y8: WeekDay.type = read(write(x8)) - val y9: RoundingMode = read(write(x9)) - val y10: WeekDay = read(write(x10)) - - println("x0 = " + x0) - println("y0 = " + y0) - println("x0 eq y0: " + (x0 eq y0) + ", y0 eq x0: " + (y0 eq x0)) - println("x0 equals y0: " + (x0 equals y0) + ", y0 equals x0: " + (y0 equals x0)) - println() - println("x1 = " + x1) - println("y1 = " + y1) - println("x1 eq y1: " + (x1 eq y1) + ", y1 eq x1: " + (y1 eq x1)) - println() - println("x2 = " + x2) - println("y2 = " + y2) - println("x2 eq y2: " + (x2 eq y2) + ", y2 eq x2: " + (y2 eq x2)) - println() - println("x3 = " + arrayToString(x3)) - println("y3 = " + arrayToString(y3)) - println("arrayEquals(x3, y3): " + arrayEquals(x3, y3)) - println() - println("x4 = ") - println("y4 = ") - println("x4(2): " + x4(2) + " - y4(2): " + y4(2)) - println() - println("x5 = " + x5) - println("y5 = " + y5) - println("x5 eq y5: " + (x5 eq y5) + ", y5 eq x5: " + (y5 eq x5)) - println("x5 equals y5: " + (x5 equals y5) + ", y5 equals x5: " + (y5 equals x5)) - println() - println("x6 = " + x6) - println("y6 = " + y6) - println("x6 eq y6: " + (x6 eq y6) + ", y6 eq x6: " + (y6 eq x6)) - println("x6 equals y6: " + (x6 equals y6) + ", y6 equals x6: " + (y6 equals x6)) - println() - println("x7 = " + x7) - println("y7 = " + y7) - println("x7 eq y7: " + (x7 eq y7) + ", y7 eq x7: " + (y7 eq x7)) - println("x7 equals y7: " + (x7 equals y7) + ", y7 equals x7: " + (y7 equals x7)) - println() - println("x8 = " + x8) - println("y8 = " + y8) - println("x8 eq y8: " + (x8 eq y8) + ", y8 eq x8: " + (y8 eq x8)) - println("x8 equals y8: " + (x8 equals y8) + ", y8 equals x8: " + (y8 equals x8)) - println() - println("x9 = " + x9) - println("y9 = " + y9) - println("x9 eq y9: " + (x9 eq y9) + ", y9 eq x9: " + (y9 eq x9)) - println("x9 equals y9: " + (x9 equals y9) + ", y9 equals x9: " + (y9 equals x9)) - println() - println("x10 = " + x10) - println("y10 = " + y10) - println("x10 eq y10: " + (x10 eq y10) + ", y10 eq x10: " + (y10 eq x10)) - println("x10 equals y10: " + (x10 equals y10) + ", y10 equals x10: " + (y10 equals x10)) - println() - println("x9 eq x10: " + (x9 eq x10) + ", x10 eq x9: " + (x10 eq x9)) - println("x9 equals x10: " + (x9 equals x10) + ", x10 equals x9: " + (x10 equals x9)) - println("x9 eq y10: " + (x9 eq y10) + ", y10 eq x9: " + (y10 eq x9)) - println("x9 equals y10: " + (x9 equals y10) + ", y10 equals x9: " + (y10 equals x9)) - println() - } - catch { - case e: Exception => - e.printStackTrace() - println("Error in Test1_scala: " + e) - } -} - -//############################################################################ -// Test classes in package "scala.collection.immutable" - -@serializable -object Test2_immutable { - import scala.collection.immutable.{ - BitSet, HashMap, ListMap, ListSet, Queue, Stack, TreeSet, TreeMap, Vector} - - val x1 = List( - ("buffers", 20), - ("layers", 2), - ("title", 3) - ) - - val m1 = new HashMap[Int, String] + (0 -> "A", 1 -> "B", 2 -> "C") - - val x2 = new ListMap[String, Int] + ("buffers" -> 20, "layers" -> 2, "title" -> 3) - - val x3 = { - val bs = new collection.mutable.BitSet() - bs += 2; bs += 3 - bs.toImmutable - } - - val x4 = new ListSet[Int]() + 3 + 5 - - val x5 = Queue("a", "b", "c") - - val x6 = Stack("a", "b", "c") - - val x7 = new TreeMap[Int, String] + (42 -> "FortyTwo") - - val x8 = new TreeSet[Int]() + 2 + 0 - - val x9 = Vector(1, 2, 3) - - try { - val y1: List[Pair[String, Int]] = read(write(x1)) - val n1: HashMap[Int, String] = read(write(m1)) - val y2: ListMap[String, Int] = read(write(x2)) - val y3: BitSet = read(write(x3)) - val y4: ListSet[Int] = read(write(x4)) - val y5: Queue[String] = read(write(x5)) - val y6: Stack[String] = read(write(x6)) - val y7: TreeMap[Int, String] = read(write(x7)) - val y8: TreeSet[Int] = read(write(x8)) - val y9: Vector[Int] = read(write(x9)) - - check(x1, y1) - check(m1, n1) - check(x2, y2) - check(x3, y3) - check(x4, y4) - check(x5, y5) - check(x6, y6) - check(x7, y7) - check(x8, y8) - check(x9, y9) - } - catch { - case e: Exception => - println("Error in Test2_immutable: " + e) - throw e - } -} - -//############################################################################ -// Test classes in package "scala.collection.mutable" - -object Test3_mutable { - import scala.collection.mutable.{ - ArrayBuffer, BitSet, HashMap, HashSet, History, LinkedList, ListBuffer, - Publisher, Queue, RevertableHistory, Stack} - - val x0 = new ArrayBuffer[String] - x0 ++= List("one", "two") - - val x2 = new BitSet() - x2 += 0 - x2 += 8 - x2 += 9 - - val x1 = new HashMap[String, Int] - x1 ++= Test2_immutable.x1 - - val x3 = new HashSet[String] - x3 ++= Test2_immutable.x1.map(p => p._1) - - val x4 = new LinkedList[Int](2, null) - x4.append(new LinkedList(3, null)) - - val x5 = new Queue[Int] - x5 ++= Test2_immutable.x1.map(p => p._2) - - val x6 = new Stack[Int] - x6 pushAll x5 - - val x7 = new ListBuffer[String] - x7 ++= List("white", "black") - - @serializable - class Feed extends Publisher[String, Feed] { - override def toString() = "Feed" - } - val feed = new Feed - - val x8 = new History[String, Feed] - x8.notify(feed, "hello") - - try { - val y0: ArrayBuffer[String] = read(write(x0)) - val y1: HashMap[String, Int] = read(write(x1)) - val y2: BitSet = read(write(x2)) - val y3: HashSet[String] = read(write(x3)) - val y4: LinkedList[Int] = read(write(x4)) - val y5: Queue[Int] = read(write(x5)) - val y6: Stack[Int] = read(write(x6)) - val y7: ListBuffer[String] = read(write(x7)) - val y8: History[String, Feed] = read(write(x8)) - - check(x0, y0) - check(x1, y1) - check(x2, y2) - check(x3, y3) - check(x4, y4) - check(x5, y5) - check(x6, y6) - check(x7, y7) - check(x8, y8) - } - catch { - case e: Exception => - println("Error in Test3_mutable: " + e) - } -} - -//############################################################################ -// Test classes in package "scala.xml" - -object Test4_xml { - import scala.xml.Elem - - val x1 = title; - - case class Person(name: String, age: Int) - - class AddressBook(a: Person*) { - private val people: List[Person] = a.toList - def toXHTML = - - - - - - { for (p <- people) yield - - - - } -

Last Name	First Name
{ p.name }	{ p.age.toString() }

; - } - - val people = new AddressBook( - Person("Tom", 20), - Person("Bob", 22), - Person("James", 19)) - - val x2 = - - - { people.toXHTML } - - ; - - try { - val y1: scala.xml.Elem = read(write(x1)) - val y2: scala.xml.Elem = read(write(x2)) - - check(x1, y1) - check(x2, y2) - } - catch { - case e: Exception => - println("Error in Test4_xml: " + e) - } -} - -//############################################################################ -// Test user-defined classes WITHOUT nesting - -@serializable -class Person(_name: String) { - private var name = _name - override def toString() = name - override def equals(that: Any): Boolean = - that.isInstanceOf[Person] && - (name == that.asInstanceOf[Person].name) -} - -@serializable -class Employee(_name: String) { - private var name = _name - override def toString() = name -} -@serializable -object bob extends Employee("Bob") - -object Test5 { - val x1 = new Person("Tim") - val x2 = bob - - try { - val y1: Person = read(write(x1)) - val y2: Employee = read(write(x2)) - - check(x1, y1) - check(x2, y2) - } - catch { - case e: Exception => - println("Error in Test5: " + e) - } -} - -//############################################################################ -// Test user-defined classes WITH nesting - -@serializable -object Test6 { - @serializable - object bill extends Employee("Bill") { - val x = paul - } - @serializable - object paul extends Person("Paul") { - val x = 4 // bill; => StackOverflowException !!! - } - val x1 = new Person("John") - val x2 = bill - val x3 = paul - - try { - val y1: Person = read(write(x1)) - val y2: Employee = read(write(x2)) - val y3: Person = read(write(x3)) - - check(x1, y1) - check(x2, y2) - check(x3, y3) - } - catch { - case e: Exception => - println("Error in Test6: " + e) - } -} - -//############################################################################ -// Test code - -object Test { - def main(args: Array[String]) { - Test1_scala - Test2_immutable - Test3_mutable - Test4_xml - Test5 - Test6 - } -} - -//############################################################################ - -- cgit v1.2.3