Changes from usage:

* Remove println statements from debugging * Reorganization testing for platform coverage * Add a MetaDataTest suite
ossuminc · Feb 22, 2025 · ad91035 · ad91035
1 parent 597f1e8
commit ad91035
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 60 deletions.
diff --git a/language/js/src/test/scala/com/ossuminc/riddl/language/parsing/JSTests.scala b/language/js/src/test/scala/com/ossuminc/riddl/language/parsing/JSTests.scala
@@ -11,6 +11,7 @@ import com.ossuminc.riddl.utils.{pc, ec}
 class JSApplicationParsingTest extends ApplicationParsingTest
 class JSCommonParserTest extends CommonParserTest
 class JSHandlerTest extends HandlerTest
+class JSMetaDataTest extends MetaDataTest
 class JSModuleTest extends ModuleTest
 class JSNebulaTest extends NebulaTest
 class JSParsingTestTest extends ParsingTestTest

diff --git a/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/JVMTests.scala b/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/JVMTests.scala
@@ -11,6 +11,7 @@ import com.ossuminc.riddl.utils.{ec, pc}
 class JVMApplicationParsingTest extends ApplicationParsingTest
 class JVMCommonParserTest extends CommonParserTest
 class JVMHandlerTest extends HandlerTest
+class JVMMetaDataTest extends MetaDataTest
 class JVMModuleTest extends ModuleTest
 class JVMNebulaTest extends NebulaTest
 class JVMParsingTestTest extends ParsingTestTest

diff --git a/language/shared/src/test/scala/com/ossuminc/riddl/language/parsing/CommonParserTest.scala b/language/shared/src/test/scala/com/ossuminc/riddl/language/parsing/CommonParserTest.scala
@@ -131,27 +131,6 @@ abstract class CommonParserTest(using PlatformContext) extends AbstractParsingTe
           actual mustBe LiteralString((1, 1, rpi), input.data.drop(1).dropRight(1))
       }
     }
