You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2017/02/28 13:13:11 UTC
[1/2] johnzon git commit: JOHNZON-103 add more tests for patches
Repository: johnzon
Updated Branches:
refs/heads/master ce46007e6 -> 2dd46d889
JOHNZON-103 add more tests for patches
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/72d5234a
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/72d5234a
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/72d5234a
Branch: refs/heads/master
Commit: 72d5234a02e83db2541462cd189f284b69e3bcbc
Parents: ce46007
Author: Mark Struberg <st...@apache.org>
Authored: Tue Feb 28 10:03:59 2017 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Feb 28 10:03:59 2017 +0100
----------------------------------------------------------------------
.../johnzon/core/JsonMergeBatchBuilderTest.java | 36 -------------
.../apache/johnzon/core/JsonMergeBatchTest.java | 55 ++++++++++++++++++++
.../apache/johnzon/core/JsonPatchDiffTest.java | 26 +++++++++
3 files changed, 81 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/72d5234a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchBuilderTest.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchBuilderTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchBuilderTest.java
deleted file mode 100644
index b5be087..0000000
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchBuilderTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.johnzon.core;
-
-
-import org.junit.Test;
-
-public class JsonMergeBatchBuilderTest {
-
- @Test
- public void testSimpleMergePatch() {
- // {"a":"xa","b","xb"}
- String source = "{\"a\":\"xa\",\"b\",\"xb\"}";
-
- // {"b":"bNew","c":"xc"}
- String patch = "{\"b\":\"bNew\",\"c\":\"xc\"}";
-
- //X TODO Json.createMergePatch();
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/johnzon/blob/72d5234a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchTest.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchTest.java
new file mode 100644
index 0000000..ff4c078
--- /dev/null
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonMergeBatchTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.johnzon.core;
+
+
+import java.io.StringReader;
+
+import javax.json.Json;
+import javax.json.JsonMergePatch;
+import javax.json.JsonObject;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JsonMergeBatchTest {
+
+ @Test
+ @Ignore(value = "work in progress, TODO finish")
+ public void testSimpleMergePatch() {
+ // {"a":"xa","b","xb"}
+ String source = "{\"a\":\"xa\",\"b\",\"xb\"}";
+
+ // {"b":"bNew","c":"xc"}
+ // the result after this patch gets applied to source should be {"a":"xa","b","bNew","c":"xc"}
+ String patch = "{\"b\":\"bNew\",\"c\":\"xc\"}";
+
+ //X TODO Json.createMergePatch();
+
+ JsonMergePatch jsonMergePatch = Json.createMergePatch(Json.createReader(new StringReader(patch)).readObject());
+
+ JsonObject jsonSource = Json.createReader(new StringReader(source)).readObject();
+
+ JsonObject jsonTarget = jsonMergePatch.apply(jsonSource).asJsonObject();
+ Assert.assertNotNull(jsonTarget);
+ Assert.assertEquals(3, jsonTarget.entrySet().size());
+ Assert.assertEquals("xa", jsonTarget.getString("a"));
+ Assert.assertEquals("bNew", jsonTarget.getString("b"));
+ Assert.assertEquals("xc", jsonTarget.getString("c"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/johnzon/blob/72d5234a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
index 48ff05a..044ca9b 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
@@ -68,6 +68,32 @@ public class JsonPatchDiffTest {
assertEquals(1, operations.size());
containsOperation(operations, JsonPatch.Operation.ADD, "/a", target.get("a"));
+
+ // now try to apply that patch.
+ JsonObject patched = patch.apply(JsonValue.EMPTY_JSON_OBJECT);
+ Assert.assertEquals(target, patched);
+ }
+
+ @Test
+ public void testAddDiffNewObjectWithEscaping() {
+
+ JsonObject target = Json.createObjectBuilder()
+ .add("a~/", Json.createObjectBuilder()
+ .add("esc/aped", "value")
+ .add("tilde", "another"))
+ .build();
+
+ JsonPatch patch = Json.createDiff(JsonValue.EMPTY_JSON_OBJECT, target);
+ assertNotNull(patch);
+
+ JsonArray operations = patch.toJsonArray();
+ assertEquals(1, operations.size());
+
+ containsOperation(operations, JsonPatch.Operation.ADD, "/a~/", target.get("a"));
+
+ // now try to apply that patch.
+ JsonObject patched = patch.apply(JsonValue.EMPTY_JSON_OBJECT);
+ Assert.assertEquals(target, patched);
}
@Test
[2/2] johnzon git commit: JOHNZON-103 temporarily disable this test
to not break our build
Posted by st...@apache.org.
JOHNZON-103 temporarily disable this test to not break our build
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/2dd46d88
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/2dd46d88
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/2dd46d88
Branch: refs/heads/master
Commit: 2dd46d889d5683b5dd122738f8d7268122fd1d50
Parents: 72d5234
Author: Mark Struberg <st...@apache.org>
Authored: Tue Feb 28 14:12:42 2017 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Feb 28 14:12:42 2017 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/2dd46d88/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
index 044ca9b..b578eb0 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonPatchDiffTest.java
@@ -74,7 +74,9 @@ public class JsonPatchDiffTest {
Assert.assertEquals(target, patched);
}
+ //X TODO
@Test
+ @Ignore("TODO define how escaping must get handled")
public void testAddDiffNewObjectWithEscaping() {
JsonObject target = Json.createObjectBuilder()