From f54116f39ccb6d1efec95d76c59e9dad1d46e426 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 1 Jan 2025 22:37:02 +0000
Subject: Use JSON5 paths from parser

---
 .../org/shedlang/compiler/config/ProjectConfigTests.java   | 12 ++++++------
 .../compiler/config/json/Json5ObjectWithSourceTests.java   | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/shedlang/compiler/config/ProjectConfigTests.java b/src/test/java/org/shedlang/compiler/config/ProjectConfigTests.java
index e710dcc6..2a852f98 100644
--- a/src/test/java/org/shedlang/compiler/config/ProjectConfigTests.java
+++ b/src/test/java/org/shedlang/compiler/config/ProjectConfigTests.java
@@ -91,7 +91,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected bins to be array, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.bins to be array, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:1:8
             {bins: true}
@@ -110,7 +110,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected bins[0] to be object, but was finite number"));
+        assertThat(error.getMessage(), equalTo("Expected $.bins[0] to be object, but was finite number"));
         assertThat(error.source().describe(), equalTo("""
             <string>:2:12
                 bins: [1],
@@ -157,7 +157,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected examples to be array, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.examples to be array, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:1:12
             {examples: true}
@@ -176,7 +176,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected examples[0] to be object, but was finite number"));
+        assertThat(error.getMessage(), equalTo("Expected $.examples[0] to be object, but was finite number"));
         assertThat(error.source().describe(), equalTo("""
             <string>:2:16
                 examples: [1],
@@ -223,7 +223,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected profiles to be array, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.profiles to be array, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:1:12
             {profiles: true}
@@ -242,7 +242,7 @@ public class ProjectConfigTests {
             )
         );
 
-        assertThat(error.getMessage(), equalTo("Expected profiles[0] to be object, but was finite number"));
+        assertThat(error.getMessage(), equalTo("Expected $.profiles[0] to be object, but was finite number"));
         assertThat(error.source().describe(), equalTo("""
             <string>:2:16
                 profiles: [1],
diff --git a/src/test/java/org/shedlang/compiler/config/json/Json5ObjectWithSourceTests.java b/src/test/java/org/shedlang/compiler/config/json/Json5ObjectWithSourceTests.java
index 4dc1a117..112a45bc 100644
--- a/src/test/java/org/shedlang/compiler/config/json/Json5ObjectWithSourceTests.java
+++ b/src/test/java/org/shedlang/compiler/config/json/Json5ObjectWithSourceTests.java
@@ -37,7 +37,7 @@ public class Json5ObjectWithSourceTests {
                 .getLong("x")
         );
 
-        assertThat(error.getMessage(), equalTo("a.b[1] is missing x"));
+        assertThat(error.getMessage(), equalTo("$.a.b[1] is missing x"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:13
                         {},
@@ -70,7 +70,7 @@ public class Json5ObjectWithSourceTests {
                 .getLong("x")
         );
 
-        assertThat(error.getMessage(), equalTo("Expected a.b[1].x to be finite number, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.a.b[1].x to be finite number, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:17
                         {x: true},
@@ -103,7 +103,7 @@ public class Json5ObjectWithSourceTests {
                 .getLong("x")
         );
 
-        assertThat(error.getMessage(), equalTo("a.b[1].x must be a 64-bit integer"));
+        assertThat(error.getMessage(), equalTo("$.a.b[1].x must be a 64-bit integer"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:17
                         {x: 1.2},
@@ -185,7 +185,7 @@ public class Json5ObjectWithSourceTests {
                 .getLongOrNone("x")
         );
 
-        assertThat(error.getMessage(), equalTo("Expected a.b[1].x to be finite number, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.a.b[1].x to be finite number, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:17
                         {x: true},
@@ -243,7 +243,7 @@ public class Json5ObjectWithSourceTests {
                 .getString("name")
         );
 
-        assertThat(error.getMessage(), equalTo("shed.bins[1] is missing name"));
+        assertThat(error.getMessage(), equalTo("$.shed.bins[1] is missing name"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:13
                         {},
@@ -276,7 +276,7 @@ public class Json5ObjectWithSourceTests {
                 .getString("name")
         );
 
-        assertThat(error.getMessage(), equalTo("Expected shed.bins[1].name to be string, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.shed.bins[1].name to be string, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:20
                         {name: true},
@@ -365,7 +365,7 @@ public class Json5ObjectWithSourceTests {
                 .getStringOrNone("name")
         );
 
-        assertThat(error.getMessage(), equalTo("Expected shed.bins[1].name to be string, but was boolean"));
+        assertThat(error.getMessage(), equalTo("Expected $.shed.bins[1].name to be string, but was boolean"));
         assertThat(error.source().describe(), equalTo("""
             <string>:5:20
                         {name: true},
-- 
cgit v1.2.3