annotating docs, verifying change counts increment

automerge · Jul 9, 2023 · 0ddc9b7 · 0ddc9b7
1 parent b4f508f
commit 0ddc9b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Sources/Automerge/Document.swift b/Sources/Automerge/Document.swift
@@ -504,6 +504,8 @@ public class Document: @unchecked Sendable {
     }
 
     /// Returns a set of change hashes that represent the current state of the document.
+    ///
+    /// The number of change hashes returned represents the number of concurrent changes the document tracks.
     public func heads() -> Set<ChangeHash> {
         queue.sync {
             Set(self.doc.wrapErrors { $0.heads().map { ChangeHash(bytes: $0) } })

diff --git a/Tests/AutomergeTests/TestHistory.swift b/Tests/AutomergeTests/TestHistory.swift
@@ -39,11 +39,21 @@ class HistoryTests: XCTestCase {
         try! doc.put(obj: ObjId.ROOT, key: "key", value: .String("two"))
         XCTAssertEqual(doc.changes().count, 2)
 
-        try! doc.put(obj: ObjId.ROOT, key: "key", value: .String("three"))
-        XCTAssertEqual(doc.changes().count, 3)
-
         let replicaDoc = doc.fork()
         XCTAssertEqual(doc.heads(), replicaDoc.heads())
         XCTAssertEqual(doc.changes(), replicaDoc.changes())
+
+        try! doc.put(obj: ObjId.ROOT, key: "key", value: .String("three"))
+        XCTAssertEqual(doc.changes().count, 3)
+        XCTAssertEqual(replicaDoc.changes().count, 2)
+
+        try doc.put(obj: ObjId.ROOT, key: "newkey", value: .String("beta"))
+        try replicaDoc.put(obj: ObjId.ROOT, key: "newkey", value: .String("alpha"))
+        XCTAssertEqual(doc.changes().count, 4)
+        XCTAssertEqual(replicaDoc.changes().count, 3)
+
+        try doc.merge(other: replicaDoc)
+        XCTAssertEqual(doc.changes().count, 5)
+        XCTAssertEqual(replicaDoc.changes().count, 3)
     }
 }