Cleanup duplicate scripts and inconsistencies between platforms

zio · Aug 19, 2024 · 2ace2c2 · 2ace2c2
1 parent 800599f
commit 2ace2c2
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 101 deletions.
diff --git a/zio-process/js/src/main/scala/zio/process/FilePlatformSpecific.scala b/zio-process/js/src/main/scala/zio/process/FilePlatformSpecific.scala
@@ -6,6 +6,8 @@ private[process] object FilePlatformSpecific {
   type File = String
   type Path = String
 
+  def fileOf(file: String): File = file
+
   def getAbsolute(file: File): js.Any = {
     val path   = js.Dynamic.global.require("path")
     val nodejs = js.Dynamic.global.require("process")

diff --git a/zio-process/js/src/test/bash/both-streams-test.sh b/zio-process/js/src/test/bash/both-streams-test.sh
diff --git a/zio-process/js/src/test/bash/echo-repeat.sh b/zio-process/js/src/test/bash/echo-repeat.sh
diff --git a/zio-process/js/src/test/bash/kill-test/sample-child.sh b/zio-process/js/src/test/bash/kill-test/sample-child.sh
diff --git a/zio-process/js/src/test/bash/kill-test/sample-parent.sh b/zio-process/js/src/test/bash/kill-test/sample-parent.sh
diff --git a/zio-process/js/src/test/bash/no-permissions.sh b/zio-process/js/src/test/bash/no-permissions.sh
diff --git a/zio-process/js/src/test/bash/stdin-echo.sh b/zio-process/js/src/test/bash/stdin-echo.sh
diff --git a/zio-process/js/src/test/scala/zio/process/SpecProperties.scala b/zio-process/js/src/test/scala/zio/process/SpecProperties.scala
diff --git a/zio-process/jvm/src/main/scala/zio/process/FilePlatformSpecific.scala b/zio-process/jvm/src/main/scala/zio/process/FilePlatformSpecific.scala
@@ -3,5 +3,7 @@ package zio.process
 private[process] object FilePlatformSpecific {
   type File = java.io.File
 
+  def fileOf(file: String): File = new File(file)
+
   def exists(file: File): Boolean = file.exists()
 }
diff --git a/zio-process/jvm/src/test/bash/both-streams-test.sh b/zio-process/jvm/src/test/bash/both-streams-test.sh
diff --git a/zio-process/jvm/src/test/bash/echo-repeat.sh b/zio-process/jvm/src/test/bash/echo-repeat.sh
diff --git a/zio-process/jvm/src/test/bash/kill-test/sample-child.sh b/zio-process/jvm/src/test/bash/kill-test/sample-child.sh
diff --git a/zio-process/jvm/src/test/bash/kill-test/sample-parent.sh b/zio-process/jvm/src/test/bash/kill-test/sample-parent.sh
diff --git a/zio-process/jvm/src/test/bash/no-permissions.sh b/zio-process/jvm/src/test/bash/no-permissions.sh
diff --git a/zio-process/jvm/src/test/bash/stdin-echo.sh b/zio-process/jvm/src/test/bash/stdin-echo.sh
diff --git a/zio-process/jvm/src/test/scala/zio/process/CommandPlatformSpecificSpec.scala b/zio-process/jvm/src/test/scala/zio/process/CommandPlatformSpecificSpec.scala
@@ -13,7 +13,8 @@ object CommandPlatformSpecificSpec extends ZIOProcessBaseSpec {
   def spec = suite("CommandSpec")(
     test("killTree also kills child processes") {
       for {
-        process  <- Command("./sample-parent.sh").workingDirectory(new File("src/test/bash/kill-test")).run
+        process  <-
+          Command("./sample-parent.sh").workingDirectory(fileOf("zio-process/shared/src/test/bash/kill-test")).run
         pids     <- process.stdout.stream
                       .via(ZPipeline.utf8Decode)
                       .via(ZPipeline.splitLines)
@@ -28,7 +29,8 @@ object CommandPlatformSpecificSpec extends ZIOProcessBaseSpec {
     } @@ TestAspect.nonFlaky(25),
     test("killTreeForcibly also kills child processes") {
       for {
-        process  <- Command("./sample-parent.sh").workingDirectory(new File("src/test/bash/kill-test")).run
+        process  <-
+          Command("./sample-parent.sh").workingDirectory(fileOf("zio-process/shared/src/test/bash/kill-test")).run
         pids     <- process.stdout.stream
                       .via(ZPipeline.utf8Decode)
                       .via(ZPipeline.splitLines)
@@ -43,7 +45,8 @@ object CommandPlatformSpecificSpec extends ZIOProcessBaseSpec {
     } @@ TestAspect.nonFlaky(25),
     test("kill only kills parent process") {
       for {
-        process  <- Command("./sample-parent.sh").workingDirectory(new File("src/test/bash/kill-test")).run
+        process  <-
+          Command("./sample-parent.sh").workingDirectory(fileOf("zio-process/shared/src/test/bash/kill-test")).run
         pids     <- process.stdout.stream
                       .via(ZPipeline.utf8Decode)
                       .via(ZPipeline.splitLines)

diff --git a/zio-process/jvm/src/test/scala/zio/process/SpecProperties.scala b/zio-process/jvm/src/test/scala/zio/process/SpecProperties.scala
diff --git a/zio-process/native/src/main/scala/zio/process/FilePlatformSpecific.scala b/zio-process/native/src/main/scala/zio/process/FilePlatformSpecific.scala
@@ -3,5 +3,7 @@ package zio.process
 private[process] object FilePlatformSpecific {
   type File = java.io.File
 
+  def fileOf(file: String): File = new File(file)
+
   def exists(file: File): Boolean = file.exists()
 }
diff --git a/zio-process/native/src/test/scala/zio/process/SpecProperties.scala b/zio-process/native/src/test/scala/zio/process/SpecProperties.scala
diff --git a/zio-process/shared/src/test/scala/zio/process/CommandSpec.scala b/zio-process/shared/src/test/scala/zio/process/CommandSpec.scala
@@ -4,11 +4,12 @@ import zio.stream.ZPipeline
 import zio.test.Assertion._
 import zio.test._
 import zio._
+import zio.process.FilePlatformSpecific.fileOf
 
 import java.nio.charset.StandardCharsets
 
 // TODO: Add aspects for different OSes? scala.util.Properties.isWin, etc. Also try to make this as OS agnostic as possible in the first place
-object CommandSpec extends ZIOProcessBaseSpec with SpecProperties {
+object CommandSpec extends ZIOProcessBaseSpec {
 
   def spec = suite("CommandSpec")(
     test("convert stdout to string") {
@@ -53,7 +54,7 @@ object CommandSpec extends ZIOProcessBaseSpec with SpecProperties {
     test("accept file stdin") {
       for {
         lines <-
-          Command("cat").stdin(ProcessInput.fromFile(mkFile(s"zio-process/shared/src/test/bash/echo-repeat.sh"))).lines
+          Command("cat").stdin(ProcessInput.fromFile(fileOf(s"zio-process/shared/src/test/bash/echo-repeat.sh"))).lines
       } yield assertTrue(lines.head == "#!/bin/bash")
     },
     test("support different encodings") {
@@ -65,12 +66,12 @@ object CommandSpec extends ZIOProcessBaseSpec with SpecProperties {
       assertZIO(zio)(equalTo("piped in"))
     },
     test("set workingDirectory") {
-      val zio = Command("ls").workingDirectory(mkFile(s"zio-process/shared/src/test/bash")).lines
+      val zio = Command("ls").workingDirectory(fileOf(s"zio-process/shared/src/test/bash")).lines
 
       assertZIO(zio)(contains("no-permissions.sh"))
     },
     test("be able to fallback to a different program using typed error channel") {
-      val zio = Command("echo", "-n", "wrong").workingDirectory(mkFile("no-folder")).string.catchSome {
+      val zio = Command("echo", "-n", "wrong").workingDirectory(fileOf("no-folder")).string.catchSome {
         case CommandError.WorkingDirectoryMissing(_) =>
           Command("echo", "-n", "test").string
       }
@@ -136,7 +137,7 @@ object CommandSpec extends ZIOProcessBaseSpec with SpecProperties {
     },
     test("typed error for non-existent working directory") {
       for {
-        exit <- Command("ls").workingDirectory(mkFile("/some/bad/path")).lines.exit
+        exit <- Command("ls").workingDirectory(fileOf("/some/bad/path")).lines.exit
       } yield assert(exit)(fails(isSubtype[CommandError.WorkingDirectoryMissing](anything)))
     },
     test("end of stream also closes underlying process") {
@@ -153,7 +154,7 @@ object CommandSpec extends ZIOProcessBaseSpec with SpecProperties {
       for {
         commandQueue <- Queue.unbounded[Chunk[Byte]]
         process      <- Command("./stdin-echo.sh")
-                          .workingDirectory(mkFile(s"zio-process/shared/src/test/bash"))
+                          .workingDirectory(fileOf(s"zio-process/shared/src/test/bash"))
                           .stdin(ProcessInput.fromQueue(commandQueue))
                           .run
         _            <- commandQueue.offer(Chunk.fromArray("line1\nline2\n".getBytes(StandardCharsets.UTF_8)))