Merge pull request #453 from localheinz/fix/assert

Fix: Use more appropriate assertions
doctrine · Mar 26, 2016 · 5384c8a · 5384c8a
2 parents 0bf83ca + 62f9eb8
commit 5384c8a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/tests/Doctrine/DBAL/Migrations/Tests/ConfigurationTest.php b/tests/Doctrine/DBAL/Migrations/Tests/ConfigurationTest.php
@@ -69,8 +69,8 @@ public function testMigrationsTable()
     public function testEmptyProjectDefaults()
     {
         $config = $this->getSqliteConfiguration();
-        $this->assertSame(null, $config->getPrevVersion(), "no prev version");
-        $this->assertSame(null, $config->getNextVersion(), "no next version");
+        $this->assertNull($config->getPrevVersion(), "no prev version");
+        $this->assertNull($config->getNextVersion(), "no next version");
         $this->assertSame('0', $config->getCurrentVersion(), "current version 0");
         $this->assertSame('0', $config->getLatestVersion(), "latest version 0");
         $this->assertEquals(0, $config->getNumberOfAvailableMigrations(), "number of available migrations 0");
@@ -94,7 +94,7 @@ public function testRegisterMigration()
         $config = $this->getSqliteConfiguration();
         $config->registerMigration(1234, Version1Test::class);
 
-        $this->assertEquals(1, count($config->getMigrations()), "One Migration registered.");
+        $this->assertCount(1, $config->getMigrations(), "One Migration registered.");
         $this->assertTrue($config->hasVersion(1234));
 
         $version = $config->getVersion(1234);
@@ -111,7 +111,7 @@ public function testRegisterMigrations()
             1235 => Version2Test::class,
         ]);
 
-        $this->assertEquals(2, count($config->getMigrations()), "Two Migration registered.");
+        $this->assertCount(2, $config->getMigrations(), "Two Migration registered.");
 
         $version = $config->getVersion(1234);
         $this->assertInstanceOf(Version::class, $version);
@@ -142,7 +142,7 @@ public function testPreviousCurrentNextLatestVersion()
             1236 => Version3Test::class,
         ]);
 
-        $this->assertSame(null, $config->getPrevVersion(), "no prev version");
+        $this->assertNull($config->getPrevVersion(), "no prev version");
         $this->assertSame('0', $config->getCurrentVersion(), "current version 0");
         $this->assertSame('1234', $config->getNextVersion(), "next version 1234");
         $this->assertSame('1236', $config->getLatestVersion(), "latest version 1236");
@@ -167,13 +167,13 @@ public function testPreviousCurrentNextLatestVersion()
         $this->assertSame('1236', $config->resolveVersionAlias('next'), "next version is 1236");
         $this->assertSame('1236', $config->resolveVersionAlias('latest'), "latest version 1236");
         $this->assertSame('1236', $config->resolveVersionAlias('1236'), "identical version");
-        $this->assertSame(null, $config->resolveVersionAlias('123678'), "unknown version");
+        $this->assertNull($config->resolveVersionAlias('123678'), "unknown version");
 
         $config->getVersion(1236)->markMigrated();
 
         $this->assertSame('1235', $config->getPrevVersion(), "prev version 1235");
         $this->assertSame('1236', $config->getCurrentVersion(), "current version 1236");
-        $this->assertSame(null, $config->getNextVersion(), "no next version");
+        $this->assertNull($config->getNextVersion(), "no next version");
         $this->assertSame('1236', $config->getLatestVersion(), "latest version 1236");
     }
 

diff --git a/tests/Doctrine/DBAL/Migrations/Tests/Functional/FunctionalTest.php b/tests/Doctrine/DBAL/Migrations/Tests/Functional/FunctionalTest.php
@@ -92,7 +92,7 @@ public function testMigrateSeveralSteps()
         $this->assertEquals(0, $this->config->getCurrentVersion());
         $migrations = $this->config->getMigrationsToExecute('up', 3);
 
-        $this->assertEquals(3, count($migrations));
+        $this->assertCount(3, $migrations);
         $this->assertInstanceOf(MigrationMigrateUp::class, $migrations[1]->getMigration());
         $this->assertInstanceOf(MigrationSkipMigration::class, $migrations[2]->getMigration());
         $this->assertInstanceOf(MigrationMigrateFurther::class, $migrations[3]->getMigration());
@@ -266,7 +266,7 @@ public function testInterweavedMigrationsAreExecuted()
         $config->setMigrationsTableName('test_migrations_table');
         $config->setMigrationsColumnName('current_version');
 
-        $this->assertEquals(1, count($config->getMigrationsToExecute('up', 3)));
+        $this->assertCount(1, $config->getMigrationsToExecute('up', 3));
         $migrations = $config->getMigrationsToExecute('up', 3);
         $this->assertTrue(isset($migrations[2]));
         $this->assertEquals(2, $migrations[2]->getVersion());

