Refactoring tests

Author: carusogabriel

tests/Doctrine/ODM/MongoDB/Tests/Functional/FilesTest.php

@@ -39,7 +39,7 @@ public function testFiles()
         $this->assertInstanceOf('Doctrine\MongoDB\GridFSFile', $image->getFile());
         $this->assertFalse($image->getFile()->isDirty());
         $this->assertEquals(__DIR__ . '/file.txt', $image->getFile()->getFilename());
-        $this->assertTrue(file_exists($image->getFile()->getFilename()));
+        $this->assertFileExists($image->getFile()->getFilename());
         $this->assertEquals('These are the bytes...', $image->getFile()->getBytes());
 
         $image->setName('testing');

tests/Doctrine/ODM/MongoDB/Tests/Functional/FunctionalTest.php

@@ -379,8 +379,8 @@ public function testIncrementSetsNull()
         $this->dm->clear();
 
         $user = $this->dm->getRepository('Documents\User')->findOneBy(array('username' => 'jon'));
-        $this->assertSame(null, $user->getCount());
-        $this->assertSame(null, $user->getFloatCount());
+        $this->assertNull($user->getCount());
+        $this->assertNull($user->getFloatCount());
     }
 
     public function testTest()

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH816Test.php

@@ -10,22 +10,22 @@ public function testPersistAfterDetachWithIdSet()
     {
         $d=new GH816Document();
         $d->_id=new \MongoId();
-        $this->assertSame(array(), $this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
+        $this->assertEmpty($this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
         $this->dm->persist($d);
         $this->dm->detach($d);
         $this->dm->flush();
-        $this->assertSame(array(), $this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
+        $this->assertEmpty($this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
     }
-    
+
     public function testPersistAfterDetachWithTitleSet()
     {
         $d=new GH816Document();
         $d->title="Test";
-        $this->assertSame(array(), $this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
+        $this->assertEmpty($this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
         $this->dm->persist($d);
         $this->dm->detach($d);
         $this->dm->flush();
-        $this->assertSame(array(), $this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
+        $this->assertEmpty($this->dm->getRepository('Doctrine\ODM\MongoDB\Tests\GH816Document')->findAll());
     }
 }
 
@@ -36,7 +36,7 @@ class GH816Document
 {
     /** @ODM\Id */
     public $_id;
-    
+
     /** @ODM\Field(type="string") */
     public $title;
 }

tests/Doctrine/ODM/MongoDB/Tests/HydratorTest.php

@@ -33,7 +33,7 @@ public function testHydrator()
         ));
 
         $this->assertEquals(1, $user->id);
-        $this->assertSame(null, $user->title);
+        $this->assertNull($user->title);
         $this->assertEquals('jon', $user->name);
         $this->assertInstanceOf('DateTime', $user->birthdate);
         $this->assertInstanceOf(__NAMESPACE__.'\HydrationClosureReferenceOne', $user->referenceOne);
@@ -44,7 +44,7 @@ public function testHydrator()
         $this->assertEquals('jon', $user->embedOne->name);
         $this->assertEquals('jon', $user->embedMany[0]->name);
     }
-    
+
     public function testReadOnly()
     {
         $class = $this->dm->getClassMetadata(__NAMESPACE__.'\HydrationClosureUser');
@@ -59,7 +59,7 @@ public function testReadOnly()
                 ['name' => 'maciej']
             ],
         ], [ Query::HINT_READ_ONLY => true ]);
-        
+
         $this->assertFalse($this->uow->isInIdentityMap($user));
         $this->assertFalse($this->uow->isInIdentityMap($user->embedOne));
         $this->assertFalse($this->uow->isInIdentityMap($user->embedMany[0]));
@@ -77,7 +77,7 @@ class HydrationClosureUser
 
     /** @ODM\Field(type="string") */
     public $name;
-    
+
     /** @ODM\Field(type="date") */
     public $birthdate;
 

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/XmlDriverTest.php

@@ -43,16 +43,16 @@ public function testDriverShouldParseNonStringAttributes()
         $classMetadata = new ClassMetadata('TestDocuments\UserNonStringOptions');
         $this->driver->loadMetadataForClass('TestDocuments\UserNonStringOptions', $classMetadata);
 
-        $this->assertSame(true, $classMetadata->requireIndexes);
-        $this->assertSame(false, $classMetadata->slaveOkay);
+        $this->assertTrue($classMetadata->requireIndexes);
+        $this->assertFalse($classMetadata->slaveOkay);
 
         $profileMapping = $classMetadata->fieldMappings['profile'];
         $this->assertSame(ClassMetadataInfo::REFERENCE_STORE_AS_ID, $profileMapping['storeAs']);
-        $this->assertSame(true, $profileMapping['orphanRemoval']);
+        $this->assertTrue($profileMapping['orphanRemoval']);
 
         $profileMapping = $classMetadata->fieldMappings['groups'];
         $this->assertSame(ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB, $profileMapping['storeAs']);
-        $this->assertSame(false, $profileMapping['orphanRemoval']);
+        $this->assertFalse($profileMapping['orphanRemoval']);
         $this->assertSame(0, $profileMapping['limit']);
         $this->assertSame(2, $profileMapping['skip']);
     }
@@ -92,4 +92,3 @@ class UserNonStringOptions
     protected $profile;
     protected $groups;
 }
-

tests/Doctrine/ODM/MongoDB/Tests/Query/FilterCollectionTest.php

@@ -63,7 +63,7 @@ public function testGetFilterCriteria()
         $class = $this->dm->getClassMetadata('Documents\User');
         $filterCollection = $this->dm->getFilterCollection();
 
-        $this->assertSame(array(), $filterCollection->getFilterCriteria($class));
+        $this->assertEmpty($filterCollection->getFilterCriteria($class));
 
         $filterCollection->enable('testFilter');
         $testFilter = $filterCollection->getFilter('testFilter');