From bfe6e22b96bdd017c4f4bfc57644d83de9ba5750 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Mon, 13 May 2024 09:24:30 -0400 Subject: [PATCH] WIP: Augment a test case for coverage --- language/src/test/input/everything.riddl | 2 ++ language/src/test/input/everything_APlant.riddl | 2 ++ language/src/test/input/everything_app.riddl | 3 +++ language/src/test/input/everything_full.riddl | 9 +++++++++ .../ossuminc/riddl/passes/validate/ValidatingTest.scala | 8 ++++---- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 language/src/test/input/everything_app.riddl diff --git a/language/src/test/input/everything.riddl b/language/src/test/input/everything.riddl index b2f03f817..a46f8a019 100644 --- a/language/src/test/input/everything.riddl +++ b/language/src/test/input/everything.riddl @@ -21,4 +21,6 @@ domain Everything is { } described as "A simple authoring epic" include "everything_full" + + include "everything_app" } diff --git a/language/src/test/input/everything_APlant.riddl b/language/src/test/input/everything_APlant.riddl index 910c047f2..042e93e1b 100644 --- a/language/src/test/input/everything_APlant.riddl +++ b/language/src/test/input/everything_APlant.riddl @@ -6,4 +6,6 @@ context APlant is { from outlet Source.Commands to inlet Sink.Commands } explained as "A Channel" + + } briefly "A bunch of data flow connections" diff --git a/language/src/test/input/everything_app.riddl b/language/src/test/input/everything_app.riddl new file mode 100644 index 000000000..05368edcc --- /dev/null +++ b/language/src/test/input/everything_app.riddl @@ -0,0 +1,3 @@ +application Whatever is { + ??? +} diff --git a/language/src/test/input/everything_full.riddl b/language/src/test/input/everything_full.riddl index 4bca695ba..083e402f0 100644 --- a/language/src/test/input/everything_full.riddl +++ b/language/src/test/input/everything_full.riddl @@ -36,6 +36,15 @@ context full is { } } + projector ProjectIt is { + updates repository StoreIt + handler projector is { + on init { + tell command ACommand to repository StoreIt + } + } + } + command ACommand() adaptor fromAPlant to context APlant is { diff --git a/passes/src/test/scala/com/ossuminc/riddl/passes/validate/ValidatingTest.scala b/passes/src/test/scala/com/ossuminc/riddl/passes/validate/ValidatingTest.scala index f042a782a..40250fdcf 100644 --- a/passes/src/test/scala/com/ossuminc/riddl/passes/validate/ValidatingTest.scala +++ b/passes/src/test/scala/com/ossuminc/riddl/passes/validate/ValidatingTest.scala @@ -164,12 +164,12 @@ abstract class ValidatingTest extends ParsingTest { andThen: (PassesResult, Root, RiddlParserInput, Messages) => T ): T = { TopLevelParser.parseInput(rpi) match { - case Left(errors) => - fail(errors.format) + case Left(messages) => + fail(messages.justErrors.format) case Right(root) => runStandardPasses(root, options, shouldFailOnErrors) match { - case Left(errors) => - fail(errors.format) + case Left(messages) => + fail(messages.justErrors.format) case Right(passesResult: PassesResult) => andThen(passesResult, root, rpi, passesResult.messages) }