diff --git a/tests/Doctrine/DBAL/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php b/tests/Doctrine/DBAL/Migrations/Tests/Tools/Console/Command/AbstractCommandTest.php
@@ -172,7 +172,7 @@ public function testMigrationConfigurationReturnsConnectionFromConfigurationIfNo
         $this->assertInstanceOf(Configuration::class, $actualConfiguration);
         $this->assertEquals($this->getSqliteConnection(), $actualConfiguration->getConnection());
         $this->assertEquals('doctrine_migration_versions', $actualConfiguration->getMigrationsTableName());
-        $this->assertEquals(null, $actualConfiguration->getMigrationsNamespace());
+        $this->assertNull($actualConfiguration->getMigrationsNamespace());
     }
 
     /**
@@ -191,7 +191,7 @@ public function testMigrationConfigurationReturnsErrorWhenNoConnectionIsProvided
         $this->assertInstanceOf(Configuration::class, $actualConfiguration);
         $this->assertEquals($this->getSqliteConnection(), $actualConfiguration->getConnection());
         $this->assertEquals('doctrine_migration_versions', $actualConfiguration->getMigrationsTableName());
-        $this->assertEquals(null, $actualConfiguration->getMigrationsNamespace());
+        $this->assertNull($actualConfiguration->getMigrationsNamespace());
     }
 
     public function testMigrationsConfigurationFromCommandLineOverridesInjectedConfiguration()
@@ -324,14 +324,14 @@ public function testAskConfirmation()
         {
             @$helper = new DialogHelper();
 
-            @$this->assertEquals(true, $this->invokeAbstractCommandConfirmation($input, $helper));
-            @$this->assertEquals(false, $this->invokeAbstractCommandConfirmation($input, $helper, "n"));
+            @$this->assertTrue($this->invokeAbstractCommandConfirmation($input, $helper));
+            @$this->assertFalse($this->invokeAbstractCommandConfirmation($input, $helper, "n"));
         }
 
         if (class_exists("Symfony\\Component\\Console\\Helper\\QuestionHelper")) {
             $helper = new QuestionHelper();
-            $this->assertEquals(true, $this->invokeAbstractCommandConfirmation($input, $helper));
-            $this->assertEquals(false, $this->invokeAbstractCommandConfirmation($input, $helper, "n"));
+            $this->assertTrue($this->invokeAbstractCommandConfirmation($input, $helper));
+            $this->assertFalse($this->invokeAbstractCommandConfirmation($input, $helper, "n"));
         }
     }
 

diff --git a/tests/Doctrine/DBAL/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php b/tests/Doctrine/DBAL/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php
@@ -25,17 +25,17 @@ public function testGetVersionNameFromAlias()
 
         $output = $this->getOutputStream();
 
-        $this->assertEquals(false, $method->invokeArgs(new MigrateCommand(), ['prev', $output, $configuration]));
+        $this->assertFalse($method->invokeArgs(new MigrateCommand(), ['prev', $output, $configuration]));
         $this->assertContains('Already at first version.', $this->getOutputStreamContent($output));
 
         $output = $this->getOutputStream();
 
-        $this->assertEquals(false, $method->invokeArgs(new MigrateCommand(), ['next', $output, $configuration]));
+        $this->assertFalse($method->invokeArgs(new MigrateCommand(), ['next', $output, $configuration]));
         $this->assertContains('Already at latest version.', $this->getOutputStreamContent($output));
 
         $output = $this->getOutputStream();
 
-        $this->assertEquals(false, $method->invokeArgs(new MigrateCommand(), ['giberich', $output, $configuration]));
+        $this->assertFalse($method->invokeArgs(new MigrateCommand(), ['giberich', $output, $configuration]));
         $this->assertContains('Unknown version: giberich', $this->getOutputStreamContent($output));
 
         $output = $this->getOutputStream();
@@ -91,11 +91,11 @@ public function testCanExecute()
             ->will($this->returnValue($helperSet));
 
         //should return true if user confirm
-        $this->assertEquals(true, $method->invokeArgs($command, ['test', $input, $output]));
+        $this->assertTrue($method->invokeArgs($command, ['test', $input, $output]));
 
         //shoudl return false if user cancel
         $helper->setInputStream($this->getInputStream("n\n"));
-        $this->assertEquals(false, $method->invokeArgs($command, ['test', $input, $output]));
+        $this->assertFalse($method->invokeArgs($command, ['test', $input, $output]));
 
         //should return true if non interactive
         $input = $this->getMockBuilder(ArrayInput::class)
@@ -105,6 +105,6 @@ public function testCanExecute()
         $input->expects($this->any())
             ->method('isInteractive')
             ->will($this->returnValue(false));
-        $this->assertEquals(true, $method->invokeArgs($command, ['test', $input, $output]));
+        $this->assertTrue($method->invokeArgs($command, ['test', $input, $output]));
     }
 }