Merge pull request #593 from lolgab/fix-tests-js-native

Fix dependencies to be platformed and fix newly enabled tests
outr · Jun 4, 2024 · 5e6705f · 5e6705f
2 parents bc7bdea + e105088
commit 5e6705f
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 98 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,7 +67,7 @@ val slf4j2Version: String = "2.0.13"
 val profigVersion: String = "3.4.1"
 
 // Slack and Logstash Dependencies
-val spiceVersion: String = "0.5.8"
+val spiceVersion: String = "0.5.9"
 
 // Benchmarking Dependencies
 val log4jVersion: String = "2.23.1"
@@ -100,11 +100,11 @@ val sourceMapSettings = List(
 
 lazy val root = project.in(file("."))
   .aggregate(
-    coreJS, coreJVM, coreNative,
-    // TODO: Re-enable catsNative when cats-effect supports ScalaNative 0.5
-    catsJS, catsJVM, //catsNative,
-    fileJVM, fileNative,
-    jsonJS, jsonJVM, jsonFabricJS, jsonFabricJVM, jsonCirceJS, jsonCirceJVM,
+    core.js, core.jvm, core.native,
+    // TODO: Re-enable cats.native when cats-effect supports ScalaNative 0.5
+    cats.js, cats.jvm, //cats.native,
+    fileModule.jvm, fileModule.native,
+    json.js, json.jvm, jsonFabric.js, jsonFabric.jvm, jsonCirce.js, jsonCirce.jvm,
     slf4j, slf4j2, log4j, migration, config, slack, logstash
   )
   .settings(
@@ -120,7 +120,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     libraryDependencies ++= Seq(
       "com.outr" %%% "perfolation" % perfolationVersion,
       "com.lihaoyi" %%% "sourcecode" % sourcecodeVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     libraryDependencies ++= (
       if (scalaVersion.value.startsWith("2.12.")) {
@@ -134,13 +134,18 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .jvmSettings(
     libraryDependencies ++= Seq(
-      "com.outr" %% "moduload" % moduloadVersion
+      "com.outr" %%% "moduload" % moduloadVersion
     )
   )
-
-lazy val coreJS = core.js
-lazy val coreJVM = core.jvm
-lazy val coreNative = core.native
+  .jsSettings(
+    libraryDependencies ++= Seq(
+      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" % Test,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" % Test
+    )
+  )
+  .nativeSettings(
+    coverageEnabled := false
+  )
 
 lazy val cats = crossProject(JVMPlatform, JSPlatform) //, NativePlatform)
   .crossType(CrossType.Full)
@@ -149,8 +154,8 @@ lazy val cats = crossProject(JVMPlatform, JSPlatform) //, NativePlatform)
     crossScalaVersions := allScalaVersions,
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "cats-effect" % catsEffectVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
-      "org.typelevel" %% "cats-effect-testing-scalatest" % catsEffectTestingVersion % "test"
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test,
+      "org.typelevel" %%% "cats-effect-testing-scalatest" % catsEffectTestingVersion % "test"
     ),
     libraryDependencies ++= (
       if (scalaVersion.value.startsWith("2.12.")) {
@@ -163,16 +168,12 @@ lazy val cats = crossProject(JVMPlatform, JSPlatform) //, NativePlatform)
   )
   .dependsOn(core)
 
-lazy val catsJS = cats.js
-lazy val catsJVM = cats.jvm
-//lazy val catsNative = cats.native
-
 lazy val fileModule = crossProject(JVMPlatform, NativePlatform)
   .crossType(CrossType.Full)
   .settings(
     name := "scribe-file",
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
@@ -184,99 +185,87 @@ lazy val fileModule = crossProject(JVMPlatform, NativePlatform)
   )
   .dependsOn(core)
 
-lazy val fileJVM = fileModule.jvm
-lazy val fileNative = fileModule.native
-
 lazy val json = crossProject(JSPlatform, JVMPlatform)
   .crossType(CrossType.Full)
   .settings(
     name := "scribe-json",
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
   .dependsOn(core)
 
-lazy val jsonJS = json.js
-lazy val jsonJVM = json.jvm
-
 lazy val jsonFabric = crossProject(JSPlatform, JVMPlatform)
   .crossType(CrossType.Full)
   .settings(
     name := "scribe-json-fabric",
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "fabric-io" % fabricVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
   .dependsOn(json)
 
-lazy val jsonFabricJS = jsonFabric.js
-lazy val jsonFabricJVM = jsonFabric.jvm
-
 lazy val jsonCirce = crossProject(JSPlatform, JVMPlatform)
   .crossType(CrossType.Full)
   .settings(
     name := "scribe-json-circe",
     libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core" % circeVersion,
-      "io.circe" %% "circe-parser" % circeVersion,
-      "io.circe" %% "circe-generic" % circeVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "io.circe" %%% "circe-core" % circeVersion,
+      "io.circe" %%% "circe-parser" % circeVersion,
+      "io.circe" %%% "circe-generic" % circeVersion,
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
   .dependsOn(json)
 
-lazy val jsonCirceJS = jsonCirce.js
-lazy val jsonCirceJVM = jsonCirce.jvm
-
 lazy val slf4j = project.in(file("slf4j"))
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
   .settings(
     name := "scribe-slf4j",
     Test / publishArtifact := false,
     libraryDependencies ++= Seq(
       "org.slf4j" % "slf4j-api" % slf4jVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
 
 lazy val slf4j2 = project.in(file("slf4j2"))
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
   .settings(
     name := "scribe-slf4j2",
     Test / publishArtifact := false,
     libraryDependencies ++= Seq(
       "org.slf4j" % "slf4j-api" % slf4j2Version,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
 
 lazy val log4j = project.in(file("log4j"))
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
   .settings(
     name := "scribe-log4j",
     Test / publishArtifact := false,
     libraryDependencies ++= Seq(
       "org.apache.logging.log4j" % "log4j-api" % log4jVersion,
       "org.apache.logging.log4j" % "log4j-core" % log4jVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
 
 lazy val migration = project.in(file("migration"))
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
   .settings(
     name := "scribe-migration",
     Test / publishArtifact := false,
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
@@ -287,8 +276,8 @@ lazy val config = project.in(file("config"))
     name := "scribe-config",
     Test / publishArtifact := false,
     libraryDependencies ++= Seq(
-      "com.outr" %% "profig" % profigVersion,
-      "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+      "com.outr" %%% "profig" % profigVersion,
+      "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
     ),
     crossScalaVersions := allScalaVersions
   )
@@ -301,7 +290,7 @@ lazy val slack = project.in(file("slack"))
       "com.outr" %% "spice-client-okhttp" % spiceVersion
     )
   )
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
 
 lazy val logstash = project.in(file("logstash"))
   .settings(
@@ -311,10 +300,10 @@ lazy val logstash = project.in(file("logstash"))
       "com.outr" %% "spice-client-okhttp" % spiceVersion
     )
   )
-  .dependsOn(coreJVM)
+  .dependsOn(core.jvm)
 
 lazy val benchmarks = project.in(file("benchmarks"))
-  .dependsOn(fileJVM, catsJVM)
+  .dependsOn(fileModule.jvm, cats.jvm)
   .enablePlugins(JmhPlugin)
   .settings(
     fork := true,
@@ -325,11 +314,11 @@ lazy val benchmarks = project.in(file("benchmarks"))
       "com.lmax" % "disruptor" % disruptorVersion,
       "ch.qos.logback" % "logback-classic" % logbackVersion,
       "com.typesafe" % "config" % typesafeConfigVersion,
-      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+      "com.typesafe.scala-logging" %%% "scala-logging" % scalaLoggingVersion,
       "org.tinylog" % "tinylog" % tinyLogVersion,
-      "org.log4s" %% "log4s" % log4sVersion,
-      "org.typelevel" %% "log4cats-slf4j" % log4catsVersion,
-      "co.fs2" %% "fs2-core" % fs2Version
+      "org.log4s" %%% "log4s" % log4sVersion,
+      "org.typelevel" %%% "log4cats-slf4j" % log4catsVersion,
+      "co.fs2" %%% "fs2-core" % fs2Version
     )
   )
 

diff --git a/...ed/src/test/scala/specs/LoggingSpec.scala → ...vm/src/test/scala/specs/LoggingSpec.scala b/...ed/src/test/scala/specs/LoggingSpec.scala → ...vm/src/test/scala/specs/LoggingSpec.scala
@@ -457,18 +457,22 @@ class LoggingSpec extends AnyWordSpec with Matchers with Logging {
       writer.output.map(_.plainText) should be(List("error"))
     }
     "use HTMLOutputFormat to log something" in {
-      val MomentInTime = 1606235160799L
-      Time.contextualize(MomentInTime) {
-        val b = new StringBuilder
-        val writer = new Writer {
-          override def write(record: LogRecord, output: LogOutput, outputFormat: OutputFormat): Unit = {
-            outputFormat(output, b.append(_))
+      sys.props("java.vm.name") match {
+        case "Scala.js" | "Scala Native" =>
+        case _ =>
+          val MomentInTime = 1606235160799L
+          Time.contextualize(MomentInTime) {
+            val b = new StringBuilder
+            val writer = new Writer {
+              override def write(record: LogRecord, output: LogOutput, outputFormat: OutputFormat): Unit = {
+                outputFormat(output, b.append(_))
+              }
+            }
+            val logger = Logger().orphan().withHandler(writer = writer, outputFormat = HTMLOutputFormat())
+            Thread.currentThread().setName("test-thread")
+            logger.info("Hello, HTML!")
+            b.toString() should be("""<div class="record"><span style="color: cyan"><strong>2020.11.24&#160;10:26:00:799</strong></span>&#160;<em>test-thread</em>&#160;<span style="color: blue">INFO</span>&#160;<span style="color: green">specs.LoggingSpec.LoggingSpec:473</span><br/>&#160;&#160;&#160;&#160;Hello,&#160;HTML!&#160;&#160;&#160;&#160;</div>""")
           }
-        }
-        val logger = Logger().orphan().withHandler(writer = writer, outputFormat = HTMLOutputFormat())
-        Thread.currentThread().setName("test-thread")
-        logger.info("Hello, HTML!")
-        b.toString() should be("""<div class="record"><span style="color: cyan"><strong>2020.11.24&#160;10:26:00:799</strong></span>&#160;<em>test-thread</em>&#160;<span style="color: blue">INFO</span>&#160;<span style="color: green">specs.LoggingSpec.LoggingSpec:470</span><br/>&#160;&#160;&#160;&#160;Hello,&#160;HTML!&#160;&#160;&#160;&#160;</div>""")
       }
     }
   }

diff --git a/.../scala/spec/AsynchronousLoggingSpec.scala → ...scala/specs/AsynchronousLoggingSpec.scala b/.../scala/spec/AsynchronousLoggingSpec.scala → ...scala/specs/AsynchronousLoggingSpec.scala
@@ -1,4 +1,4 @@
-package spec
+package specs
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec

diff --git a/core/jvm/src/test/scala/specs/MDCThreadSpec.scala b/core/jvm/src/test/scala/specs/MDCThreadSpec.scala
@@ -0,0 +1,47 @@
+package specs
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+import scribe.Logger
+import scribe.mdc._
+import scribe.writer.CacheWriter
+
+class MDCThreadSpec extends AnyWordSpec with Matchers {
+  private lazy val writer = new CacheWriter
+  private lazy val logger = Logger("mdc-test").orphan().withHandler(writer = writer)
+
+  "MDC" should {
+    "verify concurrency access to implicits" in {
+      implicit val mdc: MDC = MDC.instance
+      logger.info("Zero")
+      mdc.context("test" -> "testing") {
+        logger.info("One")
+        mdc.context("test" -> "testing2") {
+          logger.info("Two")
+          var finished = false
+          new Thread {
+            override def run(): Unit = {
+              logger.info("Three")
+              finished = true
+            }
+          }.start()
+          while (!finished) {
+            Thread.sleep(10)
+          }
+        }
+        logger.info("Four")
+      }
+      logger.info("Five")
+      writer.consume { list =>
+        list.map(r => r.messages.head.logOutput.plainText -> r.data.get("test").map(_())) should be(List(
+          "Five" -> None,
+          "Four" -> Some("testing"),
+          "Three" -> Some("testing2"),
+          "Two" -> Some("testing2"),
+          "One" -> Some("testing"),
+          "Zero" -> None
+        ))
+      }
+    }
+  }
+}
diff --git a/core/shared/src/test/scala/specs/MDCSpec.scala b/core/shared/src/test/scala/specs/MDCSpec.scala
@@ -37,37 +37,5 @@ class MDCSpec extends AnyWordSpec with Matchers {
         ))
       }
     }
-    "verify concurrency access to implicits" in {
-      implicit val mdc: MDC = MDC.instance
-      logger.info("Zero")
-      mdc.context("test" -> "testing") {
-        logger.info("One")
-        mdc.context("test" -> "testing2") {
-          logger.info("Two")
-          var finished = false
-          new Thread {
-            override def run(): Unit = {
-              logger.info("Three")
-              finished = true
-            }
-          }.start()
-          while (!finished) {
-            Thread.sleep(10)
-          }
-        }
-        logger.info("Four")
-      }
-      logger.info("Five")
-      writer.consume { list =>
-        list.map(r => r.messages.head.logOutput.plainText -> r.data.get("test").map(_())) should be(List(
-          "Five" -> None,
-          "Four" -> Some("testing"),
-          "Three" -> Some("testing2"),
-          "Two" -> Some("testing2"),
-          "One" -> Some("testing"),
-          "Zero" -> None
-        ))
-      }
-    }
   }
 }
diff --git a/...src/test/scala/spec/FileLoggingSpec.scala → ...src/test/scala/spec/FileLoggingSpec.scala b/...src/test/scala/spec/FileLoggingSpec.scala → ...src/test/scala/spec/FileLoggingSpec.scala
diff --git a/.../src/test/scala/spec/JsonWriterSpec.scala → .../src/test/scala/spec/JsonWriterSpec.scala b/.../src/test/scala/spec/JsonWriterSpec.scala → .../src/test/scala/spec/JsonWriterSpec.scala