Make tests pass

* Remove all vestiges of "Plugin" hell * Make LoaderTest hush up * Make Commands.runCommandWithArgs a public API * Fix RiddlParserInput.fromCwdPath
ossuminc · Aug 14, 2024 · 7c46f81 · 7c46f81
1 parent 85a5f8b
commit 7c46f81
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 315 deletions.
diff --git a/command/src/main/scala/com/ossuminc/riddl/command/CommandOptions.scala b/command/src/main/scala/com/ossuminc/riddl/command/CommandOptions.scala
@@ -7,7 +7,6 @@ package com.ossuminc.riddl.command
 
 import com.ossuminc.riddl.language.Messages
 import com.ossuminc.riddl.language.Messages.{Messages, errors}
-import com.ossuminc.riddl.utils.Plugin
 import pureconfig.{ConfigCursor, ConfigObjectCursor, ConfigReader}
 import pureconfig.error.ConfigReaderFailures
 import scopt.OParser

diff --git a/commands/src/main/scala/com/ossuminc/riddl/commands/Commands.scala b/commands/src/main/scala/com/ossuminc/riddl/commands/Commands.scala
@@ -39,7 +39,7 @@ object Commands:
     end match
   end loadCommandNamed
 
-  private def runCommandWithArgs(
+  def runCommandWithArgs(
     name: String,
     args: Array[String],
     log: Logger,

diff --git a/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/IncludeAndImportTest.scala b/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/IncludeAndImportTest.scala
@@ -71,7 +71,7 @@ class IncludeAndImportTest extends ParsingTest {
     }
     "handle inclusions into domain" in { (td: TestData) =>
       val (root, rpi) = checkFile("Domain Includes", "includes/domainIncludes.riddl")
-      val url = URL("file", "", "", defaultInputDir + "/includes/domainIncluded.riddl")
+      val url = URL.fromCwdPath(defaultInputDir + "/includes/domainIncluded.riddl")
       val inc = StringParserInput("", url)
       root.domains mustNot be(empty)
       root.domains.head.includes mustNot be(empty)

diff --git a/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/ParsingTest.scala b/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/ParsingTest.scala
@@ -55,7 +55,7 @@ trait ParsingTest extends TestingBasisWithTestData {
   ): Either[Messages, Root] = {
     parsePath(file.toPath, commonOptions)
   }
-  
+
   def parse[T <: RiddlValue, U <: RiddlValue](
     input: RiddlParserInput,
     parser: P[?] => P[T],
@@ -187,7 +187,7 @@ trait ParsingTest extends TestingBasisWithTestData {
   def checkFile(
     @unused label: String,
     fileName: String,
-    directory: String = defaultInputDir 
+    directory: String = defaultInputDir
   ): (Root, RiddlParserInput) = {
     val path = java.nio.file.Path.of(directory, fileName)
     val rpi = fromCwdPath(path)

diff --git a/language/shared/src/main/scala/com/ossuminc/riddl/language/parsing/RiddlParserInput.scala b/language/shared/src/main/scala/com/ossuminc/riddl/language/parsing/RiddlParserInput.scala
@@ -97,7 +97,7 @@ object RiddlParserInput {
    *
    */
   def fromCwdPath(path:Path, purpose: String =""): RiddlParserInput =
-    val url = URL.fromFullPath(path.toString)
+    val url = URL.fromCwdPath(path.toString)
     val future = fromURL(url, purpose)
     Await.result(future, 10.seconds)
 

diff --git a/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/Plugin.scala b/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/Plugin.scala
diff --git a/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/PluginClassLoader.scala b/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/PluginClassLoader.scala
diff --git a/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/PluginInterface.scala b/utils/jvm/src/main/scala/com/ossuminc/riddl/utils/PluginInterface.scala
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/FuturePluginTest.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/FuturePluginTest.scala
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/FutureTestPlugin.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/FutureTestPlugin.scala
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/LoaderTest.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/LoaderTest.scala
@@ -15,7 +15,7 @@ class LoaderTest extends AnyWordSpec with Matchers {
       )
       val contentF = Loader(url).load
       val content = Await.result(contentF, 5.seconds)
-      info(content)
+      // info(content)
     }
   }
 }
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/PluginSpec.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/PluginSpec.scala
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/PluginSpecBase.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/PluginSpecBase.scala
diff --git a/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/TestPlugin.scala b/utils/jvm/src/test/scala/com/ossuminc/riddl/utils/TestPlugin.scala