Remove SpecializeUtils

Did not work with filtered vulpix tests

Author: nicolasstucki

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -297,20 +297,18 @@ class CompilationTests extends ParallelTesting {
   @Test def linkAll: Unit = {
     def commonLibraries = {
       compileList("stdlib", StdLibSources.whitelisted, scala2Mode.and("-migration", "-Yno-inline")) +
-      compileList("strawman", strawmanSources, defaultOptions) +
-      compileList("testUtils", testUtils, defaultOptions)
+      compileList("strawman", strawmanSources, defaultOptions)
     }
 
     // Compile and setup libraries
 
     val libraries = commonLibraries.keepOutput.checkCompile()
 
     val commonLibrariesPath = defaultOutputDir + "commonLibraries/"
-    val utils = commonLibrariesPath + "testUtils/"
 
-    val utilsOnlyClassPath = mkClassPath(utils :: Jars.dottyTestDeps)
-    val stdlibClassPath = mkClassPath(commonLibrariesPath + "stdlib" :: utils :: Jars.dottyTestDeps)
-    val strawmanClassPath = mkClassPath(commonLibrariesPath + "strawman" :: utils :: Jars.dottyTestDeps)
+    val utilsOnlyClassPath = mkClassPath(Jars.dottyTestDeps)
+    val stdlibClassPath = mkClassPath(commonLibrariesPath + "stdlib" :: Jars.dottyTestDeps)
+    val strawmanClassPath = mkClassPath(commonLibrariesPath + "strawman" :: Jars.dottyTestDeps)
 
     def linkTests(dir: String, flags: Array[String], nameSuffix: String = ""): CompilationTest = {
       val testsDir = new JFile(dir)
@@ -363,7 +361,7 @@ class CompilationTests extends ParallelTesting {
       strawmanTest */
     }.checkRuns()
 
-    libraries.delete()
+    // libraries.delete()
   }
 
   private def strawmanSources =

tests/link/specialize/link-specialize-method-1.scala

@@ -1,4 +1,4 @@
-import tests.SpecializeUtils._
+import SpecializeUtils._
 
 object Test {
   def main(args: Array[String]): Unit = {
@@ -19,3 +19,13 @@ class Foo {
 
   override def toString: String = "Foo"
 }
+
+object SpecializeUtils {
+
+  def checkMethodExists(cls: Class[_], name: String, params: List[Class[_]], ret: Class[_], specialized: Boolean = true): Unit = {
+    val nameMatch = if (specialized) name + "\\$spec\\d*" else name
+    val methods = cls.getDeclaredMethods
+    assert(methods.count(x => x.getName.matches(nameMatch) && x.getParameterTypes.toList == params && x.getReturnType == ret) == 1)
+  }
+
+}

tests/link/specialize/link-specialize-method-2.scala

@@ -1,4 +1,4 @@
-import tests.SpecializeUtils._
+import SpecializeUtils._
 
 object Test {
 
@@ -26,3 +26,13 @@ class Foo {
 
   override def toString: String = "Foo"
 }
+
+object SpecializeUtils {
+
+  def checkMethodExists(cls: Class[_], name: String, params: List[Class[_]], ret: Class[_], specialized: Boolean = true): Unit = {
+    val nameMatch = if (specialized) name + "\\$spec\\d*" else name
+    val methods = cls.getDeclaredMethods
+    assert(methods.count(x => x.getName.matches(nameMatch) && x.getParameterTypes.toList == params && x.getReturnType == ret) == 1)
+  }
+
+}

tests/link/specialize/link-specialize-method-3.scala

@@ -1,4 +1,4 @@
-import tests.SpecializeUtils._
+import SpecializeUtils._
 
 object Test {
   def main(args: Array[String]): Unit = {
@@ -23,3 +23,13 @@ class Foo {
 class Bar extends Foo {
   override def toString: String = "Bar"
 }
+
+object SpecializeUtils {
+
+  def checkMethodExists(cls: Class[_], name: String, params: List[Class[_]], ret: Class[_], specialized: Boolean = true): Unit = {
+    val nameMatch = if (specialized) name + "\\$spec\\d*" else name
+    val methods = cls.getDeclaredMethods
+    assert(methods.count(x => x.getName.matches(nameMatch) && x.getParameterTypes.toList == params && x.getReturnType == ret) == 1)
+  }
+
+}