Skip to content

Commit

Permalink
fixed assertEquals() calls arguments order
Browse files Browse the repository at this point in the history 
The conversion has been done automatically with the following command:

    perl -p -i -e 's#this\->assertEquals\((.+?), (.+?)(, '\''(\-|\:|_)|\);)#this->assertEquals($2, $1$3#g' tests/Symfony/Tests/*/*.php tests/Symfony/Tests/*/*/*.php tests/Symfony/Tests/*/*/*.php

... and with some manual tweaking after that
  • Loading branch information
@fabpot
fabpot committed Mar 19, 2010
1 parent 39aa067 commit 2dc3619
Show file tree
Hide file tree
Showing 53 changed files with 571 additions and 569 deletions.
80 changes: 40 additions & 40 deletions tests/Symfony/Tests/Components/Console/ApplicationTest.php
View file

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions tests/Symfony/Tests/Components/Console/Command/CommandTest.php
View file
Expand Up @@ -46,23 +46,23 @@ public function testConstructor()
{
}
$command = new Command('foo:bar');
$this->assertEquals($command->getFullName(), 'foo:bar', '__construct() takes the command name as its first argument');
$this->assertEquals('foo:bar', $command->getFullName(), '__construct() takes the command name as its first argument');
}

public function testSetApplication()
{
$application = new Application();
$command = new \TestCommand();
$command->setApplication($application);
$this->assertEquals($command->getApplication(), $application, '->setApplication() sets the current application');
$this->assertEquals($application, $command->getApplication(), '->setApplication() sets the current application');
}

