From 5dfaf716a7f3f8432cc2d74faabec9c76d8b1bbc Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 3 Jul 2024 19:31:48 +0200 Subject: [PATCH] GH-1285: avoid test failures due to different path sorting on different platforms --- .../java/value/test/ValueCompletionTest.java | 26 +++++++++---------- ...urce-root.md => a-random-resource-root.md} | 0 2 files changed, 13 insertions(+), 13 deletions(-) rename headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/{random-resource-root.md => a-random-resource-root.md} (100%) diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java index 8343be975..ef4bdc5c8 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java @@ -159,7 +159,7 @@ public class ValueCompletionTest { "@Value(\"${spring.prop1}\"<*>)"); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md\"<*>)", + "@Value(\"classpath:a-random-resource-root.md\"<*>)", "@Value(\"classpath:org/random-resource-org.md\"<*>)", "@Value(\"classpath:org/test/random-resource-org-test.txt\"<*>)"); } @@ -175,7 +175,7 @@ public class ValueCompletionTest { "@Value(value=\"${spring.prop1}\"<*>)"); assertClasspathCompletions( - "@Value(value=\"classpath:random-resource-root.md\"<*>)", + "@Value(value=\"classpath:a-random-resource-root.md\"<*>)", "@Value(value=\"classpath:org/random-resource-org.md\"<*>)", "@Value(value=\"classpath:org/test/random-resource-org-test.txt\"<*>)"); } @@ -277,7 +277,7 @@ public class ValueCompletionTest { "@Value(\"${spring.prop1}<*>\")"); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md<*>\")", + "@Value(\"classpath:a-random-resource-root.md<*>\")", "@Value(\"classpath:org/random-resource-org.md<*>\")", "@Value(\"classpath:org/test/random-resource-org-test.txt<*>\")"); } @@ -334,7 +334,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md\"<*>)", + "@Value(\"classpath:a-random-resource-root.md\"<*>)", "@Value(\"classpath:org/random-resource-org.md\"<*>)", "@Value(\"classpath:org/test/random-resource-org-test.txt\"<*>)"); } @@ -347,7 +347,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md\"<*>)"); + "@Value(\"classpath:a-random-resource-root.md\"<*>)"); } @Test @@ -358,7 +358,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md\"<*>)"); + "@Value(\"classpath:a-random-resource-root.md\"<*>)"); } @Test @@ -369,7 +369,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md<*>\")"); + "@Value(\"classpath:a-random-resource-root.md<*>\")"); } @Test @@ -380,7 +380,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(value=\"classpath:random-resource-root.md\"<*>)"); + "@Value(value=\"classpath:a-random-resource-root.md\"<*>)"); } @Test @@ -391,7 +391,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(value=\"classpath:random-resource-root.md<*>\")"); + "@Value(value=\"classpath:a-random-resource-root.md<*>\")"); } @Test @@ -402,7 +402,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(value=\"classpath:random-resource-root.md\"<*>)", + "@Value(value=\"classpath:a-random-resource-root.md\"<*>)", "@Value(value=\"classpath:org/random-resource-org.md\"<*>)", "@Value(value=\"classpath:org/test/random-resource-org-test.txt\"<*>)"); } @@ -437,7 +437,7 @@ public class ValueCompletionTest { assertPropertyCompletions(); assertClasspathCompletions( - "@Value(\"classpath:random-resource-root.md<*>\")", + "@Value(\"classpath:a-random-resource-root.md<*>\")", "@Value(\"classpath:org/random-resource-org.md<*>\")", "@Value(\"classpath:org/test/random-resource-org-test.txt<*>\")"); } @@ -535,7 +535,7 @@ public class ValueCompletionTest { editor.assertContextualCompletions( "<*>" , //==> - "classpath:random-resource-root.md<*>", + "classpath:a-random-resource-root.md<*>", "classpath:org/random-resource-org.md<*>", "classpath:org/test/random-resource-org-test.txt<*>", @@ -550,7 +550,7 @@ public class ValueCompletionTest { editor.assertContextualCompletions( "<*>" , //==> - "classpath:random-resource-root.md<*>", + "classpath:a-random-resource-root.md<*>", "classpath:org/random-resource-org.md<*>", "classpath:org/test/random-resource-org-test.txt<*>", diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/random-resource-root.md b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/a-random-resource-root.md similarity index 100% rename from headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/random-resource-root.md rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/a-random-resource-root.md