Draft of per-model testing

Author: ERSUCC

src/main/scala/org/nlogo/models/package.scala

@@ -68,6 +68,9 @@ package object models {
   val allModels: Iterable[Model] = modelFiles.keys.toSeq
   val libraryModels: Iterable[Model] = allModels.filterNot(_.isTestModel)
 
+  val allModelsNamed: Map[Model, String] = modelFiles.mapValues(_.getName)
+  val libraryModelsNamed: Map[Model, String] = modelFiles.mapValues(_.getName)
+
   implicit class EnrichedModel(val model: Model) {
     def file = modelFiles(model)
     def content = modelContent(model)

src/test/scala/org/nlogo/models/ButtonTests.scala

@@ -14,7 +14,7 @@ import org.nlogo.core.Model
 
 class ButtonTests extends TestModels {
 
-  val models = libraryModels.filter { model =>
+  val models = libraryModelsNamed.filterKeys { model =>
     (model.is3D == Version.is3D) &&
       (model.isCompilable) &&
       (!Set(
@@ -53,11 +53,11 @@ class ButtonTests extends TestModels {
   }
 
   val buttons: ParMap[Model, Iterable[Button]] =
-    models.map { model =>
+    models.map { case (model, _) =>
       model -> model.widgets.collect { case b: Button => b }
     }(collection.breakOut)
 
-  testModels(buttons.keys, "Buttons should be disabled until ticks start if they trigger a runtime error") { model =>
+  testModels(models, "Buttons should be disabled until ticks start if they trigger a runtime error") { model =>
     for {
       button <- buttons(model)
       source <- button.source
@@ -66,7 +66,7 @@ class ButtonTests extends TestModels {
     } yield "\"" + button.display.getOrElse(source) + "\" button: " + exception.getMessage
   }
 
-  testModels(buttons.keys,
+  testModels(models,
     "If any button is disabled until ticks start, ensure at least one enabled button that resets ticks") {
       model =>
         for {

src/test/scala/org/nlogo/models/TestModels.scala

@@ -1,32 +1,40 @@
 package org.nlogo.models
 
-import scala.collection.GenIterable
-import scala.collection.GenSeq
-import scala.util.Try
-
 import org.nlogo.api.Version
 import org.nlogo.core.Model
-import org.scalatest.FunSuite
 
-trait TestModels extends FunSuite {
+import org.scalatest.{ Args, FunSuite, Status, SucceededStatus }
+
+import scala.collection.{ GenIterable, GenMap, GenSeq }
+import scala.util.Try
+
+abstract class TestModels extends FunSuite {
+
+  private var nameFilter: Option[String] = None
+
+  override def runTest(name: String, args: Args): Status = {
+    nameFilter = args.configMap.get("model").map(_.toString.toLowerCase)
+
+    super.runTest(name, args)
+  }
 
   def testModels(
     testName: String,
     includeTestModels: Boolean = false,
     includeOtherDimension: Boolean = false,
     filter: Model => Boolean = _ => true)(testFun: Model => GenIterable[Any]): Unit = {
     val models =
-      (if (includeTestModels) allModels else libraryModels)
-        .filter(includeOtherDimension || _.is3D == Version.is3D)
-        .filter(filter)
+      (if (includeTestModels) allModelsNamed else libraryModelsNamed)
+        .filterKeys(includeOtherDimension || _.is3D == Version.is3D)
+        .filterKeys(filter)
     testModels(models, testName)(testFun)
   }
 
-  def testModels(models: GenIterable[Model], testName: String)(testFun: Model => GenIterable[Any]): Unit =
+  def testModels(models: GenMap[Model, String], testName: String)(testFun: Model => GenIterable[Any]): Unit =
     test(testName) {
       val allFailures: GenSeq[String] =
         (for {
-          model <- models
+          model <- models.filterKeys(model => nameFilter.map(models(model).toLowerCase.contains).getOrElse(true)).keys
           failures <- Try(testFun(model))
             .recover { case e => Seq(e.toString + "\n" + e.getStackTrace.mkString("\n")) }
             .toOption