windows test failing

Author: efraespada

src/main/kotlin/components/Execution.kt

@@ -10,13 +10,26 @@ fun execute(command: String): String = execute(Runtime.getRuntime(), command)
 
 private fun execute(runtime: Runtime, command: String): String {
     return try {
-        runtime.exec(
-            arrayOf(
-                "/bin/bash",
-                "-c",
-                command
-            )
-        ).outputString()
+        when (getOs()) {
+            Os.WINDOWS -> {
+                val com = mutableListOf<String>()
+                command.replace("\n", " ").split(" ").forEach {
+                    if (it.trim().isNotEmpty()) {
+                        com.add(it)
+                    }
+                }
+                runtime.exec(arrayOf("cmd", "/c", com.joinToString(" ").replace("&&", "&"))).outputString()
+            }
+            Os.OSX -> {
+                runtime.exec(
+                    arrayOf(
+                        "/bin/bash",
+                        "-c",
+                        command
+                    )
+                ).outputString()
+            }
+        }
     } catch (e: IOException) {
         ""
     }

src/main/kotlin/components/Extensions.kt

@@ -94,7 +94,11 @@ fun Project.createExtension(): Extension {
     return extension
 }
 
-fun Process.outputString() = this.inputStream.bufferedReader().use { it.readText() }
+fun Process.outputString(): String {
+    val input = this.inputStream.bufferedReader().use { it.readText() }
+    val error = this.errorStream.bufferedReader().use { it.readText() }
+    return if (input.isNotEmpty()) input else error
+}
 
 fun defaultConfig(): Configuration {
     return Configuration("app").apply {

src/main/kotlin/components/Tasks.kt

@@ -13,4 +13,16 @@ internal fun gradleWrapper(): String = when (getOs()) {
 internal fun pluginBuildTask(): String = "${when (getOs()) {
     Os.WINDOWS -> wrapperWindows
     Os.OSX -> wrapperOsX
-}} build -d --exclude-task test"
+}} build -d --exclude-task test"
+
+internal fun deleteFolderCommand(directory: String): String = when (getOs()) {
+    Os.WINDOWS -> "$deleteCommandWindows $directory"
+    Os.OSX -> "$deleteCommandOsX $directory"
+}
+
+internal fun copyCommand(): String = when (getOs()) {
+    Os.WINDOWS -> copyCommandWindows
+    Os.OSX -> copyCommandOsX
+}
+
+

src/main/kotlin/components/Vars.kt

@@ -6,6 +6,10 @@ internal const val winLib = "libsignKey.dll"
 internal const val osxLib = "libsignKey.dylib"
 internal const val wrapperOsX = "./gradlew"
 internal const val wrapperWindows = "gradlew.bat"
+internal const val deleteCommandOsX = "rm -rf"
+internal const val deleteCommandWindows = "RD /S /Q"
+internal const val copyCommandOsX = "cp"
+internal const val copyCommandWindows = "copy"
 internal const val emptyChar = ""
 
 internal const val backupStringRes: String = "backupStringResources"

src/main/kotlin/components/jni/libsignKey.dll

@@ -14,12 +14,12 @@ class SCTest {
     private val mainModuleTest = "$projectName${File.separator}$mainModule"
 
     private val librarySetupTask = """
-            cp src/main/kotlin/components/jni/$osxLib out/production/classes/$osxLib
-            cp src/main/kotlin/components/jni/$winLib out/production/classes/$winLib
+            ${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$osxLib out${File.separator}production${File.separator}classes${File.separator}$osxLib &&
+            ${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$winLib out${File.separator}production${File.separator}classes${File.separator}$winLib
         """.trimIndent()
 
     private val prepareTask = """
-            rm -rf $projectName &&
+            ${deleteFolderCommand(projectName)} &&
             git clone https://github.com/StringCare/$projectName.git &&
             cd $projectName
         """.trimIndent()
@@ -82,7 +82,7 @@ class SCTest {
             assert(restoreFiles(projectName, mainModule).isEmpty())
             assert(backupFiles(projectName, defaultConfig().apply {
                 stringFiles.add("strings_extra.xml")
-                srcFolders.add("src/other_source")
+                srcFolders.add("src${File.separator}other_source")
             }).isNotEmpty())
             assert(restoreFiles(projectName, mainModule).isNotEmpty())
         }
@@ -101,13 +101,15 @@ class SCTest {
     @Test
     fun `08 - (PLUGIN) obfuscate string values`() {
         signingReportTask.runCommand { _, report ->
+            val key = report.extractFingerprint()
+            assert(key.isNotEmpty())
             val files = locateFiles(projectName, defaultConfig())
             files.forEach { file ->
                 val entities = parseXML(file.file)
                 entities.forEach { entity ->
                     val obfuscated = obfuscate(
                         mainModuleTest,
-                        report.extractFingerprint(),
+                        key,
                         entity
                     )
                     assert(obfuscated.value != entity.value)
@@ -119,23 +121,25 @@ class SCTest {
     @Test
     fun `09 - (PLUGIN) obfuscate and reveal string values`() {
         signingReportTask.runCommand { _, report ->
+            val key = report.extractFingerprint()
+            assert(key.isNotEmpty())
             val files = locateFiles(projectName, defaultConfig().apply {
                 stringFiles.add("strings_extra.xml")
-                srcFolders.add("src/other_source")
+                srcFolders.add("src${File.separator}other_source")
             })
             files.forEach { file ->
                 val entities = parseXML(file.file)
                 entities.forEach { entity ->
                     val obfuscated = obfuscate(
                         mainModuleTest,
-                        report.extractFingerprint(),
+                        key,
                         entity
                     )
                     assert(obfuscated.value != entity.value)
 
                     val original = reveal(
                         mainModuleTest,
-                        report.extractFingerprint(),
+                        key,
                         obfuscated
                     )
 
@@ -172,7 +176,7 @@ class SCTest {
         signingReportTask.runCommand { _, report ->
             val files = locateFiles(projectName, defaultConfig().apply {
                 stringFiles.add("strings_extra.xml")
-                srcFolders.add("src/other_source")
+                srcFolders.add("src${File.separator}other_source")
             })
             files.forEach { file ->
                 val entities = parseXML(file.file)
@@ -181,7 +185,7 @@ class SCTest {
             }
             val filesObfuscated = locateFiles(projectName, defaultConfig().apply {
                 stringFiles.add("strings_extra.xml")
-                srcFolders.add("src/other_source")
+                srcFolders.add("src${File.separator}other_source")
             })
             filesObfuscated.forEach { file ->
                 val entities = parseXML(file.file)