Reverted probably unintentional change to Enume...

Reverted probably unintentional change to Enumeration (the method
formerly called valueOf and now called withName needs to return
Option[Value], not Value) and updated the failing tests to use the new
Enumeration interface.

2 files changed, 12 insertions, 12 deletions

diff --git a/test/files/run/enums.scala b/test/files/run/enums.scala
index 48571ee010..8ccdf138a2 100644
--- a/test/files/run/enums.scala
+++ b/test/files/run/enums.scala
@@ -13,7 +13,7 @@ object Test1 {
     ! (d == WeekDays.Sat || d == WeekDays.Sun);
 
   def run: Int = {
-    val it = WeekDays.elements filter (isWorkingDay);
+    val it = WeekDays.values filter (isWorkingDay);
     it.toList.length
   }
 }
@@ -30,7 +30,7 @@ object Test2 {
   }
 
   def run: Int = {
-    val it = for (val s <- ThreadState.elements; s.id != 0) yield s;
+    val it = for (val s <- ThreadState.values; s.id != 0) yield s;
     it.toList.length
   }
 }
@@ -42,7 +42,7 @@ object Test3 {
   }
 
   def run: Int = {
-    val it = for (val d <- Direction.elements; d.toString() startsWith "N") yield d;
+    val it = for (val d <- Direction.values; d.toString() startsWith "N") yield d;
     it.toList.length
   }
 }
diff --git a/test/files/run/t1505.scala b/test/files/run/t1505.scala
index 25c1a9117b..caadee8a0f 100644
--- a/test/files/run/t1505.scala
+++ b/test/files/run/t1505.scala
@@ -11,15 +11,15 @@ object R extends Enumeration {
 }
 
 object Test extends Application {
-  assert(Some(P(0)) == P.valueOf("A"))
-  assert(Some(P.C) == P.valueOf("C"))
-  assert(None == P.valueOf("Q"))
+  assert(Some(P(0)) == P.withName("A"))
+  assert(Some(P.C) == P.withName("C"))
+  assert(None == P.withName("Q"))
 
-  assert(Some(Q(0)) == Q.valueOf("A"))
-  assert(Some(Q.C) == Q.valueOf("C"))
-  assert(None == Q.valueOf("Q"))
+  assert(Some(Q(0)) == Q.withName("A"))
+  assert(Some(Q.C) == Q.withName("C"))
+  assert(None == Q.withName("Q"))
 
-  assert(None == R.valueOf("A"))
-  assert(None == R.valueOf("C"))
-  assert(None == R.valueOf("Q"))
+  assert(None == R.withName("A"))
+  assert(None == R.withName("C"))
+  assert(None == R.withName("Q"))
 }