Test fixtures upgrade

zio · Jul 19, 2024 · b939973 · b939973
1 parent d1ad220
commit b939973
Show file tree

Hide file tree

Showing 78 changed files with 3,473 additions and 354 deletions.
diff --git a/build.sbt b/build.sbt
@@ -63,7 +63,10 @@ def newProject(projectName: String, base: File): Project =
     name := projectName,
     scalaVersion := scala213,
     version := pluginVersion,
-    libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
+    libraryDependencies ++= Seq(
+      "com.novocode"      % "junit-interface"   % "0.11"   % Test,
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % Test
+    ),
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-s", "-a", "+c", "+q"),
     intellijPlugins := Seq(
       "com.intellij.java".toPlugin,

diff --git a/...perationsOnCollectionInspectionTest.scala → ...estfixtures/ScalaInspectionTestBase.scala b/...perationsOnCollectionInspectionTest.scala → ...estfixtures/ScalaInspectionTestBase.scala
diff --git a/src/test/scala/intellij/testfixtures/ScalaLightProjectDescriptor.scala b/src/test/scala/intellij/testfixtures/ScalaLightProjectDescriptor.scala
diff --git a/src/test/scala/intellij/testfixtures/SynteticInjectorsTestUtils.scala b/src/test/scala/intellij/testfixtures/SynteticInjectorsTestUtils.scala
diff --git a/src/test/scala/intellij/testfixtures/TestFixtureProvider.scala b/src/test/scala/intellij/testfixtures/TestFixtureProvider.scala
diff --git a/src/test/scala/intellij/testfixtures/Timings.java b/src/test/scala/intellij/testfixtures/Timings.java
diff --git a/src/test/scala/org/jetbrains/plugins/scala/annotator/Message.scala b/src/test/scala/org/jetbrains/plugins/scala/annotator/Message.scala
@@ -0,0 +1,18 @@
+package org.jetbrains.plugins.scala.annotator
+
+import scala.math.Ordered.orderingToOrdered
+
+sealed abstract class Message extends Ordered[Message] {
+  def element: String
+  def message: String
+
+  override def compare(that: Message): Int =
+    (this.element, this.message) compare (that.element, that.message)
+}
+
+object Message {
+  case class Info(override val element: String, override val message: String) extends Message
+  case class Warning(override val element: String, override val message: String) extends Message
+  case class Error(override val element: String, override val message: String) extends Message
+  case class Hint(override val element: String, text: String, override val message: String = "", offsetDelta: Int = 0) extends Message
+}