Merge pull request #766 from gabriel-caruso/refactoring-tests

Refactoring tests
doctrine · Nov 30, 2017 · 003e81e · 003e81e
2 parents b8f750a + ee67c68
commit 003e81e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/DocumentRepositoryTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/DocumentRepositoryTest.php
@@ -210,6 +210,6 @@ public function testFindOneBy()
         $this->assertEquals($user1->username, $users1->username);
 
         $users2 = $this->dm->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->findOneBy(array('username' =>'obama'));
-        $this->assertEquals(null, $users2);
+        $this->assertNull($users2);
     }
 }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/PropertyTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/PropertyTest.php
@@ -103,7 +103,7 @@ public function testPropertyname()
         $this->assertNotNull($doc->date);
         $this->assertEquals($date->getTimestamp(), $doc->date->getTimestamp());
         $this->assertNotNull($doc->boolean);
-        $this->assertEquals(true, $doc->boolean);
+        $this->assertTrue($doc->boolean);
         $this->assertNotNull($doc->name);
         $this->assertEquals('aname', $doc->name);
         $this->assertNotNull($doc->path);

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/Translation/ChildTranslationStrategyTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/Translation/ChildTranslationStrategyTest.php
@@ -216,12 +216,12 @@ public function testLoadTranslationWithNullable()
         $strategy = new ChildTranslationStrategy($this->dm);
         $this->assertTrue($strategy->loadTranslation($doc, $node, $this->metadata, 'fr'), 'Should succeed to load FR translation');
 
-        $this->assertEquals(null, $doc->nullable);
+        $this->assertNull($doc->nullable);
 
         $strategy = new ChildTranslationStrategy($this->dm);
         $this->assertTrue($strategy->loadTranslation($doc, $node, $this->metadata, 'de'), 'Should succeed to load DE translation');
 
-        $this->assertEquals(null, $doc->nullable);
+        $this->assertNull($doc->nullable);
     }
 
     public function testLoadTranslationMissing()

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/Versioning/AnnotationsTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/Versioning/AnnotationsTest.php
@@ -38,7 +38,7 @@ public function testLoadAnnotations()
         // Check the annotation is not set if it is not present
         $metadata = $factory->getMetadataFor('Doctrine\Tests\Models\Versioning\NonVersionableArticle');
         $this->assertTrue(isset($metadata->versionable));
-        $this->assertEquals(false, $metadata->versionable);
+        $this->assertFalse($metadata->versionable);
     }
 
     /**

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Mapping/ClassMetadataTest.php
@@ -16,7 +16,7 @@ public function testGetTypeOfField()
     {
         $cmi = new ClassMetadata('Doctrine\Tests\ODM\PHPCR\Mapping\Person');
         $cmi->initializeReflection(new RuntimeReflectionService());
-        $this->assertEquals(null, $cmi->getTypeOfField('some_field'));
+        $this->assertNull($cmi->getTypeOfField('some_field'));
         $cmi->mappings['some_field'] = array('type' => 'some_type');
         $this->assertEquals('some_type', $cmi->getTypeOfField('some_field'));
     }