adjust error code in tests

jsteemann · jsteemann · commit 6e826fff748a · 2020-07-22T22:25:40.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,18 @@
 
 ## Release notes for the ArangoDB-PHP driver 3.7.x
 
-Work in progress.
+The corresponding ArangoDB version, ArangoDB 3.7 has dropped support for the MMFiles storage
+engine. Usage of the MMFiles storage engine is still supported in the 3.7 version of the PHP
+driver, in order to use the driver to connect to an ArangoDB 3.6.
+But MMFiles support will be dropped from the PHP driver in version 3.8.
+
+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 returned HTTP error 412, an ArangoDB error code 1200 and an error message
+string "precondition failed". This version now returns the same error codes, but the error
+message string is changed to "conflict".
 
 
 ## Release notes for the ArangoDB-PHP driver 3.6.x
diff --git a/tests/DocumentExtendedTest.php b/tests/DocumentExtendedTest.php
@@ -640,7 +640,9 @@ public function testCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         }
 
         static::assertInstanceOf(\Exception::class, $e);
-        static::assertEquals('precondition failed', $e->getMessage());
+        static::assertEquals(412, $e->getCode());
+        static::assertEquals(1200, $e->getServerCode());
+        static::assertEquals('conflict', $e->getMessage());
         $resultingDocument1 = $documentHandler->get($this->collection->getName(), $documentId);
 
         static::assertEquals(
@@ -685,7 +687,9 @@ public function testCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         }
 
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
-        static::assertEquals('precondition failed', $e->getMessage());
+        static::assertEquals(412, $e->getCode());
+        static::assertEquals(1200, $e->getServerCode());
+        static::assertEquals('conflict', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
@@ -744,7 +748,9 @@ public function testMoreCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         }
 
         static::assertInstanceOf(\Exception::class, $e);
-        static::assertEquals('precondition failed', $e->getMessage());
+        static::assertEquals(412, $e->getCode());
+        static::assertEquals(1200, $e->getServerCode());
+        static::assertEquals('conflict', $e->getMessage());
         $resultingDocument1 = $documentHandler->get($this->collection->getName(), $documentId);
 
         static::assertEquals($resultingDocument1->someAttribute, 'someValue2');
@@ -789,7 +795,9 @@ public function testMoreCreateUpdateGetAndDeleteDocumentWithRevisionCheck()
         }
 
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
-        static::assertEquals('precondition failed', $e->getMessage());
+        static::assertEquals(412, $e->getCode());
+        static::assertEquals(1200, $e->getServerCode());
+        static::assertEquals('conflict', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
@@ -913,7 +921,9 @@ public function testCreateSetNullAttributeUpdateGetAndDeleteDocumentWithRevision
         }
 
         static::assertInstanceOf(\Exception::class, $e, 'Delete should have raised an exception here');
-        static::assertEquals('precondition failed', $e->getMessage());
+        static::assertEquals(412, $e->getCode());
+        static::assertEquals(1200, $e->getServerCode());
+        static::assertEquals('conflict', $e->getMessage());
         unset ($e);
 
         $response = $documentHandler->remove($resultingDocument3, ['policy' => 'error']);
