...

Author: efraespada

src/main/kotlin/components/Execution.kt

@@ -14,12 +14,12 @@ private fun execute(runtime: Runtime, command: String): ExecutionResult {
         when (getOs()) {
             Os.WINDOWS -> {
                 ExecutionResult(
-                    command.normalizeCommand(),
+                    command.normalize(),
                     runtime.exec(
                         arrayOf(
                             "cmd",
                             "/c",
-                            command.normalizeCommand()
+                            command.normalize()
                         )
                     ).outputString()
                 )
@@ -38,7 +38,7 @@ private fun execute(runtime: Runtime, command: String): ExecutionResult {
             }
         }
     } catch (e: IOException) {
-        ExecutionResult(command.normalizeCommand(), "")
+        ExecutionResult(command.normalize(), "")
     }
 }
 

src/main/kotlin/components/Extensions.kt

@@ -21,7 +21,7 @@ fun String.runCommand(runner: (command: String, result: String) -> Unit = { _, _
     return result.result
 }
 
-fun String.normalizeCommand(): String {
+fun String.normalize(): String {
     val com = mutableListOf<String>()
     this.replace("\n", " ").split(" ").forEach {
         if (it.trim().isNotEmpty()) {
@@ -129,10 +129,7 @@ fun Project.createExtension(): Extension {
 fun Process.outputString(): String {
     val input = this.inputStream.bufferedReader().use { it.readText() }
     val error = this.errorStream.bufferedReader().use { it.readText() }
-    return (when {
-        input.isNotEmpty() -> input
-        else -> error
-    }).replace("\r", "")
+    return "$input \n $error".replace("\r", "")
 }
 
 fun defaultConfig(): Configuration {

src/test/kotlin/SCTest.kt

@@ -1,7 +1,6 @@
 import components.*
 import org.junit.Before
 import org.junit.Test
-import utils.modifyForTest
 import java.io.File
 
 class SCTest {
@@ -16,7 +15,7 @@ class SCTest {
     @Test
     fun `01 - (PLUGIN) terminal verification`() {
         "echo $extensionName".runCommand { command, result ->
-            assert(command.contains(result.removeNewLines()))
+            assert(command.contains(result.normalize()))
         }
     }
 
@@ -125,6 +124,7 @@ class SCTest {
         }
     }
 
+    /*
     @Test
     fun `10 - (PLUGIN) obfuscate xml`() {
         signingReportTask.runCommand { _, report ->
@@ -187,6 +187,6 @@ class SCTest {
                 assert(androidReport.contains("BUILD SUCCESSFUL"))
             }
         }
-    }
+    }*/
 
 }

src/test/kotlin/utils/Helper.kt

@@ -8,7 +8,7 @@ fun modifyForTest(projectPath: String) {
     val file = File("$projectPath${File.separator}build.gradle")
     val content = file.getContent().replace(
         "classpath \"com.stringcare:plugin:\$stringcare_version\"",
-        "\nclasspath files(\"..${File.separator}build${File.separator}libs${File.separator}plugin-2.3-SNAPSHOT.jar\")\n"
+        "\nclasspath files(\"..${File.separator}build${File.separator}libs${File.separator}plugin-2.2.jar\")\n"
     )
     FileWriter(file.absolutePath).use { it.write(content) }