Merge pull request #10659 from som-snytt/tweak/remove-ParserTest

Remove ParserTest
scala · Jan 15, 2024 · fe7fd99 · fe7fd99
2 parents 4deab53 + f55a7cb
commit fe7fd99
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 41 deletions.
diff --git a/src/partest/scala/tools/partest/ParserTest.scala b/src/partest/scala/tools/partest/ParserTest.scala
diff --git a/test/files/run/t3368-b.scala b/test/files/run/t3368-b.scala
@@ -1,8 +1,7 @@
 
-import scala.tools.partest.ParserTest
+import scala.tools.partest.DirectTest
 
-
-object Test extends ParserTest {
+object Test extends DirectTest {
 
   override def code = """
   trait X {
@@ -22,5 +21,7 @@ object Test extends ParserTest {
   """
 
   // not coalescing
-  override def extraSettings = s"${super.extraSettings} -Xxml:-coalescing"
+  override def extraSettings: String = "-usejavacp -Ystop-after:parser -Vprint:parser -Xxml:-coalescing"
+
+  override def show(): Unit = if (!compile()) println("Compilation failed!")
 }
diff --git a/test/files/run/t3368.scala b/test/files/run/t3368.scala
@@ -1,8 +1,7 @@
 
-import scala.tools.partest.ParserTest
+import scala.tools.partest.DirectTest
 
-
-object Test extends ParserTest {
+object Test extends DirectTest {
 
   override def code = """
   trait X {
@@ -22,5 +21,7 @@ object Test extends ParserTest {
   """
 
   // coalescing
-  override def extraSettings = s"${super.extraSettings} -Xxml:coalescing"
+  override def extraSettings: String = "-usejavacp -Ystop-after:parser -Vprint:parser -Xxml:coalescing"
+
+  override def show(): Unit = if (!compile()) println("Compilation failed!")
 }
diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala
@@ -1,7 +1,7 @@
-import scala.tools.partest.ParserTest
 import scala.reflect.internal.util.BatchSourceFile
+import scala.tools.partest.DirectTest
 
-object Test extends ParserTest {
+object Test extends DirectTest {
   // Java code
   override def code = """
     |public @interface MyAnnotation { String value(); }
@@ -13,4 +13,6 @@ object Test extends ParserTest {
     assert(sourceCodes.size == 1)
     List(new BatchSourceFile("annodef.java", sourceCodes(0)))
   }
+
+  override def show(): Unit = if (!compile()) println("Compilation failed!")
 }
diff --git a/test/files/run/t9944.scala b/test/files/run/t9944.scala
@@ -1,7 +1,11 @@
 
-import scala.tools.partest.ParserTest
+import scala.tools.partest.DirectTest
 
-object Test extends ParserTest {
+object Test extends DirectTest {
+
+  override def extraSettings: String = "-usejavacp -Ystop-after:parser -Vprint:parser"
 
   def code = s"""class C { def g = 42 ; def f = s""\"123\r\n$${ g }\r\n123\r\n""\"}"""
+
+  override def show(): Unit = if (!compile()) println("Compilation failed!")
 }