ad cbt library build and scalariform to test scalatet-runner

3 files changed, 20 insertions, 10 deletions

diff --git a/libraries/scalatest-runner/Runner.scala b/libraries/scalatest-runner/Runner.scala
index e2eaf87..a9927bb 100644
--- a/libraries/scalatest-runner/Runner.scala
+++ b/libraries/scalatest-runner/Runner.scala
@@ -4,9 +4,9 @@ import org.scalatest._
 
 import java.io.File
 
-object Runner{
+object Runner {
   def run( classpath: Array[File], classLoader: ClassLoader ): Unit = {
-    val suiteNames = classpath.map( d => discoverSuites(d, classLoader) ).flatten
+    val suiteNames = classpath.map( d => discoverSuites( d, classLoader ) ).flatten
     runSuites( suiteNames.map( loadSuite( _, classLoader ) ) )
   }
 
@@ -18,20 +18,20 @@ object Runner{
     def stats: Boolean = true
     def testName: String = null
     def configMap: ConfigMap = ConfigMap.empty
-    suites.foreach{
-      _.execute(testName, configMap, color, durations, shortstacks, fullstacks, stats)
+    suites.foreach {
+      _.execute( testName, configMap, color, durations, shortstacks, fullstacks, stats )
     }
   }
 
   def discoverSuites( discoveryPath: File, classLoader: ClassLoader ): Seq[String] = {
     classLoader
-      .loadClass("org.scalatest.tools.SuiteDiscoveryHelper")
-      .getMethod("discoverSuiteNames", classOf[List[_]], classOf[ClassLoader], classOf[Option[_]])
-      .invoke(null, List(discoveryPath.toString ++ "/"), classLoader, None)
+      .loadClass( "org.scalatest.tools.SuiteDiscoveryHelper" )
+      .getMethod( "discoverSuiteNames", classOf[List[_]], classOf[ClassLoader], classOf[Option[_]] )
+      .invoke( null, List( discoveryPath.toString ++ "/" ), classLoader, None )
       .asInstanceOf[Set[String]]
       .toVector
   }
-  def loadSuite(name: String, classLoader: ClassLoader) = {
-    classLoader.loadClass(name).getConstructor().newInstance().asInstanceOf[Suite]
+  def loadSuite( name: String, classLoader: ClassLoader ) = {
+    classLoader.loadClass( name ).getConstructor().newInstance().asInstanceOf[Suite]
   }
 }
diff --git a/libraries/scalatest-runner/build/build.scala b/libraries/scalatest-runner/build/build.scala
index 781e314..0c07c7c 100644
--- a/libraries/scalatest-runner/build/build.scala
+++ b/libraries/scalatest-runner/build/build.scala
@@ -1,6 +1,11 @@
+package cbt_libraries_build.scalatest_runner
 import cbt._
+import cbt_internal._
+
+class Build(val context: Context) extends Library{
+  override def inceptionYear = 2017
+  override def description = "run scalatest tests from given directory and classpath (compatible with 2.12 and 2.11)"
 
-class Build(val context: Context) extends BaseBuild{
   override def dependencies = super.dependencies ++
     Resolver( mavenCentral ).bind(
       ScalaDependency("org.scalatest","scalatest", if(scalaMajorVersion == "2.12") "3.0.1" else "2.2.6")
diff --git a/libraries/scalatest-runner/build/build/build.scala b/libraries/scalatest-runner/build/build/build.scala
new file mode 100644
index 0000000..18003ee
--- /dev/null
+++ b/libraries/scalatest-runner/build/build/build.scala
@@ -0,0 +1,5 @@
+package cbt_build.scalatest_runner.build
+import cbt._
+class Build(val context: Context) extends BuildBuild with CbtInternal{
+  override def dependencies = super.dependencies :+ cbtInternal.library
+}