Merge pull request #1850 from bibonix/fix-1145-mkcommits-persistence

#1145: persist commit fields in MkCommits.create

Author: yegor256

src/main/java/com/jcabi/github/mock/MkCommits.java

@@ -12,7 +12,10 @@
 import com.jcabi.github.Repo;
 import com.jcabi.github.Statuses;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 import java.io.IOException;
+import java.util.Map;
 import lombok.EqualsAndHashCode;
 import org.xembly.Directives;
 
@@ -74,7 +77,28 @@ public Repo repo() {
     @Override
     public Commit create(
         final JsonObject params
-    ) {
+    ) throws IOException {
+        final Directives dirs = new Directives().xpath(this.xpath()).add("commit");
+        for (final Map.Entry<String, JsonValue> entry : params.entrySet()) {
+            final JsonValue value = entry.getValue();
+            if (value.getValueType() == JsonValue.ValueType.ARRAY) {
+                dirs.add(entry.getKey()).attr("array", "true");
+                for (final JsonValue item : value.asJsonArray()) {
+                    dirs.add("item").set(MkCommits.asText(item)).up();
+                }
+                dirs.up();
+            } else if (value.getValueType() == JsonValue.ValueType.OBJECT) {
+                dirs.add(entry.getKey());
+                for (final Map.Entry<String, JsonValue> sub
+                    : value.asJsonObject().entrySet()) {
+                    dirs.add(sub.getKey()).set(MkCommits.asText(sub.getValue())).up();
+                }
+                dirs.up();
+            } else {
+                dirs.add(entry.getKey()).set(MkCommits.asText(value)).up();
+            }
+        }
+        this.storage.apply(dirs);
         return this.get(params.getString("sha"));
     }
 
@@ -91,4 +115,30 @@ public Statuses statuses(
     ) {
         return new MkStatuses(this.get(sha));
     }
+
+    /**
+     * XPath of the commits element in the storage XML.
+     * @return XPath
+     */
+    private String xpath() {
+        return String.format(
+            "/github/repos/repo[@coords='%s']/git/commits",
+            this.coords
+        );
+    }
+
+    /**
+     * Render JSON value as plain text suitable for XML storage.
+     * @param value JSON value
+     * @return Plain string
+     */
+    private static String asText(final JsonValue value) {
+        final String result;
+        if (value.getValueType() == JsonValue.ValueType.STRING) {
+            result = ((JsonString) value).getString();
+        } else {
+            result = value.toString();
+        }
+        return result;
+    }
 }

src/test/java/com/jcabi/github/mock/MkCommitsTest.java

@@ -5,6 +5,7 @@
 package com.jcabi.github.mock;
 
 import com.jcabi.github.Commit;
+import com.jcabi.github.Commits;
 import jakarta.json.Json;
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
@@ -46,4 +47,62 @@ void createsMkCommit() throws IOException {
             Matchers.equalTo("12ahscba")
         );
     }
+
+    /**
+     * MkCommits.create() must persist the new commit's sha in storage so
+     * that subsequent calls (e.g. json(), get()) can find the commit.
+     * @throws IOException if there is any I/O problem
+     */
+    @Test
+    void persistsCreatedCommitSha() throws IOException {
+        final String sha = "9e1f3c7b8d4a5e6f7c2d1b0a9e8f7d6c5b4a3210";
+        final Commits commits = new MkGitHub().randomRepo().git().commits();
+        commits.create(
+            Json.createObjectBuilder()
+                .add("message", "persisted commit message")
+                .add("sha", sha)
+                .add("tree", "treesha9e1f3c7b8d4a")
+                .add(
+                    "parents",
+                    Json.createArrayBuilder().add("parentsha0123456789").build()
+                )
+                .add(
+                    "author",
+                    Json.createObjectBuilder()
+                        .add("name", "Alice")
+                        .add("email", "alice@example.com")
+                        .add("date", "2024-01-15T12:30:00+00:00")
+                        .build()
+                )
+                .build()
+        );
+        MatcherAssert.assertThat(
+            "sha must be persisted in storage",
+            commits.get(sha).json().getString("sha"),
+            Matchers.equalTo(sha)
+        );
+    }
+
+    /**
+     * MkCommits.create() must persist the commit message in storage.
+     * @throws IOException if there is any I/O problem
+     */
+    @Test
+    void persistsCreatedCommitMessage() throws IOException {
+        final String sha = "abcdef0123456789abcdef0123456789abcdef01";
+        final String message = "another persisted message";
+        final Commits commits = new MkGitHub().randomRepo().git().commits();
+        commits.create(
+            Json.createObjectBuilder()
+                .add("message", message)
+                .add("sha", sha)
+                .add("tree", "treesha-abcdef-0123")
+                .build()
+        );
+        MatcherAssert.assertThat(
+            "message must be persisted in storage",
+            commits.get(sha).json().getString("message"),
+            Matchers.equalTo(message)
+        );
+    }
 }