public function testSetGetDefinition()
{
$command = new \TestCommand();
$ret = $command->setDefinition($definition = new InputDefinition());
$this->assertEquals($ret, $command, '->setDefinition() implements a fluent interface');
$this->assertEquals($command->getDefinition(), $definition, '->setDefinition() sets the current InputDefinition instance');
$this->assertEquals($command, $ret, '->setDefinition() implements a fluent interface');
$this->assertEquals($definition, $command->getDefinition(), '->setDefinition() sets the current InputDefinition instance');
$command->setDefinition(array(new InputArgument('foo'), new InputOption('bar')));
$this->assertTrue($command->getDefinition()->hasArgument('foo'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
$this->assertTrue($command->getDefinition()->hasOption('bar'), '->setDefinition() also takes an array of InputArguments and InputOptions as an argument');
Expand All @@ -73,35 +73,35 @@ public function testAddArgument()
{
$command = new \TestCommand();
$ret = $command->addArgument('foo');
$this->assertEquals($ret, $command, '->addArgument() implements a fluent interface');
$this->assertEquals($command, $ret, '->addArgument() implements a fluent interface');
$this->assertTrue($command->getDefinition()->hasArgument('foo'), '->addArgument() adds an argument to the command');
}

public function testAddOption()
{
$command = new \TestCommand();
$ret = $command->addOption('foo');
$this->assertEquals($ret, $command, '->addOption() implements a fluent interface');
$this->assertEquals($command, $ret, '->addOption() implements a fluent interface');
$this->assertTrue($command->getDefinition()->hasOption('foo'), '->addOption() adds an option to the command');
}

public function testgetNamespaceGetNameGetFullNameSetName()
{
$command = new \TestCommand();
$this->assertEquals($command->getNamespace(), 'namespace', '->getNamespace() returns the command namespace');
$this->assertEquals($command->getName(), 'name', '->getName() returns the command name');
$this->assertEquals($command->getFullName(), 'namespace:name', '->getNamespace() returns the full command name');
$this->assertEquals('namespace', $command->getNamespace(), '->getNamespace() returns the command namespace');
$this->assertEquals('name', $command->getName(), '->getName() returns the command name');
$this->assertEquals('namespace:name', $command->getFullName(), '->getNamespace() returns the full command name');
$command->setName('foo');
$this->assertEquals($command->getName(), 'foo', '->setName() sets the command name');
$this->assertEquals('foo', $command->getName(), '->setName() sets the command name');

$command->setName(':bar');
$this->assertEquals($command->getName(), 'bar', '->setName() sets the command name');
$this->assertEquals($command->getNamespace(), '', '->setName() can set the command namespace');
$this->assertEquals('bar', $command->getName(), '->setName() sets the command name');
$this->assertEquals('', $command->getNamespace(), '->setName() can set the command namespace');

$ret = $command->setName('foobar:bar');
$this->assertEquals($ret, $command, '->setName() implements a fluent interface');
$this->assertEquals($command->getName(), 'bar', '->setName() sets the command name');
$this->assertEquals($command->getNamespace(), 'foobar', '->setName() can set the command namespace');
$this->assertEquals($command, $ret, '->setName() implements a fluent interface');
$this->assertEquals('bar', $command->getName(), '->setName() sets the command name');
$this->assertEquals('foobar', $command->getNamespace(), '->setName() can set the command namespace');

try
{
Expand All @@ -125,36 +125,36 @@ public function testgetNamespaceGetNameGetFullNameSetName()
public function testGetSetDescription()
{
$command = new \TestCommand();
$this->assertEquals($command->getDescription(), 'description', '->getDescription() returns the description');
$this->assertEquals('description', $command->getDescription(), '->getDescription() returns the description');
$ret = $command->setDescription('description1');
$this->assertEquals($ret, $command, '->setDescription() implements a fluent interface');
$this->assertEquals($command->getDescription(), 'description1', '->setDescription() sets the description');
$this->assertEquals($command, $ret, '->setDescription() implements a fluent interface');
$this->assertEquals('description1', $command->getDescription(), '->setDescription() sets the description');
}

public function testGetSetHelp()
{
$command = new \TestCommand();
$this->assertEquals($command->getHelp(), 'help', '->getHelp() returns the help');
$this->assertEquals('help', $command->getHelp(), '->getHelp() returns the help');
$ret = $command->setHelp('help1');
$this->assertEquals($ret, $command, '->setHelp() implements a fluent interface');
$this->assertEquals($command->getHelp(), 'help1', '->setHelp() sets the help');
$this->assertEquals($command, $ret, '->setHelp() implements a fluent interface');
$this->assertEquals('help1', $command->getHelp(), '->setHelp() sets the help');
}

public function testGetSetAliases()
{
$command = new \TestCommand();
$this->assertEquals($command->getAliases(), array('name'), '->getAliases() returns the aliases');
$this->assertEquals(array('name'), $command->getAliases(), '->getAliases() returns the aliases');
$ret = $command->setAliases(array('name1'));
$this->assertEquals($ret, $command, '->setAliases() implements a fluent interface');
$this->assertEquals($command->getAliases(), array('name1'), '->setAliases() sets the aliases');
$this->assertEquals($command, $ret, '->setAliases() implements a fluent interface');
$this->assertEquals(array('name1'), $command->getAliases(), '->setAliases() sets the aliases');
}

public function testGetSynopsis()
{
$command = new \TestCommand();
$command->addOption('foo');
$command->addArgument('foo');
$this->assertEquals($command->getSynopsis(), 'namespace:name [--foo] [foo]', '->getSynopsis() returns the synopsis');
$this->assertEquals('namespace:name [--foo] [foo]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');
}

public function testMergeApplicationDefinition()
Expand All @@ -172,7 +172,7 @@ public function testMergeApplicationDefinition()
$this->assertTrue($command->getDefinition()->hasOption('bar'), '->mergeApplicationDefinition() merges the application options and the command options');

$command->mergeApplicationDefinition();
$this->assertEquals($command->getDefinition()->getArgumentCount(), 3, '->mergeApplicationDefinition() does not try to merge twice the application arguments and options');
$this->assertEquals(3, $command->getDefinition()->getArgumentCount(), '->mergeApplicationDefinition() does not try to merge twice the application arguments and options');

$command = new \TestCommand();
$command->mergeApplicationDefinition();
Expand All @@ -193,8 +193,8 @@ public function testRun()
{
}

$this->assertEquals($tester->execute(array(), array('interactive' => true)), "interact called\nexecute called\n", '->run() calls the interact() method if the input is interactive');
$this->assertEquals($tester->execute(array(), array('interactive' => false)), "execute called\n", '->run() does not call the interact() method if the input is not interactive');
$this->assertEquals("interact called\nexecute called\n", $tester->execute(array(), array('interactive' => true)), '->run() calls the interact() method if the input is interactive');
$this->assertEquals("execute called\n", $tester->execute(array(), array('interactive' => false)), '->run() does not call the interact() method if the input is not interactive');

$command = new Command('foo');
try
Expand All @@ -216,10 +216,10 @@ public function testSetCode()
{
$output->writeln('from the code...');
});
$this->assertEquals($ret, $command, '->setCode() implements a fluent interface');
$this->assertEquals($command, $ret, '->setCode() implements a fluent interface');
$tester = new CommandTester($command);
$tester->execute(array());
$this->assertEquals($tester->getDisplay(), "interact called\nfrom the code...\n");
$this->assertEquals("interact called\nfrom the code...\n", $tester->getDisplay());
}

public function testAsText()
Expand All @@ -228,7 +228,7 @@ public function testAsText()
$command->setApplication(new Application());
$tester = new CommandTester($command);
$tester->execute(array());
$this->assertEquals($command->asText(), file_get_contents(self::$fixturesPath.'/command_astext.txt'), '->asText() returns a text representation of the command');
$this->assertEquals(file_get_contents(self::$fixturesPath.'/command_astext.txt'), $command->asText(), '->asText() returns a text representation of the command');
}

public function testAsXml()
Expand All @@ -237,6 +237,6 @@ public function testAsXml()
$command->setApplication(new Application());
$tester = new CommandTester($command);
$tester->execute(array());
$this->assertEquals($command->asXml(), file_get_contents(self::$fixturesPath.'/command_asxml.txt'), '->asXml() returns an XML representation of the command');
$this->assertEquals(file_get_contents(self::$fixturesPath.'/command_asxml.txt'), $command->asXml(), '->asXml() returns an XML representation of the command');
}
}
8 changes: 4 additions & 4 deletions tests/Symfony/Tests/Components/Console/Helper/FormatterHelperTest.php
View file
Expand Up @@ -20,16 +20,16 @@ public function testFormatSection()
{
$formatter = new FormatterHelper();

$this->assertEquals($formatter->formatSection('cli', 'Some text to display'), '<info>[cli]</info> Some text to display', '::formatSection() formats a message in a section');
$this->assertEquals('<info>[cli]</info> Some text to display', $formatter->formatSection('cli', 'Some text to display'), '::formatSection() formats a message in a section');
}

public function testFormatBlock()
{
$formatter = new FormatterHelper();

$this->assertEquals($formatter->formatBlock('Some text to display', 'error'), '<error> Some text to display </error>', '::formatBlock() formats a message in a block');
$this->assertEquals($formatter->formatBlock(array('Some text to display', 'foo bar'), 'error'), "<error> Some text to display </error>\n<error> foo bar </error>", '::formatBlock() formats a message in a block');
$this->assertEquals('<error> Some text to display </error>', $formatter->formatBlock('Some text to display', 'error'), '::formatBlock() formats a message in a block');
$this->assertEquals("<error> Some text to display </error>\n<error> foo bar </error>", $formatter->formatBlock(array('Some text to display', 'foo bar'), 'error'), '::formatBlock() formats a message in a block');

$this->assertEquals($formatter->formatBlock('Some text to display', 'error', true), "<error> </error>\n<error> Some text to display </error>\n<error> </error>", '::formatBlock() formats a message in a block');
$this->assertEquals("<error> </error>\n<error> Some text to display </error>\n<error> </error>", $formatter->formatBlock('Some text to display', 'error', true), '::formatBlock() formats a message in a block');
}
}

0 comments on commit 2dc3619

Please sign in to comment.