-    "attachments parse correctly" in { (td: TestData) =>
-      val input = RiddlParserInput(
-        """context foo {
-          | ???
-          |} with {
-          |  attachment infile is text/plain in file "nada.txt"
-          |  attachment inline is text/plain as "nada"
-          |}""".stripMargin,
-        td
-      )
-      parseDefinition[Context](input) match {
-        case Left(errors) =>
-          val msg = errors.map(_.format).mkString
-          fail(msg)
-        case Right((context: Context, _)) =>
-          context.stringAttachments.size must be(1)
-          context.stringAttachments.head.value.s must be("nada")
-          context.fileAttachments.size must be(1)
-          context.fileAttachments.head.inFile.s must be("nada.txt")
-      }
-    }
   }
   "NoWhiteSpaceParsers" should {
     "handle a URL" in { (td: TestData) =>

diff --git a/language/shared/src/test/scala/com/ossuminc/riddl/language/parsing/MetaDataTest.scala b/language/shared/src/test/scala/com/ossuminc/riddl/language/parsing/MetaDataTest.scala
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019-2025 Ossum, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ossuminc.riddl.language.parsing
+import com.ossuminc.riddl.language.AST.Context
+import com.ossuminc.riddl.utils.PlatformContext
+import org.scalatest.TestData
+
+abstract class MetaDataTest(using PlatformContext) extends AbstractParsingTest {
+
+  "MetaDataParser" should {
+    "parse attachments correctly" in { (td: TestData) =>
+      val input = RiddlParserInput(
+        """context foo {
+          | ???
+          |} with {
+          |  attachment infile is text/plain in file "nada.txt"
+          |  attachment inline is text/plain as "nada"
+          |}""".stripMargin,
+        td
+      )
+      parseDefinition[Context](input) match {
+        case Left(errors) =>
+          val msg = errors.map(_.format).mkString
+          fail(msg)
+        case Right((context: Context, _)) =>
+          context.stringAttachments.size must be(1)
+          context.stringAttachments.head.value.s must be("nada")
+          context.fileAttachments.size must be(1)
+          context.fileAttachments.head.inFile.s must be("nada.txt")
+      }
+    }
+  }
+}
diff --git a/passes/js/src/test/scala/com/ossuminc/riddl/passes/JSTests.scala b/passes/js/src/test/scala/com/ossuminc/riddl/passes/JSTests.scala
diff --git a/passes/js/src/test/scala/com/ossuminc/riddl/passes/diagrams/JSDiagramsPassTest.scala b/passes/js/src/test/scala/com/ossuminc/riddl/passes/diagrams/JSDiagramsPassTest.scala
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2019-2025 Ossum, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ossuminc.riddl.passes.diagrams
+
+import com.ossuminc.riddl.utils.pc
+
+class JSDiagramsPassTest extends SharedDiagramsPassTest
diff --git a/...suminc/riddl/passes/resolve/JSTests.scala → ...passes/resolve/JSPathResolutionPass.scala b/...suminc/riddl/passes/resolve/JSTests.scala → ...passes/resolve/JSPathResolutionPass.scala
diff --git a/...uminc/riddl/passes/validate/JSTests.scala → ...dl/passes/validate/JSValidationTest.scala b/...uminc/riddl/passes/validate/JSTests.scala → ...dl/passes/validate/JSValidationTest.scala
diff --git a/passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/JVMTests.scala b/passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/JVMTests.scala
diff --git a/...uminc/riddl/passes/DiagramsPassTest.scala → ...dl/passes/diagrams/DiagramsPassTest.scala b/...uminc/riddl/passes/DiagramsPassTest.scala → ...dl/passes/diagrams/DiagramsPassTest.scala
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.ossuminc.riddl.passes
+package com.ossuminc.riddl.passes.diagrams
 
 import com.ossuminc.riddl.language.AST.*
 import com.ossuminc.riddl.language.Messages
 import com.ossuminc.riddl.language.parsing.RiddlParserInput
 import com.ossuminc.riddl.passes.diagrams.*
-import com.ossuminc.riddl.utils.{PlatformContext, URL}
-import com.ossuminc.riddl.utils.{ec, pc, Await}
+import com.ossuminc.riddl.passes.{Pass, PassesResult}
+import com.ossuminc.riddl.utils.{Await, PlatformContext, URL, ec, pc}
+import org.scalatest.TestData
 
 import scala.concurrent.duration.DurationInt
-import org.scalatest.TestData
 
 class DiagramsPassTest extends SharedDiagramsPassTest {
   "generate diagrams output" in { (td: TestData) =>

diff --git a/passes/jvm/src/test/scala/com/ossuminc/riddl/passes/diagrams/JVMDiagramsPassTest.scala b/passes/jvm/src/test/scala/com/ossuminc/riddl/passes/diagrams/JVMDiagramsPassTest.scala
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2019-2025 Ossum, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ossuminc.riddl.passes.diagrams
+import com.ossuminc.riddl.utils.{ec, pc}
+
+class JVMDiagramsPassTest extends SharedDiagramsPassTest
+
diff --git a/...l/testkit/JVMPathResolutionPassTest.scala → ...s/resolve/JVMPathResolutionPassTest.scala b/...l/testkit/JVMPathResolutionPassTest.scala → ...s/resolve/JVMPathResolutionPassTest.scala
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.ossuminc.riddl.testkit
+package com.ossuminc.riddl.passes.resolve
 
-import com.ossuminc.riddl.utils.{pc, ec}
-import com.ossuminc.riddl.passes.resolve.ResolvingTest
 import com.ossuminc.riddl.passes.resolve.SharedPathResolutionPassTest
+import com.ossuminc.riddl.utils.pc
 
 class JVMPathResolutionPassTest extends SharedPathResolutionPassTest
diff --git a/...inc/riddl/testkit/JVMValidationTest.scala → ...l/passes/validate/JVMValidationTest.scala b/...inc/riddl/testkit/JVMValidationTest.scala → ...l/passes/validate/JVMValidationTest.scala
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.ossuminc.riddl.testkit
+package com.ossuminc.riddl.passes.validate
 
 import com.ossuminc.riddl.passes.validate.SharedValidationTest
-import com.ossuminc.riddl.utils.{pc, ec}
+import com.ossuminc.riddl.utils.pc
 
 class JVMValidationTest extends SharedValidationTest
diff --git a/passes/shared/src/main/scala/com/ossuminc/riddl/passes/resolve/ReferenceMap.scala b/passes/shared/src/main/scala/com/ossuminc/riddl/passes/resolve/ReferenceMap.scala
@@ -75,8 +75,6 @@ case class ReferenceMap(messages: Messages.Accumulator) {
       case None => Option.empty[T]
       case Some((_, definition)) =>
         val klass = classTag[T].runtimeClass
-        println(s"klass=${klass.getSimpleName}")
-        println(s"definition.getClass=${definition.getClass.getSimpleName}")
         if definition.getClass == klass then Some(definition.asInstanceOf[T]) else Option.empty[T]
   }
 

diff --git a/...riddl/passes/SharedDiagramsPassTest.scala → ...ses/diagrams/SharedDiagramsPassTest.scala b/...riddl/passes/SharedDiagramsPassTest.scala → ...ses/diagrams/SharedDiagramsPassTest.scala
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.ossuminc.riddl.passes
+package com.ossuminc.riddl.passes.diagrams
 
 import com.ossuminc.riddl.language.AST.{Domain, Identifier, Root}
 import com.ossuminc.riddl.language.parsing.RiddlParserInput
 import com.ossuminc.riddl.language.{At, Messages}
 import com.ossuminc.riddl.passes.diagrams.{ContextDiagramData, DiagramsPass, DiagramsPassOutput}
 import com.ossuminc.riddl.passes.validate.AbstractValidatingTest
-import com.ossuminc.riddl.utils.{Await,PlatformContext, URL}
+import com.ossuminc.riddl.passes.{PassInput, PassesOutput}
+import com.ossuminc.riddl.utils.{Await, PlatformContext, URL}
 import org.scalatest.TestData
 import org.scalatest.matchers.must.Matchers
 import org.scalatest.wordspec.AnyWordSpec

diff --git a/...hared/src/test/scala/com/ossuminc/riddl/passes/resolve/SharedPathResolutionPassTest.scala b/...hared/src/test/scala/com/ossuminc/riddl/passes/resolve/SharedPathResolutionPassTest.scala
@@ -36,7 +36,8 @@ abstract class SharedPathResolutionPassTest(using pc: PlatformContext) extends S
         val pid: Type = domains.head.types.head
         val parent = domains.head
         val resolution = outputs.outputOf[ResolutionOutput](ResolutionPass.name).get
-        resolution.refMap.definitionOf[Type](pid.typEx.asInstanceOf[AliasedTypeExpression].pathId, parent) match {
+        resolution.refMap
+          .definitionOf[Type](pid.typEx.asInstanceOf[AliasedTypeExpression].pathId, parent) match {
           case Some(definition) =>
             definition must be(target)
           case None =>
@@ -307,7 +308,8 @@ abstract class SharedPathResolutionPassTest(using pc: PlatformContext) extends S
     "resolve simple path through an include" in { _ =>
       import com.ossuminc.riddl.utils.URL
       val eL = At.empty
-      val root = Root(At(),
+      val root = Root(
+        At(),
         contents = Contents(
           Domain(
             eL,
@@ -457,5 +459,29 @@ abstract class SharedPathResolutionPassTest(using pc: PlatformContext) extends S
             fail("contained group not found")
       }()
     }
+    "resolve author from authorref" in { (td: TestData) =>
+      val rpi = RiddlParserInput(
+        """domain foo {
+          |  author Reid is { name: "Reid Spencer", email: "[email protected]" }
+          |  context app {
+          |    ???
+          |  } with {
+          |    by author foo.Reid
+          |  }
+          |}
+          |""".stripMargin,
+        td
+      )
+      parseAndResolve(rpi) { (pi: PassInput, po: PassesOutput) =>
+        val app: Context = pi.root.contents.filter[Domain].head.contexts.head
+        val au: AuthorRef = app.authorRefs.head
+        po.refMap.definitionOf[Author](au.pathId) match
+          case Some(author: Author) =>
+            author.id.value must be("Reid")
+            author.name.s must be("Reid Spencer")
+          case _ =>
+            fail("authorRef not resolved")
+      }
+    }
   }
 }