You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/10/22 00:34:19 UTC
[groovy] branch master updated: fix broken test
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 38f225ecc3 fix broken test
38f225ecc3 is described below
commit 38f225ecc394a656acd512999e793063e15a6160
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Oct 22 10:34:09 2022 +1000
fix broken test
---
subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java | 2 +-
.../groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy | 4 ++--
.../src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
index 99501fccb4..c4563c7316 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
@@ -63,7 +63,7 @@ import java.util.Map;
* // creates a data structure made of maps (Json object) and lists (Json array)
* assert root instanceof Map
*
- * assert builder.toString() == '{"people":{"person":{"firstName":"Guillame","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
+ * assert builder.toString() == '{"people":{"person":{"firstName":"Guillaume","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
* </code></pre>
*
* @since 1.8.0
diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
index bb4b99b162..54be8aa692 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonBuilderTest.groovy
@@ -326,7 +326,7 @@ class JsonBuilderTest extends GroovyTestCase {
def builder = new groovy.json.JsonBuilder()
def root = builder.people {
person {
- firstName 'Guillame'
+ firstName 'Guillaume'
lastName 'Laforge'
// Maps are valid values for objects too
address(
@@ -342,7 +342,7 @@ class JsonBuilderTest extends GroovyTestCase {
// creates a data structure made of maps (Json object) and lists (Json array)
assert root instanceof Map
- assert builder.toString() == '{"people":{"person":{"firstName":"Guillame","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
+ assert builder.toString() == '{"people":{"person":{"firstName":"Guillaume","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
}
void testEdgeCases() {
diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
index a4942654e9..a9fd2b6cce 100644
--- a/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
+++ b/subprojects/groovy-json/src/test/groovy/groovy/json/StreamingJsonBuilderTest.groovy
@@ -443,7 +443,7 @@ class StreamingJsonBuilderTest extends GroovyTestCase {
def builder = new StreamingJsonBuilder(w)
builder.people {
person {
- firstName 'Guillame'
+ firstName 'Guillaume'
lastName 'Laforge'
// Maps are valid values for objects too
address(
@@ -456,7 +456,7 @@ class StreamingJsonBuilderTest extends GroovyTestCase {
}
}
- assert w.toString() == '{"people":{"person":{"firstName":"Guillame","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
+ assert w.toString() == '{"people":{"person":{"firstName":"Guillaume","lastName":"Laforge","address":{"city":"Paris","country":"France","zip":12345},"married":true,"conferences":["JavaOne","Gr8conf"]}}}'
}
}