fixup! 1b35bc3 Incorporated feedback

Author: jadenPete-lucid

src/main/scala/higherkindness/rules_scala/common/sbt-testing/TestsFile.scala

@@ -2,15 +2,15 @@ package higherkindness.rules_scala.common.sbt_testing
 
 import play.api.libs.json.{Format, JsObject, Json, Reads, Writes}
 
-case class TestsFile(testsByFramework: Map[String, Seq[TestDefinition]])
+case class TestsFileData(testsByFramework: Map[String, Seq[TestDefinition]])
 
-object TestsFile {
+object TestsFileData {
 
   /**
    * Unlike that produced by [[Json.format]], this [[Format]] is deterministic, which we need to fulfill the
    * reproducibility component of [[https://bazel.build/basics/hermeticity Bazel's contract]].
    */
-  implicit val format: Format[TestsFile] = Format[Map[String, Seq[TestDefinition]]](
+  implicit val format: Format[TestsFileData] = Format[Map[String, Seq[TestDefinition]]](
     Reads.mapReads,
     Writes { testsByFramework =>
       JsObject(
@@ -20,5 +20,5 @@ object TestsFile {
           .sortBy { case (framework, _) => framework },
       )
     },
-  ).bimap(TestsFile(_), _.testsByFramework)
+  ).bimap(TestsFileData(_), _.testsByFramework)
 }

src/main/scala/higherkindness/rules_scala/common/sbt-testing/fingerprints.scala

@@ -26,7 +26,7 @@ object TestAnnotatedFingerprint {
     new TestAnnotatedFingerprint(fingerprint.annotationName, fingerprint.isModule)
 }
 
-case class TestSubclassFingerprint(isModule: Boolean, requireNoArgConstructor: Boolean, val superclassName: String)
+case class TestSubclassFingerprint(isModule: Boolean, requireNoArgConstructor: Boolean, superclassName: String)
     extends SubclassFingerprint
     with TestFingerprint
 

src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincRunner.scala

@@ -5,7 +5,7 @@ import higherkindness.rules_scala.common.args.ArgsUtil
 import higherkindness.rules_scala.common.classloaders.ClassLoaders
 import higherkindness.rules_scala.common.error.AnnexWorkerError
 import higherkindness.rules_scala.common.interrupt.InterruptUtil
-import higherkindness.rules_scala.common.sbt_testing.{TestDiscovery, TestFrameworkLoader, TestsFile}
+import higherkindness.rules_scala.common.sbt_testing.{TestDiscovery, TestFrameworkLoader, TestsFileData}
 import higherkindness.rules_scala.common.worker.{WorkTask, WorkerMain}
 import higherkindness.rules_scala.workers.common.*
 import java.io.{File, PrintWriter}
@@ -199,14 +199,14 @@ object ZincRunner extends WorkerMain[Unit] {
     parsedArguments.testsFile.foreach { path =>
       val classloader = ClassLoaders.sbtTestClassLoader(parsedArguments.classpath.map(_.toUri.toURL))
       val frameworkLoader = new TestFrameworkLoader(classloader)
-      val testsFile = TestsFile(
+      val testsFileData = TestsFileData(
         parsedArguments.testFrameworks
           .flatMap(frameworkName => frameworkLoader.load(frameworkName).map((frameworkName, _)))
           .map { case (frameworkName, framework) => frameworkName -> new TestDiscovery(framework)(analysis.apis.toSet) }
           .toMap,
       )
 
-      Files.write(path, Json.stringify(Json.toJson(testsFile)).getBytes(StandardCharsets.UTF_8))
+      Files.write(path, Json.stringify(Json.toJson(testsFileData)).getBytes(StandardCharsets.UTF_8))
     }
 
   protected def init(args: Option[Array[String]]): Unit = ()

src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestRunner.scala

@@ -4,7 +4,7 @@ import higherkindness.rules_scala.common.args.ArgsUtil.PathArgumentType
 import higherkindness.rules_scala.common.args.implicits.*
 import higherkindness.rules_scala.common.classloaders.ClassLoaders
 import higherkindness.rules_scala.common.sandbox.SandboxUtil
-import higherkindness.rules_scala.common.sbt_testing.{AnnexTestingLogger, TestDefinition, TestFrameworkLoader, TestsFile, Verbosity}
+import higherkindness.rules_scala.common.sbt_testing.{AnnexTestingLogger, TestDefinition, TestFrameworkLoader, TestsFileData, Verbosity}
 import java.io.FileInputStream
 import java.net.URLClassLoader
 import java.nio.file.attribute.FileTime
@@ -162,8 +162,8 @@ object TestRunner {
     val classLoader = ClassLoaders.sbtTestClassLoader(testClasspath.map(_.toUri.toURL).toSeq)
     val sharedClassLoader = ClassLoaders.sbtTestClassLoader(sharedUrls)
     val loader = new TestFrameworkLoader(classLoader)
-    val testsFile = Using(new FileInputStream(testRunnerRequest.testsFile.toString)) { stream =>
-      Json.fromJson[TestsFile](Json.parse(stream)).get
+    val testsFileData = Using(new FileInputStream(testRunnerRequest.testsFile.toString)) { stream =>
+      Json.fromJson[TestsFileData](Json.parse(stream)).get
     }.get
 
     val testFilter = sys.env.get("TESTBRIDGE_TEST_ONLY").map(_.split("#", 2))
@@ -174,7 +174,7 @@ object TestRunner {
     val testScopeAndName = testFilter.flatMap(_.lift(1))
 
     var count = 0
-    val passed = testsFile.testsByFramework.view
+    val passed = testsFileData.testsByFramework.view
       .flatMap { case (frameworkName, tests) => loader.load(frameworkName).map((frameworkName, _, tests)) }
       .forall { case (frameworkName, framework, tests) =>
         val filter = for {