Merge pull request #1646 from alcaeus/fix-invalid-test-data

Fix invalid test data for UUID bin data
doctrine · Sep 27, 2017 · d1fed2d · d1fed2d
2 parents 40ee2fd + a127577
commit d1fed2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DRIVER_VERSION="1.5.8" SERVER_VERSION="3.0" COMPOSER_FLAGS="--prefer-lowest" KEY_ID="7F0CEB10"
+      env: DRIVER_VERSION="1.6.3" SERVER_VERSION="3.0" COMPOSER_FLAGS="--prefer-lowest" KEY_ID="7F0CEB10"
     - php: 5.6
       env: DRIVER_VERSION="stable" SERVER_VERSION="3.2" KEY_ID="EA312927"
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/BinDataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/BinDataTest.php
@@ -29,7 +29,7 @@ public function provideData()
             array('bin', 'test', \MongoBinData::GENERIC),
             array('binFunc', 'test', \MongoBinData::FUNC),
             array('binByteArray', 'test', \MongoBinData::BYTE_ARRAY),
-            array('binUUID', 'test', \MongoBinData::UUID),
+            array('binUUID', 'testtesttesttest', \MongoBinData::UUID),
             array('binUUIDRFC4122', '1234567890ABCDEF', \MongoBinData::UUID_RFC4122),
             array('binMD5', 'test', \MongoBinData::MD5),
             array('binCustom', 'test', \MongoBinData::CUSTOM),

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/IdTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/IdTest.php
@@ -264,7 +264,7 @@ public function getTestIdTypesAndStrategiesData()
             array('bin', 'uuid', null, null, 'MongoBinData'),
             array('bin_func', 'none', 'ABRWTIFGPEeSFf69fISAOA==', 'ABRWTIFGPEeSFf69fISAOA==', 'MongoBinData'),
             array('bin_bytearray', 'none', 'ABRWTIFGPEeSFf69fISAOA==', 'ABRWTIFGPEeSFf69fISAOA==', 'MongoBinData'),
-            array('bin_uuid', 'none', 'ABRWTIFGPEeSFf69fISAOA==', 'ABRWTIFGPEeSFf69fISAOA==', 'MongoBinData'),
+            array('bin_uuid', 'none', 'TestTestTestTest', 'TestTestTestTest', 'MongoBinData'),
             array('bin_md5', 'none', 'ABRWTIFGPEeSFf69fISAOA==', 'ABRWTIFGPEeSFf69fISAOA==', 'MongoBinData'),
             array('bin_custom', 'none', 'ABRWTIFGPEeSFf69fISAOA==', 'ABRWTIFGPEeSFf69fISAOA==', 'MongoBinData'),
 
@@ -276,12 +276,12 @@ public function getTestIdTypesAndStrategiesData()
     /**
      * @dataProvider getTestBinIdsData
      */
-    public function testBinIds($type, $expectedMongoBinDataType)
+    public function testBinIds($type, $expectedMongoBinDataType, $id)
     {
         $className = $this->createIdTestClass($type, 'none');
 
         $object = new $className();
-        $object->id = 'ABRWTIFGPEeSFf69fISAOA==';
+        $object->id = $id;
 
         $this->dm->persist($object);
         $this->dm->flush();
@@ -296,12 +296,12 @@ public function testBinIds($type, $expectedMongoBinDataType)
     public function getTestBinIdsData()
     {
         return array(
-            array('bin', 0),
-            array('bin_func', \MongoBinData::FUNC),
-            array('bin_bytearray', \MongoBinData::BYTE_ARRAY),
-            array('bin_uuid', \MongoBinData::UUID),
-            array('bin_md5', \MongoBinData::MD5),
-            array('bin_custom', \MongoBinData::CUSTOM),
+            array('bin', 0, 'ABRWTIFGPEeSFf69fISAOA=='),
+            array('bin_func', \MongoBinData::FUNC, 'ABRWTIFGPEeSFf69fISAOA=='),
+            array('bin_bytearray', \MongoBinData::BYTE_ARRAY, 'ABRWTIFGPEeSFf69fISAOA=='),
+            array('bin_uuid', \MongoBinData::UUID, 'testtesttesttest'),
+            array('bin_md5', \MongoBinData::MD5, 'ABRWTIFGPEeSFf69fISAOA=='),
+            array('bin_custom', \MongoBinData::CUSTOM, 'ABRWTIFGPEeSFf69fISAOA=='),
         );
     }