Link generic test to actual implementations of Enum and EnumValues

These are now implemented in scala.runtime.

3 files changed, 2 insertions, 26 deletions

diff --git a/tests/run/generic/Color.scala b/tests/run/generic/Color.scala
index 0a0f3f1e5..183f18349 100644
--- a/tests/run/generic/Color.scala
+++ b/tests/run/generic/Color.scala
@@ -12,7 +12,7 @@ sealed trait Color extends Enum
 
 object Color {
 
-  private val $values = new EnumValues[Color]
+  private val $values = new runtime.EnumValues[Color]
   def valueOf: Int => Color = $values
   def values = $values.values
 
diff --git a/tests/run/generic/Enum.scala b/tests/run/generic/Enum.scala
deleted file mode 100644
index 38c9022d5..000000000
--- a/tests/run/generic/Enum.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package generic
-
-import Shapes.Singleton
-import scala.collection.mutable.ResizableArray
-import scala.collection.immutable.Seq
-
-trait Enum {
-  def enumTag: Int
-}
-
-trait FiniteEnum extends Enum
-
-class EnumValues[E <: Enum] extends ResizableArray[E] {
-  private var valuesCache: Seq[E] = Nil
-  def register(v: E) = {
-    ensureSize(v.enumTag + 1)
-    array(v.enumTag) = v
-    valuesCache = null
-  }
-  def values: Seq[E] = {
-    if (valuesCache == null) valuesCache = array.filter(_ != null).toList.asInstanceOf[scala.List[E]]
-    valuesCache
-  }
-}
diff --git a/tests/run/generic/SearchResult.scala b/tests/run/generic/SearchResult.scala
index 9a747fc48..d39ee89a0 100644
--- a/tests/run/generic/SearchResult.scala
+++ b/tests/run/generic/SearchResult.scala
@@ -13,7 +13,7 @@ sealed trait SearchResult extends Enum
 
 object SearchResult extends {
 
-  private val $values = new EnumValues[SearchResult]
+  private val $values = new runtime.EnumValues[SearchResult]
   def valueOf: Int => SearchResult = $values
   def values = $values.values