split root project into core and command line

Author: Reinier Lamers

aws-lambda/src/main/scala/chargepoint/docile/Lambda.scala

@@ -2,7 +2,7 @@ package chargepoint.docile
 
 import java.net.URI
 
-import chargepoint.docile.test.{RunOnce, Runner, RunnerConfig}
+import chargepoint.docile.test.{ResultSummary, RunOnce, Runner, RunnerConfig}
 import com.amazonaws.auth.DefaultAWSCredentialsProviderChain
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.events.S3Event
@@ -66,7 +66,7 @@ object Lambda extends App {
 
     Try(runner.run(runnerCfg)) match {
       case Success(testsPassed) =>
-        val succeeded = Main.summarizeResults(testsPassed, reporter.print)
+        val succeeded = ResultSummary.summarizeResults(testsPassed, reporter.print)
         writeReportToS3(script.name, reporter.report)
         sys.exit(if (succeeded) 0 else 1)
       case Failure(e) =>

build.sbt

@@ -10,23 +10,40 @@ lazy val commonSettings = Seq(
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
 )
 
-lazy val root = (project in file(".")).
-  settings(
+lazy val commandLine = (project in file("cmd"))
+  .dependsOn(core)
+  .dependsOn(loader)
+  .settings(
     commonSettings,
-    name := "docile-charge-point",
+    name := "docile-charge-point-command-line",
+    libraryDependencies ++= commandLineDeps,
     mainClass := Some("chargepoint.docile.Main"),
     assemblyJarName in assembly := "docile.jar",
-    connectInput in run := true,
-    libraryDependencies ++= deps(scalaVersion.value)
+    connectInput in run := true
   )
 
-lazy val lambda = (project in file("aws-lambda")).
-  dependsOn(root).
+lazy val core = (project in file("core")).
   settings(
+    commonSettings,
+    name := "docile-charge-point",
+    libraryDependencies ++= coreDeps(scalaVersion.value)
+  )
+
+lazy val loader = (project in file("loader"))
+  .dependsOn(core)
+  .settings(
+    commonSettings,
+    name := "docile-charge-point-loader"
+  )
+
+lazy val lambda = (project in file("aws-lambda"))
+  .dependsOn(core)
+  .dependsOn(loader)
+  .settings(
     commonSettings,
     name := "lambda-docile-charge-point",
     retrieveManaged := true,
-    libraryDependencies ++= deps(scalaVersion.value) ++ awsDeps,
+    libraryDependencies ++= awsDeps,
     mainClass := Some("chargepoint.docile.Lambda"),
     assemblyJarName in assembly := "docile-lambda.jar"
   )
@@ -35,18 +52,21 @@ assemblyJarName in assembly := "docile.jar"
 
 connectInput in run := true
 
-def deps(scalaVersion: String) = Seq(
-  "com.lihaoyi"                  % "ammonite"         % "1.6.5"    cross CrossVersion.full,
+def coreDeps(scalaVersion: String) = Seq(
   "com.thenewmotion.ocpp"       %% "ocpp-j-api"       % "9.1.0",
-  "org.rogach"                  %% "scallop"          % "3.1.3",
   "org.scala-lang"               % "scala-compiler"   % scalaVersion,
-  "com.typesafe.scala-logging"  %% "scala-logging"    % "3.9.0",
   "org.slf4j"                    % "slf4j-api"        % "1.7.25",
-  "ch.qos.logback"               % "logback-classic"  % "1.2.3",
+  "com.typesafe.scala-logging"  %% "scala-logging"    % "3.9.0",
 
   "org.specs2"                  %% "specs2-core"      % "4.3.4"    % "test"
 )
 
+lazy val commandLineDeps = Seq(
+  "com.lihaoyi"                  % "ammonite"         % "1.6.5"    cross CrossVersion.full,
+  "org.rogach"                  %% "scallop"          % "3.1.3",
+  "ch.qos.logback"               % "logback-classic"  % "1.2.3"
+)
+
 lazy val awsDeps = Seq(
   "com.amazonaws" % "aws-java-sdk-s3" % "1.11.337",
   "com.amazonaws" % "aws-java-sdk-lambda" % "1.11.337",

src/main/scala/chargepoint/docile/Main.scala renamed to cmd/src/main/scala/chargepoint/docile/Main.scala

@@ -1,17 +1,19 @@
 package chargepoint.docile
 
 import java.net.URI
-import javax.net.ssl.SSLContext
-import scala.util.{Failure, Success, Try}
+
+import chargepoint.docile.dsl._
+import chargepoint.docile.test._
+import ResultSummary.summarizeResults
 import ch.qos.logback.classic.{Level, Logger}
+import com.thenewmotion.ocpp.{Version, VersionFamily}
+import com.typesafe.scalalogging.{StrictLogging}
+import javax.net.ssl.SSLContext
 import org.rogach.scallop._
 import org.slf4j.LoggerFactory
-import com.typesafe.scalalogging.StrictLogging
-import com.thenewmotion.ocpp.Version
-import dsl._
-import test._
 
 import scala.concurrent.ExecutionContext
+import scala.util.{Failure, Success, Try}
 
 object Main extends App with StrictLogging {
 
@@ -175,7 +177,7 @@ object Main extends App with StrictLogging {
 
   val runner: Runner[_] =
     if (conf.interactive())
-      Runner.interactive(conf.version().family)
+      interactiveRunner(conf.version().family)
     else
       Runner.forFiles(conf.version().family, conf.files())
 
@@ -192,63 +194,7 @@ object Main extends App with StrictLogging {
       sys.exit(2)
   }
 
-  def summarizeResults(testResults: Map[String, Seq[Map[String, TestResult]]], report:Any => Unit): Boolean = {
-
-    // we do result formatting differently depending on whether we're doing a
-    // single run (one charge point, one pass through the test script), or if
-    // we're doing a complex one (multiple charge point and/or multiple repeats)
-    val isSingleRun = testResults.size == 1 && testResults.toSeq.headOption.exists(_._2.size == 1)
-    if (isSingleRun) {
-      val singleRunResult =
-        testResults
-          .headOption
-          .flatMap(_._2.headOption)
-          .getOrElse(Map.empty[String, TestResult])
-
-      summarizeSingleRun(singleRunResult, report)
-    } else {
-      summarizeComplexRun(testResults, report)
-    }
-  }
-
-  private def summarizeSingleRun(testResults: Map[String, TestResult], report: Any => Unit): Boolean = {
-    val outcomes = testResults map  { case (testName, outcome) =>
-
-      val outcomeDescription = outcome match {
-        case TestFailed(ExpectationFailed(msg)) =>
-          s"❌  $msg"
-        case TestFailed(ExecutionError(e)) =>
-          s"💥  ${e.getClass.getSimpleName} ${e.getMessage}\n" +
-          s"\t${e.getStackTrace.mkString("\n\t")}"
-        case TestPassed =>
-          s"✅"
-      }
-
-      report(s"$testName: $outcomeDescription")
-
-      outcome
-    }
-
-    outcomes.collect({ case TestFailed(_) => }).isEmpty
-  }
-
-  private def summarizeComplexRun(testResults: Map[String, Seq[Map[String, TestResult]]], report: Any => Unit): Boolean = {
-    val countsPerChargePoint: Map[String, (Int, Int, Int)] = testResults.mapValues { runs =>
-      runs.foldLeft((0, 0, 0)) { case (counts, results) =>
-          val countsForRun = results.values.foldLeft((0,0,0)) {
-            case ((f, e, p), TestFailed(ExpectationFailed(_))) => (f+1, e  , p)
-            case ((f, e, p), TestFailed(ExecutionError(_)))    => (f  , e+1, p)
-            case ((f, e, p), TestPassed)                       => (f  , e  , p+1)
-          }
-
-        (counts._1 + countsForRun._1, counts._2 + countsForRun._2, counts._3 + countsForRun._3)
-      }
-    }
-
-    countsPerChargePoint foreach { case (chargePointId, counts) =>
-      report(s"$chargePointId: ${counts._1} failed / ${counts._2} errors / ${counts._3} passed")
-    }
-
-    !countsPerChargePoint.values.exists(c => c._1 != 0 || c._2 != 0)
-  }
+   def interactiveRunner(vfam: VersionFamily): Runner[vfam.type] = new Runner[vfam.type](
+     Seq(TestCase("Interactive test", () => InteractiveOcppTest(vfam)))
+   )
 }

src/main/scala/chargepoint/docile/SslContext.scala renamed to cmd/src/main/scala/chargepoint/docile/SslContext.scala

@@ -3,9 +3,7 @@ package chargepoint.docile
 import java.io.FileInputStream
 import java.security.KeyStore
 
-import javax.net.ssl.KeyManagerFactory
-import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory}
 
 object SslContext {
   def apply(

src/main/scala/chargepoint/docile/test/InteractiveOcppTest.scala renamed to cmd/src/main/scala/chargepoint/docile/test/InteractiveOcppTest.scala

@@ -1,13 +1,14 @@
 package chargepoint.docile
 package test
 
-import scala.language.higherKinds
-import scala.concurrent.ExecutionContext.global
+import chargepoint.docile.dsl._
 import com.thenewmotion.ocpp.VersionFamily
-import com.thenewmotion.ocpp.messages.{Request, Response, ReqRes}
 import com.thenewmotion.ocpp.messages.v1x.{CentralSystemReq, CentralSystemReqRes, CentralSystemRes, ChargePointReq, ChargePointReqRes, ChargePointRes}
-import com.thenewmotion.ocpp.messages.v20.{CsmsRequest, CsmsResponse, CsmsReqRes, CsRequest, CsResponse, CsReqRes}
-import dsl._
+import com.thenewmotion.ocpp.messages.v20._
+import com.thenewmotion.ocpp.messages.{ReqRes, Request, Response}
+
+import scala.concurrent.ExecutionContext.global
+import scala.language.higherKinds
 
 trait InteractiveOcppTest[VFam <: VersionFamily] {