From b057b64c1c35ecb645074cf62f60edeb1da4a873 Mon Sep 17 00:00:00 2001 From: Bill Schaller Date: Fri, 20 Mar 2015 13:45:49 -0400 Subject: [PATCH] Fix tests for SLC console commands failing due to comparison with decorated console output. --- .../Command/ClearCacheCollectionRegionCommandTest.php | 8 ++++---- .../Console/Command/ClearCacheEntityRegionCommandTest.php | 8 ++++---- .../Console/Command/ClearCacheQueryRegionCommandTest.php | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php index de1e1772c..298ca23a9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php @@ -46,7 +46,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), '--all' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing all second-level cache collection regions' . PHP_EOL, $tester->getDisplay()); } @@ -59,7 +59,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase 'command' => $command->getName(), 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache for collection "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay()); } @@ -73,7 +73,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', 'owner-id' => 1, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache entry for collection "Doctrine\Tests\Models\Cache\State#cities" owner entity identified by "1"' . PHP_EOL, $tester->getDisplay()); } @@ -87,7 +87,7 @@ class ClearCacheCollectionRegionCommandTest extends OrmFunctionalTestCase 'owner-class' => 'Doctrine\Tests\Models\Cache\State', 'association' => 'cities', '--flush' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Flushing cache provider configured for "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay()); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php index 7e9e7c23a..d16fa2e7f 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php @@ -46,7 +46,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), '--all' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing all second-level cache entity regions' . PHP_EOL, $tester->getDisplay()); } @@ -58,7 +58,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache for entity "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay()); } @@ -71,7 +71,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', 'entity-id' => 1, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache entry for entity "Doctrine\Tests\Models\Cache\Country" identified by "1"' . PHP_EOL, $tester->getDisplay()); } @@ -84,7 +84,7 @@ class ClearCacheEntityRegionCommandTest extends OrmFunctionalTestCase 'command' => $command->getName(), 'entity-class' => 'Doctrine\Tests\Models\Cache\Country', '--flush' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Flushing cache provider configured for entity named "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay()); } diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php index 130bec8db..4468faf96 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheQueryRegionCommandTest.php @@ -46,7 +46,7 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), '--all' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing all second-level cache query regions' . PHP_EOL, $tester->getDisplay()); } @@ -58,7 +58,7 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), 'region-name' => null, - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache query region named "query_cache_region"' . PHP_EOL, $tester->getDisplay()); } @@ -70,7 +70,7 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase $tester->execute(array( 'command' => $command->getName(), 'region-name' => 'my_region', - )); + ), array('decorated' => false)); $this->assertEquals('Clearing second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay()); } @@ -83,7 +83,7 @@ class ClearCacheQueryRegionCommandTest extends OrmFunctionalTestCase 'command' => $command->getName(), 'region-name' => 'my_region', '--flush' => true, - )); + ), array('decorated' => false)); $this->assertEquals('Flushing cache provider configured for second-level cache query region named "my_region"' . PHP_EOL, $tester->getDisplay()); }