From 9fe8a94808ba8ed97ba533c1598bdaf153b05ef8 Mon Sep 17 00:00:00 2001
From: = <rom4ek93@gmail.com>
Date: Sat, 9 Nov 2019 23:54:47 +0100
Subject: [PATCH] Fix tests on Windows

---
 .../core/internal/EditorConfigInternalTest.kt | 24 ++++++++++++-------
 .../reporter/plain/PlainReporterTest.kt       |  8 ++++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigInternalTest.kt b/ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigInternalTest.kt
index 2eec608a54..1de0f73c66 100644
--- a/ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigInternalTest.kt
+++ b/ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigInternalTest.kt
@@ -4,6 +4,7 @@ import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
 import java.nio.file.FileSystem
 import java.nio.file.Files
+import java.nio.file.Path
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Test
@@ -11,12 +12,17 @@ import org.junit.Test
 class EditorConfigInternalTest {
     private val tempFileSystem = Jimfs.newFileSystem(Configuration.forCurrentPlatform())
 
+    private fun FileSystem.normalizedPath(path: String): Path {
+        val root = rootDirectories.joinToString(separator = "/")
+        return getPath("$root$path")
+    }
+
     private fun FileSystem.writeEditorConfigFile(
         filePath: String,
         content: String
     ) {
-        Files.createDirectories(getPath(filePath))
-        Files.write(getPath("$filePath/.editorconfig"), content.toByteArray())
+        Files.createDirectories(normalizedPath(filePath))
+        Files.write(normalizedPath("$filePath/.editorconfig"), content.toByteArray())
     }
 
     @After
@@ -28,7 +34,7 @@ class EditorConfigInternalTest {
     fun testParentDirectoryFallback() {
         val projectDir = "/projects/project-1"
         val projectSubDirectory = "$projectDir/project-1-subdirectory"
-        Files.createDirectories(tempFileSystem.getPath(projectSubDirectory))
+        Files.createDirectories(tempFileSystem.normalizedPath(projectSubDirectory))
         val editorConfigFiles = arrayOf(
             """
             [*]
@@ -57,7 +63,7 @@ class EditorConfigInternalTest {
             tempFileSystem.writeEditorConfigFile(projectDir, editorConfigFileContent)
 
             val editorConfig = EditorConfigInternal.of(
-                tempFileSystem.getPath(projectSubDirectory)
+                tempFileSystem.normalizedPath(projectSubDirectory)
             )
 
             assertThat(editorConfig?.parent).isNull()
@@ -106,7 +112,7 @@ class EditorConfigInternalTest {
         )
 
         var parsedEditorConfig = EditorConfigInternal.of(
-            tempFileSystem.getPath(project1Subdirectory)
+            tempFileSystem.normalizedPath(project1Subdirectory)
         )
         assertThat(parsedEditorConfig?.parent).isNotNull
         assertThat(parsedEditorConfig?.parent?.parent).isNull()
@@ -119,7 +125,7 @@ class EditorConfigInternalTest {
         )
 
         parsedEditorConfig = EditorConfigInternal.of(
-            tempFileSystem.getPath(project1Dir)
+            tempFileSystem.normalizedPath(project1Dir)
         )
         assertThat(parsedEditorConfig?.parent).isNull()
         assertThat(parsedEditorConfig?.toMap()).isEqualTo(
@@ -131,7 +137,7 @@ class EditorConfigInternalTest {
         )
 
         parsedEditorConfig = EditorConfigInternal.of(
-            tempFileSystem.getPath(rootDir)
+            tempFileSystem.normalizedPath(rootDir)
         )
         assertThat(parsedEditorConfig?.parent).isNull()
         assertThat(parsedEditorConfig?.toMap()).isEqualTo(
@@ -174,7 +180,7 @@ class EditorConfigInternalTest {
         tempFileSystem.writeEditorConfigFile(projectDir, editorconfigFile)
 
         val parsedEditorConfig = EditorConfigInternal.of(
-            tempFileSystem.getPath(projectDir)
+            tempFileSystem.normalizedPath(projectDir)
         )
 
         assertThat(parsedEditorConfig).isNotNull
@@ -197,7 +203,7 @@ class EditorConfigInternalTest {
         tempFileSystem.writeEditorConfigFile(projectDir, editorconfigFile)
 
         val parsedEditorConfig = EditorConfigInternal.of(
-            tempFileSystem.getPath(projectDir)
+            tempFileSystem.normalizedPath(projectDir)
         )
 
         assertThat(parsedEditorConfig).isNotNull
diff --git a/ktlint-reporter-plain/src/test/kotlin/com/pinterest/ktlint/reporter/plain/PlainReporterTest.kt b/ktlint-reporter-plain/src/test/kotlin/com/pinterest/ktlint/reporter/plain/PlainReporterTest.kt
index 6510d9f046..80aca441da 100644
--- a/ktlint-reporter-plain/src/test/kotlin/com/pinterest/ktlint/reporter/plain/PlainReporterTest.kt
+++ b/ktlint-reporter-plain/src/test/kotlin/com/pinterest/ktlint/reporter/plain/PlainReporterTest.kt
@@ -4,6 +4,7 @@ import com.pinterest.ktlint.core.LintError
 import com.pinterest.ktlint.reporter.plain.internal.Color
 import com.pinterest.ktlint.reporter.plain.internal.color
 import java.io.ByteArrayOutputStream
+import java.io.File
 import java.io.PrintStream
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Assert.assertEquals
@@ -76,7 +77,7 @@ class PlainReporterTest {
             outputColor = outputColor
         )
         reporter.onLintError(
-            "/one-fixed-and-one-not.kt",
+            File.separator + "one-fixed-and-one-not.kt",
             LintError(
                 1, 1, "rule-1",
                 "<\"&'>"
@@ -88,12 +89,13 @@ class PlainReporterTest {
 
         // We don't expect class name, or first line to be colored
         val expectedOutput =
-            "/".color(outputColor) +
+            File.separator.color(outputColor) +
                 "one-fixed-and-one-not.kt" +
                 ":".color(outputColor) +
                 "1" +
                 ":1:".color(outputColor) +
-                " <\"&'>\n"
+                " <\"&'>" +
+                System.lineSeparator()
 
         assertEquals(expectedOutput, outputString)
     }