Skip to content

Commit ad91035

Browse files
author
reidspencer
committed
Changes from usage:
* Remove println statements from debugging * Reorganization testing for platform coverage * Add a MetaDataTest suite
1 parent 597f1e8 commit ad91035

File tree

16 files changed

+100
-60
lines changed

16 files changed

+100
-60
lines changed

language/js/src/test/scala/com/ossuminc/riddl/language/parsing/JSTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.ossuminc.riddl.utils.{pc, ec}
1111
class JSApplicationParsingTest extends ApplicationParsingTest
1212
class JSCommonParserTest extends CommonParserTest
1313
class JSHandlerTest extends HandlerTest
14+
class JSMetaDataTest extends MetaDataTest
1415
class JSModuleTest extends ModuleTest
1516
class JSNebulaTest extends NebulaTest
1617
class JSParsingTestTest extends ParsingTestTest

language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/JVMTests.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.ossuminc.riddl.utils.{ec, pc}
1111
class JVMApplicationParsingTest extends ApplicationParsingTest
1212
class JVMCommonParserTest extends CommonParserTest
1313
class JVMHandlerTest extends HandlerTest
14+
class JVMMetaDataTest extends MetaDataTest
1415
class JVMModuleTest extends ModuleTest
1516
class JVMNebulaTest extends NebulaTest
1617
class JVMParsingTestTest extends ParsingTestTest

language/shared/src/test/scala/com/ossuminc/riddl/language/parsing/CommonParserTest.scala

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,6 @@ abstract class CommonParserTest(using PlatformContext) extends AbstractParsingTe
131131
actual mustBe LiteralString((1, 1, rpi), input.data.drop(1).dropRight(1))
132132
}
133133
}
134-
"attachments parse correctly" in { (td: TestData) =>
135-
val input = RiddlParserInput(
136-
"""context foo {
137-
| ???
138-
|} with {
139-
| attachment infile is text/plain in file "nada.txt"
140-
| attachment inline is text/plain as "nada"
141-
|}""".stripMargin,
142-
td
143-
)
144-
parseDefinition[Context](input) match {
145-
case Left(errors) =>
146-
val msg = errors.map(_.format).mkString
147-
fail(msg)
148-
case Right((context: Context, _)) =>
149-
context.stringAttachments.size must be(1)
150-
context.stringAttachments.head.value.s must be("nada")
151-
context.fileAttachments.size must be(1)
152-
context.fileAttachments.head.inFile.s must be("nada.txt")
153-
}
154-
}
155134
}
156135
"NoWhiteSpaceParsers" should {
157136
"handle a URL" in { (td: TestData) =>
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2019-2025 Ossum, Inc.
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package com.ossuminc.riddl.language.parsing
8+
import com.ossuminc.riddl.language.AST.Context
9+
import com.ossuminc.riddl.utils.PlatformContext
10+
import org.scalatest.TestData
11+
12+
abstract class MetaDataTest(using PlatformContext) extends AbstractParsingTest {
13+
14+
"MetaDataParser" should {
15+
"parse attachments correctly" in { (td: TestData) =>
16+
val input = RiddlParserInput(
17+
"""context foo {
18+
| ???
19+
|} with {
20+
| attachment infile is text/plain in file "nada.txt"
21+
| attachment inline is text/plain as "nada"
22+
|}""".stripMargin,
23+
td
24+
)
25+
parseDefinition[Context](input) match {
26+
case Left(errors) =>
27+
val msg = errors.map(_.format).mkString
28+
fail(msg)
29+
case Right((context: Context, _)) =>
30+
context.stringAttachments.size must be(1)
31+
context.stringAttachments.head.value.s must be("nada")
32+
context.fileAttachments.size must be(1)
33+
context.fileAttachments.head.inFile.s must be("nada.txt")
34+
}
35+
}
36+
}
37+
}

passes/js/src/test/scala/com/ossuminc/riddl/passes/JSTests.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright 2019-2025 Ossum, Inc.
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package com.ossuminc.riddl.passes.diagrams
8+
9+
import com.ossuminc.riddl.utils.pc
10+
11+
class JSDiagramsPassTest extends SharedDiagramsPassTest

passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/JVMTests.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/DiagramsPassTest.scala renamed to passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/diagrams/DiagramsPassTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package com.ossuminc.riddl.passes
7+
package com.ossuminc.riddl.passes.diagrams
88

99
import com.ossuminc.riddl.language.AST.*
1010
import com.ossuminc.riddl.language.Messages
1111
import com.ossuminc.riddl.language.parsing.RiddlParserInput
1212
import com.ossuminc.riddl.passes.diagrams.*
13-
import com.ossuminc.riddl.utils.{PlatformContext, URL}
14-
import com.ossuminc.riddl.utils.{ec, pc, Await}
13+
import com.ossuminc.riddl.passes.{Pass, PassesResult}
14+
import com.ossuminc.riddl.utils.{Await, PlatformContext, URL, ec, pc}
15+
import org.scalatest.TestData
1516

1617
import scala.concurrent.duration.DurationInt
17-
import org.scalatest.TestData
1818

1919
class DiagramsPassTest extends SharedDiagramsPassTest {
2020
"generate diagrams output" in { (td: TestData) =>

0 commit comments

Comments
 (0)