fix error message in tests

jsteemann · jsteemann · commit 9ba49e3f01e7 · 2020-07-22T22:49:47.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## Release notes for the ArangoDB-PHP driver 3.8.x
+
+This version of the PHP driver removes support for the MMFiles storage engine, which was
+deprecated in the arangod server in version 3.6.0, and removed in version 3.7.0..
+
+Updating, replacing or removing documents in the database using a revision id guard value
+may return a different error message in case the revision id value of the found document is
+not as expected.
+Previous versions before 3.7 returned HTTP error 412, an ArangoDB error code 1200 and the 
+error message string "precondition failed". This was changed in version 3.7 to return the 
+same error codes, but an error message string of "conflict". Version 3.8 changes this again
+so the error message string is now "conflict, _rev values do not match".
+
+
 ## Release notes for the ArangoDB-PHP driver 3.7.x
 
 The corresponding ArangoDB version, ArangoDB 3.7 has dropped support for the MMFiles storage
diff --git a/tests/DocumentExtendedTest.php b/tests/DocumentExtendedTest.php
@@ -642,7 +642,7 @@ public function testCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         static::assertInstanceOf(\Exception::class, $e);
         static::assertEquals(412, $e->getCode());
         static::assertEquals(1200, $e->getServerCode());
-        static::assertEquals('conflict', $e->getMessage());
+        static::assertEquals('conflict, _rev values do not match', $e->getMessage());
         $resultingDocument1 = $documentHandler->get($this->collection->getName(), $documentId);
 
         static::assertEquals(
@@ -689,7 +689,7 @@ public function testCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
         static::assertEquals(412, $e->getCode());
         static::assertEquals(1200, $e->getServerCode());
-        static::assertEquals('conflict', $e->getMessage());
+        static::assertEquals('conflict, _rev values do not match', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
@@ -750,7 +750,7 @@ public function testMoreCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         static::assertInstanceOf(\Exception::class, $e);
         static::assertEquals(412, $e->getCode());
         static::assertEquals(1200, $e->getServerCode());
-        static::assertEquals('conflict', $e->getMessage());
+        static::assertEquals('conflict, _rev values do not match', $e->getMessage());
         $resultingDocument1 = $documentHandler->get($this->collection->getName(), $documentId);
 
         static::assertEquals($resultingDocument1->someAttribute, 'someValue2');
@@ -797,7 +797,7 @@ public function testMoreCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
         static::assertEquals(412, $e->getCode());
         static::assertEquals(1200, $e->getServerCode());
-        static::assertEquals('conflict', $e->getMessage());
+        static::assertEquals('conflict, _rev values do not match', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
@@ -923,7 +923,7 @@ public function testCreateSetNullAttributeUpdateGetAndDeleteDocumentWithRevision
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
         static::assertEquals(412, $e->getCode());
         static::assertEquals(1200, $e->getServerCode());
-        static::assertEquals('conflict', $e->getMessage());
+        static::assertEquals('conflict, _rev values do not match', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
