Feature/cucumber-plugin

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Satify Build, Format and Coverage
+name: Satify Build
 
 on:
   push:
@@ -34,6 +34,8 @@ jobs:
           cache: 'sbt'
       - name: Run tests
         run: sbt test
+      - name: Run cucumber tests
+        run: sbt cucumber
 
   format:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Create Release
+name: Satify Release
 
 on:
   pull_request:

build.sbt

@@ -3,28 +3,46 @@ ThisBuild / version := "0.1.0-SNAPSHOT"
 val languageVersion = "3.3.0"
 ThisBuild / scalaVersion := languageVersion
 
-Test / fork := true
-
 val scalaTest = "org.scalatest" %% "scalatest" % "3.2.16" % Test
-val archUnit = "com.tngtech.archunit" % "archunit" % "1.0.0" % Test
+val archUnit = "com.tngtech.archunit" % "archunit" % "1.1.0" % Test
 val scalaSwing = "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
 val slf4jSimpleLog = "org.slf4j" % "slf4j-simple" % "2.0.7" % Test
 val scalaCompiler = "org.scala-lang" %% "scala3-compiler" % languageVersion
-val cucumber = "io.cucumber" %% "cucumber-scala" % "8.14.1" % Test
+val cucumberScala = "io.cucumber" %% "cucumber-scala" % "8.14.1" % Test
 
 lazy val root = (project in file("."))
   .settings(
     name := "satify",
-    libraryDependencies ++= Seq(scalaTest, archUnit, slf4jSimpleLog, scalaSwing, scalaCompiler, cucumber),
+    libraryDependencies ++= Seq(scalaTest, archUnit, slf4jSimpleLog, scalaSwing, scalaCompiler, cucumberScala),
     assembly / assemblyJarName := "satify.jar"
   )
 
 jacocoReportSettings := JacocoReportSettings()
   .withTitle("Jacoco Satify Coverage Report")
   .withThresholds(
-    JacocoThresholds(
-      branch = 40,
-      line = 70)
+    JacocoThresholds(branch = 40, line = 70)
   )
   .withFormats(JacocoReportFormats.ScalaHTML)
+
 jacocoExcludes := Seq("*view*", "*update.Message*", "*Main*")
+
+lazy val cucumber = taskKey[Unit]("Executes cucumber tests")
+cucumber := {
+  val opts = ForkOptions(
+    javaHome = None,
+    outputStrategy = Some(StdoutOutput),
+    bootJars = Vector.empty,
+    workingDirectory = None,
+    runJVMOptions = Vector(
+      "-classpath",
+      (Test / fullClasspath).value
+        .filterNot(_.data.toString.contains("instrumented"))
+        .map(_.data)
+        .mkString(if (org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS) ";" else ":"),
+      "io.cucumber.core.cli.Main"
+    ),
+    connectInput = false,
+    envVars = Map[String, String](),
+  )
+  Fork.java(opts, List())
+}

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
-addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
+addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")

src/main/scala/satify/dsl/Reflection.scala

@@ -37,5 +37,5 @@ object Reflection:
         """import satify.model.expression.Expression
           |import satify.dsl.DSL.{*, given}
           |""".stripMargin
-      println(imports + code)
+      println(code)
       dotty.tools.repl.ScriptEngine().eval(imports + code).asInstanceOf[Expression]

src/test/resources/cucumber.properties

@@ -0,0 +1 @@
+cucumber.publish.quiet=true

src/test/scala/steps/TseitinTransformation.scala → src/test/scala/satify/features/TseitinTransformationSteps.scala

@@ -1,4 +1,4 @@
-package steps
+package satify.features
 
 import io.cucumber.scala.{EN, ScalaDsl}
 import org.scalatest.matchers.should.Matchers.*
@@ -7,7 +7,7 @@ import satify.model.CNF
 import satify.model.expression.Expression
 import satify.update.converters.TseitinTransformation.tseitin
 
-class TseitinTransformation extends ScalaDsl with EN:
+class TseitinTransformationSteps extends ScalaDsl with EN:
   var exp: Expression = _
   var cnf: CNF = _
   Given("""The expression {string}""")((strExp: String) => exp = reflect(strExp))

src/test/scala/parser/DimacsTest.scala → src/test/scala/satify/parser/DimacsTest.scala

@@ -1,4 +1,4 @@
-package parser
+package satify.parser
 
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers