fix windows tests

Author: samgst-amazon

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt

@@ -120,7 +120,7 @@ class TextDocumentServiceHandlerTest {
             verify { mockTextDocumentService.didSave(capture(paramsSlot)) }
 
             with(paramsSlot.captured) {
-                assertEquals(uri.toString(), textDocument.uri)
+                assertEquals(normalizeFileUri(uri.toString()), textDocument.uri)
                 assertEquals("test content", text)
             }
         }
@@ -142,7 +142,7 @@ class TextDocumentServiceHandlerTest {
         verify { mockTextDocumentService.didOpen(capture(paramsSlot)) }
 
         with(paramsSlot.captured.textDocument) {
-            assertEquals(uri.toString(), this.uri)
+            assertEquals(normalizeFileUri(uri.toString()), this.uri)
             assertEquals(content, text)
         }
     }
@@ -157,7 +157,7 @@ class TextDocumentServiceHandlerTest {
         val paramsSlot = slot<DidCloseTextDocumentParams>()
         verify { mockTextDocumentService.didClose(capture(paramsSlot)) }
 
-        assertEquals(uri.toString(), paramsSlot.captured.textDocument.uri)
+        assertEquals(normalizeFileUri(uri.toString()), paramsSlot.captured.textDocument.uri)
     }
 
     @Test
@@ -191,7 +191,7 @@ class TextDocumentServiceHandlerTest {
         verify { mockTextDocumentService.didChange(capture(paramsSlot)) }
 
         with(paramsSlot.captured) {
-            assertEquals(uri.toString(), textDocument.uri)
+            assertEquals(normalizeFileUri(uri.toString()), textDocument.uri)
             assertEquals(123, textDocument.version)
             assertEquals("changed content", contentChanges[0].text)
         }
@@ -286,4 +286,17 @@ class TextDocumentServiceHandlerTest {
             every { this@mockk.inputStream } returns inputStream
         }
     }
+
+    private fun normalizeFileUri(uri: String): String {
+        if (!System.getProperty("os.name").lowercase().contains("windows")) {
+            return uri
+        }
+
+        if (!uri.startsWith("file:///")) {
+            return uri
+        }
+
+        val path = uri.substringAfter("file:///")
+        return "file:///C:/$path"
+    }
 }

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt

@@ -106,7 +106,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<CreateFilesParams>()
         verify { mockWorkspaceService.didCreateFiles(capture(paramsSlot)) }
-        assertEquals(pyUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(pyUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -118,7 +118,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<CreateFilesParams>()
         verify { mockWorkspaceService.didCreateFiles(capture(paramsSlot)) }
-        assertEquals(tsUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(tsUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -130,7 +130,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<CreateFilesParams>()
         verify { mockWorkspaceService.didCreateFiles(capture(paramsSlot)) }
-        assertEquals(jsUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(jsUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -142,7 +142,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<CreateFilesParams>()
         verify { mockWorkspaceService.didCreateFiles(capture(paramsSlot)) }
-        assertEquals(javaUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(javaUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -154,7 +154,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<CreateFilesParams>()
         verify { mockWorkspaceService.didCreateFiles(capture(paramsSlot)) }
-        assertEquals(dirUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(dirUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -176,7 +176,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<DeleteFilesParams>()
         verify { mockWorkspaceService.didDeleteFiles(capture(paramsSlot)) }
-        assertEquals(pyUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(pyUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -188,7 +188,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<DeleteFilesParams>()
         verify { mockWorkspaceService.didDeleteFiles(capture(paramsSlot)) }
-        assertEquals(tsUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(tsUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -200,7 +200,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<DeleteFilesParams>()
         verify { mockWorkspaceService.didDeleteFiles(capture(paramsSlot)) }
-        assertEquals(jsUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(jsUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -212,7 +212,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<DeleteFilesParams>()
         verify { mockWorkspaceService.didDeleteFiles(capture(paramsSlot)) }
-        assertEquals(javaUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(javaUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -234,7 +234,7 @@ class WorkspaceServiceHandlerTest {
 
         val paramsSlot = slot<DeleteFilesParams>()
         verify { mockWorkspaceService.didDeleteFiles(capture(paramsSlot)) }
-        assertEquals(dirUri.toString(), paramsSlot.captured.files[0].uri)
+        assertEquals(normalizeFileUri(dirUri.toString()), paramsSlot.captured.files[0].uri)
     }
 
     @Test
@@ -254,11 +254,11 @@ class WorkspaceServiceHandlerTest {
         // Assert
         val paramsSlot = slot<DidChangeWatchedFilesParams>()
         verify { mockWorkspaceService.didChangeWatchedFiles(capture(paramsSlot)) }
-        assertEquals(createURI.toString(), paramsSlot.captured.changes[0].uri)
+        assertEquals(normalizeFileUri(createURI.toString()), paramsSlot.captured.changes[0].uri)
         assertEquals(FileChangeType.Created, paramsSlot.captured.changes[0].type)
-        assertEquals(deleteURI.toString(), paramsSlot.captured.changes[1].uri)
+        assertEquals(normalizeFileUri(deleteURI.toString()), paramsSlot.captured.changes[1].uri)
         assertEquals(FileChangeType.Deleted, paramsSlot.captured.changes[1].type)
-        assertEquals(changeURI.toString(), paramsSlot.captured.changes[2].uri)
+        assertEquals(normalizeFileUri(changeURI.toString()), paramsSlot.captured.changes[2].uri)
         assertEquals(FileChangeType.Changed, paramsSlot.captured.changes[2].type)
     }
 
@@ -291,8 +291,8 @@ class WorkspaceServiceHandlerTest {
         val paramsSlot = slot<RenameFilesParams>()
         verify { mockWorkspaceService.didRenameFiles(capture(paramsSlot)) }
         with(paramsSlot.captured.files[0]) {
-            assertEquals("file:///test/$oldName", oldUri)
-            assertEquals("file:///test/$newName", newUri)
+            assertEquals(normalizeFileUri("file:///test/$oldName"), oldUri)
+            assertEquals(normalizeFileUri("file:///test/$newName"), newUri)
         }
     }
 
@@ -328,8 +328,8 @@ class WorkspaceServiceHandlerTest {
         val paramsSlot = slot<RenameFilesParams>()
         verify { mockWorkspaceService.didRenameFiles(capture(paramsSlot)) }
         with(paramsSlot.captured.files[0]) {
-            assertEquals("file:///test/oldDir", oldUri)
-            assertEquals("file:///test/newDir", newUri)
+            assertEquals(normalizeFileUri("file:///test/oldDir"), oldUri)
+            assertEquals(normalizeFileUri("file:///test/newDir"), newUri)
         }
     }
 
@@ -566,4 +566,18 @@ class WorkspaceServiceHandlerTest {
             every { newValue } returns newName
         }
     }
+
+    // need this so Windows Unit tests don't break
+    private fun normalizeFileUri(uri: String): String {
+        if (!System.getProperty("os.name").lowercase().contains("windows")) {
+            return uri
+        }
+
+        if (!uri.startsWith("file:///")) {
+            return uri
+        }
+
+        val path = uri.substringAfter("file:///")
+        return "file:///C:/$path"
+    }
 }