Merge pull request #52 from disneystreaming/main-into-dss-2024-03

Update main (2024.03)
disneystreaming · Mar 6, 2024 · 12794f4 · 12794f4
2 parents e6cc0d8 + a0ed749
commit 12794f4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/build.sc b/build.sc
@@ -9,9 +9,9 @@ object lsp extends MavenModule with PublishModule {
 
   def ivyDeps = Agg(
     ivy"org.eclipse.lsp4j:org.eclipse.lsp4j:0.14.0",
-    ivy"software.amazon.smithy:smithy-model:1.41.0",
-    ivy"software.amazon.smithy:smithy-build:1.41.0",
-    ivy"software.amazon.smithy:smithy-cli:1.41.0",
+    ivy"software.amazon.smithy:smithy-model:1.45.0",
+    ivy"software.amazon.smithy:smithy-build:1.45.0",
+    ivy"software.amazon.smithy:smithy-cli:1.45.0",
     ivy"com.disneystreaming.smithy:smithytranslate-formatter-jvm-java-api:0.3.10"
   )
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-smithyVersion=1.43.0
+smithyVersion=1.45.0
diff --git a/src/test/java/software/amazon/smithy/lsp/SmithyInterfaceTest.java b/src/test/java/software/amazon/smithy/lsp/SmithyInterfaceTest.java
@@ -17,14 +17,14 @@
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.junit.Test;
@@ -105,10 +105,16 @@ public void runValidators() throws Exception {
         assertTrue(result.isRight());
         List<ValidationEvent> validationEvents = result.getRight().getValidationEvents();
         assertFalse(validationEvents.isEmpty());
-        assertEquals(
-            "Proto index 1 is used muliple times in members name,age of shape (structure: `some.test#MyStruct`).",
-                validationEvents.get(0).getMessage()
-        );
+
+        String expectedMessage = "Proto index 1 is used muliple times in members name," +
+                "age of shape (structure: `some.test#MyStruct`).";
+        Optional<ValidationEvent> matchingEvent = validationEvents.stream()
+                .filter(ev ->ev.getMessage().equals(expectedMessage)).findFirst();
+
+        if (!matchingEvent.isPresent()) {
+            throw new AssertionError("Expected validation event with message `" + expectedMessage
+                    + "`, but events were " + validationEvents);
+        }
     }
 
     private static List<File> getFiles(String... filenames) throws Exception {