8000 minor #58455 [Console] Use `assertSame` for input tests (theofidry) · symfony/symfony@590f629 · GitHub
[go: up one dir, main page]
Skip to content

Commit 590f629

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
minor #58455 [Console] Use assertSame for input tests (theofidry)
This PR was merged into the 7.2 branch. Discussion ---------- [Console] Use `assertSame` for input tests | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | no (test refactor) | New feature? | no | Deprecations? | no | Issues | None | License | MIT This is a test refactor hence I am targeting 7.2 to avoid propagating noise. I originally intended to do it as part of #57598 as per `@OskarStark` comment but it turns out there is a few side effects so I preferred a dedicated PR to avoid confusion. Commits ------- cb619ee [Console] Use assertSame for input tests
2 parents fddd33e + cb619ee commit 590f629

File tree

7 files changed

+104
-104
lines changed

7 files changed

+104
-104
lines changed

‎src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ public function testConstructor()
2626
$r = new \ReflectionObject($input);
2727
$p = $r->getProperty('tokens');
2828

29-
$this->assertEquals(['foo'], $p->getValue($input), '__construct() automatically get its input from the argv server variable');
29+
$this->assertSame(['foo'], $p->getValue($input), '__construct() automatically get its input from the argv server variable');
3030
}
3131

3232
public function testParseArguments()
3333
{
3434
$input = new ArgvInput(['cli.php', 'foo']);
3535
$input->bind(new InputDefinition([new InputArgument('name')]));
36-
$this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
36+
$this->assertSame(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
3737

3838
$input->bind(new InputDefinition([new InputArgument('name')]));
39-
$this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() is stateless');
39+
$this->assertSame(['name' => 'foo'], $input->getArguments(), '->parse() is stateless');
4040
}
4141

4242
/**
@@ -57,7 +57,7 @@ public function testParseOptionsNegatable($input, $options, $expectedOptions, $m
5757
{
5858
$input = new ArgvInput($input);
5959
$input->bind(new InputDefinition($options));
60-
$this->assertEquals($expectedOptions, $input->getOptions(), $message);
60+
$this->assertSame($expectedOptions, $input->getOptions(), $message);
6161
}
6262

6363
public static function provideOptions()
@@ -363,19 +363,19 @@ public function testParseArrayArgument()
363363
$input = new ArgvInput(['cli.php', 'foo', 'bar', 'baz', 'bat']);
364364
$input->bind(new InputDefinition([new InputArgument('name', InputArgument::IS_ARRAY)]));
365365

366-
$this->assertEquals(['name' => ['foo', 'bar', 'baz', 'bat']], $input->getArguments(), '->parse() parses array arguments');
366+
$this->assertSame(['name' => ['foo', 'bar', 'baz', 'bat']], $input->getArguments(), '->parse() parses array arguments');
367367
}
368368

369369
public function testParseArrayOption()
370370
{
371371
$input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=baz']);
372372
$input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
373373

374-
$this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option=value" syntax)');
374+
$this->assertSame(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option=value" syntax)');
375375

376376
$input = new ArgvInput(['cli.php', '--name', 'foo', '--name', 'bar', '--name', 'baz']);
377377
$input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
378-
$this->assertEquals(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option value" syntax)');
378+
$this->assertSame(['name' => ['foo', 'bar', 'baz']], $input->getOptions(), '->parse() parses array options ("--option value" syntax)');
379379

380380
$input = new ArgvInput(['cli.php', '--name=foo', '--name=bar', '--name=']);
381381
$input->bind(new InputDefinition([new InputOption('name', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY)]));
@@ -393,20 +393,20 @@ public function testParseNegativeNumberAfterDoubleDash()
393393
{
394394
$input = new ArgvInput(['cli.php', '--', '-1']);
395395
$input->bind(new InputDefinition([new InputArgument('number')]));
396-
$this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
396+
$this->assertSame(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
397397

398398
$input = new ArgvInput(['cli.php', '-f', 'bar', '--', '-1']);
399399
$input->bind(new InputDefinition([new InputArgument('number'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
400-
$this->assertEquals(['foo' => 'bar'], $input->getOptions(), '->parse() parses arguments with leading dashes as options before having encountered a double-dash sequence');
401-
$this->assertEquals(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
400+
$this->assertSame(['foo' => 'bar'], $input->getOptions(), '->parse() parses arguments with leading dashes as options before having encountered a double-dash sequence');
401+
$this->assertSame(['number' => '-1'], $input->getArguments(), '->parse() parses arguments with leading dashes as arguments after having encountered a double-dash sequence');
402402
}
403403

404404
public function testParseEmptyStringArgument()
405405
{
406406
$input = new ArgvInput(['cli.php', '-f', 'bar', '']);
407407
$input->bind(new InputDefinition([new InputArgument('empty'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL)]));
408408

409-
$this->assertEquals(['empty' => ''], $input->getArguments(), '->parse() parses empty string arguments');
409+
$this->assertSame(['empty' => ''], $input->getArguments(), '->parse() parses empty string arguments');
410410
}
411411

412412
public function testGetFirstArgument()
@@ -415,7 +415,7 @@ public function testGetFirstArgument()
415415
$this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null when there is no arguments');
416416

417417
$input = new ArgvInput(['cli.php', '-fbbar', 'foo']);
418-
$this->assertEquals('foo', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input');
418+
$this->assertSame('foo', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input');
419419

420420
$input = new ArgvInput(['cli.php', '--foo', 'fooval', 'bar']);
421421
$input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('arg')]));
@@ -495,18 +495,18 @@ public function testNoWarningOnInvalidParameterOption()
495495
// No warning thrown
496496
$this->assertFalse($input->hasParameterOption(['-m', '']));
497497

498-
$this->assertEquals('dev', $input->getParameterOption(['-e', '']));
498+
$this->assertSame('dev', $input->getParameterOption(['-e', '']));
499499
// No warning thrown
500500
$this->assertFalse($input->getParameterOption(['-m', '']));
501501
}
502502

503503
public function testToString()
504504
{
505505
$input = new ArgvInput(['cli.php', '-f', 'foo']);
506-
$this->assertEquals('-f foo', (string) $input);
506+
$this->assertSame('-f foo', (string) $input);
507507

508508
$input = new ArgvInput(['cli.php', '-f', '--bar=foo', 'a b c d', "A\nB'C"]);
509-
$this->assertEquals('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
509+
$this->assertSame('-f --bar=foo '.escapeshellarg('a b c d').' '.escapeshellarg("A\nB'C"), (string) $input);
510510
}
511511

512512
/**
@@ -515,7 +515,7 @@ public function testToString()
515515
public function testGetParameterOptionEqualSign($argv, $key, $default, $onlyParams, $expected)
516516
{
517517
$input = new ArgvInput($argv);
518-
$this->assertEquals($expected, $input->getParameterOption($key, $default, $onlyParams), '->getParameterOption() returns the expected value');
518+
$this->assertSame($expected, $input->getParameterOption($key, $default, $onlyParams), '->getParameterOption() returns the expected value');
519519
}
520520

521521
public static function provideGetParameterOptionValues()
@@ -539,33 +539,33 @@ public function testParseSingleDashAsArgument()
539539
{
540540
$input = new ArgvInput(['cli.php', '-']);
541541
$input->bind(new InputDefinition([new InputArgument('file')]));
542-
$this->assertEquals(['file' => '-'], $input->getArguments(), '->parse() parses single dash as an argument');
542+
$this->assertSame(['file' => '-'], $input->getArguments(), '->parse() parses single dash as an argument');
543543
}
544544

545545
public function testParseOptionWithValueOptionalGivenEmptyAndRequiredArgument()
546546
{
547547
$input = new ArgvInput(['cli.php', '--foo=', 'bar']);
548548
$input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
549-
$this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
550-
$this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
549+
$this->assertSame(['foo' => ''], $input->getOptions(), '->parse() parses optional options with empty value as null');
550+
$this->assertSame(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
551551

552552
$input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
553553
$input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::REQUIRED)]));
554-
$this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
555-
$this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
554+
$this->assertSame(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
555+
$this->assertSame(['name' => 'bar'], $input->getArguments(), '->parse() parses required arguments');
556556
}
557557

558558
public function testParseOptionWithValueOptionalGivenEmptyAndOptionalArgument()
559559
{
560560
$input = new ArgvInput(['cli.php', '--foo=', 'bar']);
561561
$input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
562-
$this->assertEquals(['foo' => null], $input->getOptions(), '->parse() parses optional options with empty value as null');
563-
$this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
562+
$this->assertSame(['foo' => ''], $input->getOptions(), '->parse() parses optional options with empty value as null');
563+
$this->assertSame(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
564564

565565
$input = new ArgvInput(['cli.php', '--foo=0', 'bar']);
566566
$input->bind(new InputDefinition([new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputArgument('name', InputArgument::OPTIONAL)]));
567-
$this->assertEquals(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
568-
$this->assertEquals(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
567+
$this->assertSame(['foo' => '0'], $input->getOptions(), '->parse() parses optional options with empty value as null');
568+
$this->assertSame(['name' => 'bar'], $input->getArguments(), '->parse() parses optional arguments');
569569
}
570570

571571
public function testGetRawTokensFalse()

‎src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function testGetFirstArgument()
2424
$input = new ArrayInput([]);
2525
$this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null if no argument were passed');
2626
$input = new ArrayInput(['name' => 'Fabien']);
27-
$this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
27+
$this->assertSame('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
2828
$input = new ArrayInput(['--foo' => 'bar', 'name' => 'Fabien']);
29-
$this->assertEquals('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
29+
$this->assertSame('Fabien', $input->getFirstArgument(), '->getFirstArgument() returns the first passed argument');
3030
}
3131

3232
public function testHasParameterOption()
@@ -46,22 +46,22 @@ public function testHasParameterOption()
4646
public function testGetParameterOption()
4747
{
4848
$input = new ArrayInput(['name' => 'Fabien', '--foo' => 'bar']);
49-
$this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
50-
$this->assertEquals('default', $input->getParameterOption('--bar', 'default'), '->getParameterOption() returns the default value if an option is not present in the passed parameters');
49+
$this->assertSame('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
50+
$this->assertSame('default', $input->getParameterOption('--bar', 'default'), '->getParameterOption() returns the default value if an option is not present in the passed parameters');
5151

5252
$input = new ArrayInput(['Fabien', '--foo' => 'bar']);
53-
$this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
53+
$this->assertSame('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
5454

5555
$input = new ArrayInput(['--foo', '--', '--bar' => 'woop']);
56-
$this->assertEquals('woop', $input->getParameterOption('--bar'), '->getParameterOption() returns the correct value if an option is present in the passed parameters');
57-
$this->assertEquals('default', $input->getParameterOption('--bar', 'default', true), '->getParameterOption() returns the default value if an option is present in the passed parameters after an end of options signal');
56+
$this->assertSame('woop', $input->getParameterOption('--bar'), '->getParameterOption() returns the correct value if an option is present in the passed parameters');
57+
$this->assertSame('default', $input->getParameterOption('--bar', 'default', true), '->getParameterOption() returns the default value if an option is present in the passed parameters after an end of options signal');
5858
}
5959

6060
public function testParseArguments()
6161
{
6262
$input = new ArrayInput(['name' => 'foo'], new InputDefinition([new InputArgument('name')]));
6363

64-
$this->assertEquals(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
64+
$this->assertSame(['name' => 'foo'], $input->getArguments(), '->parse() parses required arguments');
6565
}
6666

6767
/**
@@ -71,7 +71,7 @@ public function testParseOptions($input, $options, $expectedOptions, $message)
7171
{
7272
$input = new ArrayInput($input, new InputDefinition($options));
7373

74-
$this->assertEquals($expectedOptions, $input->getOptions(), $message);
74+
$this->assertSame($expectedOptions, $input->getOptions(), $message);
7575
}
7676

7777
public static function provideOptions(): array
@@ -162,7 +162,7 @@ public static function provideInvalidInput(): array
162162
public function testToString()
163163
{
164164
$input = new ArrayInput(['-f' => null, '-b' => 'bar', '--foo' => 'b a z', '--lala' => null, 'test' => 'Foo', 'test2' => "A\nB'C"]);
165-
$this->assertEquals('-f -b bar --foo='.escapeshellarg('b a z').' --lala Foo '.escapeshellarg("A\nB'C"), (string) $input);
165+
$this->assertSame('-f -b bar --foo='.escapeshellarg('b a z').' --lala Foo '.escapeshellarg("A\nB'C"), (string) $input);
166166

167167
$input = new ArrayInput(['-b' => ['bval_1', 'bval_2'], '--f' => ['fval_1', 'fval_2']]);
168168
$this->assertSame('-b bval_1 -b bval_2 --f=fval_1 --f=fval_2', (string) $input);

‎src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class InputArgumentTest extends TestCase
2323
public function testConstructor()
2424
{
2525
$argument = new InputArgument('foo');
26-
$this->assertEquals('foo', $argument->getName(), '__construct() takes a name as its first argument');
26+
$this->assertSame('foo', $argument->getName(), '__construct() takes a name as its first argument');
2727
}
2828

2929
public function testModes()
@@ -62,13 +62,13 @@ public function testIsArray()
6262
public function testGetDescription()
6363
{
6464
$argument = new InputArgument('foo', null, 'Some description');
65-
$this->assertEquals('Some description', $argument->getDescription(), '->getDescription() return the message description');
65+
$this->assertSame('Some description', $argument->getDescription(), '->getDescription() return the message description');
6666
}
6767

6868
public function testGetDefault()
6969
{
7070
$argument = new InputArgument('foo', InputArgument::OPTIONAL, '', 'default');
71-
$this->assertEquals('default', $argument->getDefault(), '->getDefault() return the default value');
71+
$this->assertSame('default', $argument->getDefault(), '->getDefault() return the default value');
7272
}
7373

7474
public function testSetDefault()
@@ -77,11 +77,11 @@ public function testSetDefault()
7777
$argument->setDefault(null);
7878
$this->assertNull($argument->getDefault(), '->setDefault() can reset the default value by passing null');
 8841
7979
$argument->setDefault('another');
80-
$this->assertEquals('another', $argument->getDefault(), '->setDefault() changes the default value');
80+
$this->assertSame('another', $argument->getDefault(), '->setDefault() changes the default value');
8181

8282
$argument = new InputArgument('foo', InputArgument::OPTIONAL | InputArgument::IS_ARRAY);
8383
$argument->setDefault([1, 2]);
84-
$this->assertEquals([1, 2], $argument->getDefault(), '->setDefault() changes the default value');
84+
$this->assertSame([1, 2], $argument->getDefault(), '->setDefault() changes the default value');
8585
}
8686

8787
public function testSetDefaultWithRequiredArgument()

0 commit comments

Comments
 (0)
0