minor #37592 [SCA] Minor fixes on tests (fancyweb)
This PR was merged into the 3.4 branch.
Discussion
----------
[SCA] Minor fixes on tests
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
I mainly fixed misordered arguments in `assertEquals()`.
Commits
-------
b352ff08ad
[SCA] Minor fixes on tests
This commit is contained in:
commit
e77ff454c8
@ -50,7 +50,7 @@ class UserPasswordEncoderCommandTest extends AbstractWebTestCase
|
|||||||
], ['interactive' => false]);
|
], ['interactive' => false]);
|
||||||
|
|
||||||
$this->assertStringContainsString('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());
|
$this->assertStringContainsString('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());
|
||||||
$this->assertEquals($statusCode, 1);
|
$this->assertEquals(1, $statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testEncodePasswordBcrypt()
|
public function testEncodePasswordBcrypt()
|
||||||
|
@ -147,9 +147,9 @@ class FlattenExceptionTest extends TestCase
|
|||||||
|
|
||||||
$flattened = FlattenException::create($exception)->getPrevious();
|
$flattened = FlattenException::create($exception)->getPrevious();
|
||||||
|
|
||||||
$this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
|
$this->assertEquals('Parse error: Oh noes!', $flattened->getMessage(), 'The message is copied from the original exception.');
|
||||||
$this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
|
$this->assertEquals(42, $flattened->getCode(), 'The code is copied from the original exception.');
|
||||||
$this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
|
$this->assertEquals('Symfony\Component\Debug\Exception\FatalThrowableError', $flattened->getClass(), 'The class is set to the class of the original exception');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -259,7 +259,7 @@ class FlattenExceptionTest extends TestCase
|
|||||||
$this->assertSame(['float', INF], $array[$i++]);
|
$this->assertSame(['float', INF], $array[$i++]);
|
||||||
|
|
||||||
// assertEquals() does not like NAN values.
|
// assertEquals() does not like NAN values.
|
||||||
$this->assertEquals($array[$i][0], 'float');
|
$this->assertEquals('float', $array[$i][0]);
|
||||||
$this->assertNan($array[$i][1]);
|
$this->assertNan($array[$i][1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -846,12 +846,12 @@ class ContainerBuilderTest extends TestCase
|
|||||||
->addTag('bar', ['bar' => 'bar'])
|
->addTag('bar', ['bar' => 'bar'])
|
||||||
->addTag('foo', ['foofoo' => 'foofoo'])
|
->addTag('foo', ['foofoo' => 'foofoo'])
|
||||||
;
|
;
|
||||||
$this->assertEquals($builder->findTaggedServiceIds('foo'), [
|
$this->assertEquals([
|
||||||
'foo' => [
|
'foo' => [
|
||||||
['foo' => 'foo'],
|
['foo' => 'foo'],
|
||||||
['foofoo' => 'foofoo'],
|
['foofoo' => 'foofoo'],
|
||||||
],
|
],
|
||||||
], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
|
], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
|
||||||
$this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
|
$this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -224,10 +224,10 @@ class DefinitionTest extends TestCase
|
|||||||
$def->addTag('foo', ['foo' => 'bar']);
|
$def->addTag('foo', ['foo' => 'bar']);
|
||||||
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
|
$this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
|
||||||
$def->addTag('bar', ['bar' => 'bar']);
|
$def->addTag('bar', ['bar' => 'bar']);
|
||||||
$this->assertEquals($def->getTags(), [
|
$this->assertEquals([
|
||||||
'foo' => [[], ['foo' => 'bar']],
|
'foo' => [[], ['foo' => 'bar']],
|
||||||
'bar' => [['bar' => 'bar']],
|
'bar' => [['bar' => 'bar']],
|
||||||
], '->getTags() returns all tags');
|
], $def->getTags(), '->getTags() returns all tags');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetArgument()
|
public function testSetArgument()
|
||||||
|
@ -170,25 +170,28 @@ class FormTest extends TestCase
|
|||||||
');
|
');
|
||||||
|
|
||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
array_keys($form->all()),
|
['foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]'],
|
||||||
['foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]']
|
array_keys($form->all())
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertEquals($form->get('foo[2]')->getValue(), 'foo');
|
$this->assertEquals('foo', $form->get('foo[2]')->getValue());
|
||||||
$this->assertEquals($form->get('foo[3]')->getValue(), 'foo');
|
$this->assertEquals('foo', $form->get('foo[3]')->getValue());
|
||||||
$this->assertEquals($form->get('bar[foo][0]')->getValue(), 'foo');
|
$this->assertEquals('foo', $form->get('bar[foo][0]')->getValue());
|
||||||
$this->assertEquals($form->get('bar[foo][foobar]')->getValue(), 'foo');
|
$this->assertEquals('foo', $form->get('bar[foo][foobar]')->getValue());
|
||||||
|
|
||||||
$form['foo[2]'] = 'bar';
|
$form['foo[2]'] = 'bar';
|
||||||
$form['foo[3]'] = 'bar';
|
$form['foo[3]'] = 'bar';
|
||||||
|
|
||||||
$this->assertEquals($form->get('foo[2]')->getValue(), 'bar');
|
$this->assertEquals('bar', $form->get('foo[2]')->getValue());
|
||||||
$this->assertEquals($form->get('foo[3]')->getValue(), 'bar');
|
$this->assertEquals('bar', $form->get('foo[3]')->getValue());
|
||||||
|
|
||||||
$form['bar'] = ['foo' => ['0' => 'bar', 'foobar' => 'foobar']];
|
$form['bar'] = ['foo' => ['0' => 'bar', 'foobar' => 'foobar']];
|
||||||
|
|
||||||
$this->assertEquals($form->get('bar[foo][0]')->getValue(), 'bar');
|
$this->assertEquals('bar', $form->get('bar[foo][0]')->getValue());
|
||||||
$this->assertEquals($form->get('bar[foo][foobar]')->getValue(), 'foobar');
|
$this->assertEquals(
|
||||||
|
'foobar',
|
||||||
|
$form->get('bar[foo][foobar]')->getValue()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -967,7 +970,7 @@ class FormTest extends TestCase
|
|||||||
|
|
||||||
$nodes = $dom->getElementsByTagName('form');
|
$nodes = $dom->getElementsByTagName('form');
|
||||||
$form = new Form($nodes->item(0), 'http://example.com');
|
$form = new Form($nodes->item(0), 'http://example.com');
|
||||||
$this->assertEquals($form->getPhpValues(), ['example' => '']);
|
$this->assertEquals(['example' => ''], $form->getPhpValues());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetReturnTypes()
|
public function testGetReturnTypes()
|
||||||
|
@ -38,8 +38,8 @@ class ParserCacheAdapterTest extends TestCase
|
|||||||
|
|
||||||
$cacheItem = $parserCacheAdapter->getItem($key);
|
$cacheItem = $parserCacheAdapter->getItem($key);
|
||||||
|
|
||||||
$this->assertEquals($cacheItem->get(), $value);
|
$this->assertEquals($value, $cacheItem->get());
|
||||||
$this->assertEquals($cacheItem->isHit(), true);
|
$this->assertTrue($cacheItem->isHit());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSave()
|
public function testSave()
|
||||||
|
@ -592,20 +592,20 @@ class ResponseTest extends ResponseTestCase
|
|||||||
|
|
||||||
$options = ['etag' => '"whatever"'];
|
$options = ['etag' => '"whatever"'];
|
||||||
$response->setCache($options);
|
$response->setCache($options);
|
||||||
$this->assertEquals($response->getEtag(), '"whatever"');
|
$this->assertEquals('"whatever"', $response->getEtag());
|
||||||
|
|
||||||
$now = $this->createDateTimeNow();
|
$now = $this->createDateTimeNow();
|
||||||
$options = ['last_modified' => $now];
|
$options = ['last_modified' => $now];
|
||||||
$response->setCache($options);
|
$response->setCache($options);
|
||||||
$this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
|
$this->assertEquals($now->getTimestamp(), $response->getLastModified()->getTimestamp());
|
||||||
|
|
||||||
$options = ['max_age' => 100];
|
$options = ['max_age' => 100];
|
||||||
$response->setCache($options);
|
$response->setCache($options);
|
||||||
$this->assertEquals($response->getMaxAge(), 100);
|
$this->assertEquals(100, $response->getMaxAge());
|
||||||
|
|
||||||
$options = ['s_maxage' => 200];
|
$options = ['s_maxage' => 200];
|
||||||
$response->setCache($options);
|
$response->setCache($options);
|
||||||
$this->assertEquals($response->getMaxAge(), 200);
|
$this->assertEquals(200, $response->getMaxAge());
|
||||||
|
|
||||||
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
$this->assertTrue($response->headers->hasCacheControlDirective('public'));
|
||||||
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
$this->assertFalse($response->headers->hasCacheControlDirective('private'));
|
||||||
|
@ -102,7 +102,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
|||||||
->method('findOne')
|
->method('findOne')
|
||||||
->willReturnCallback(function ($criteria) use ($testTimeout) {
|
->willReturnCallback(function ($criteria) use ($testTimeout) {
|
||||||
$this->assertArrayHasKey($this->options['id_field'], $criteria);
|
$this->assertArrayHasKey($this->options['id_field'], $criteria);
|
||||||
$this->assertEquals($criteria[$this->options['id_field']], 'foo');
|
$this->assertEquals('foo', $criteria[$this->options['id_field']]);
|
||||||
|
|
||||||
$this->assertArrayHasKey($this->options['expiry_field'], $criteria);
|
$this->assertArrayHasKey($this->options['expiry_field'], $criteria);
|
||||||
$this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
|
$this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
|
||||||
|
@ -87,10 +87,10 @@ class PhpBridgeSessionStorageTest extends TestCase
|
|||||||
$_SESSION['drak'] = 'loves symfony';
|
$_SESSION['drak'] = 'loves symfony';
|
||||||
$storage->getBag('attributes')->set('symfony', 'greatness');
|
$storage->getBag('attributes')->set('symfony', 'greatness');
|
||||||
$key = $storage->getBag('attributes')->getStorageKey();
|
$key = $storage->getBag('attributes')->getStorageKey();
|
||||||
$this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
|
$this->assertEquals(['symfony' => 'greatness'], $_SESSION[$key]);
|
||||||
$this->assertEquals($_SESSION['drak'], 'loves symfony');
|
$this->assertEquals('loves symfony', $_SESSION['drak']);
|
||||||
$storage->clear();
|
$storage->clear();
|
||||||
$this->assertEquals($_SESSION[$key], []);
|
$this->assertEquals([], $_SESSION[$key]);
|
||||||
$this->assertEquals($_SESSION['drak'], 'loves symfony');
|
$this->assertEquals('loves symfony', $_SESSION['drak']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,6 @@ class FilterControllerArgumentsEventTest extends TestCase
|
|||||||
public function testFilterControllerArgumentsEvent()
|
public function testFilterControllerArgumentsEvent()
|
||||||
{
|
{
|
||||||
$filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, ['test'], new Request(), 1);
|
$filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, ['test'], new Request(), 1);
|
||||||
$this->assertEquals($filterController->getArguments(), ['test']);
|
$this->assertEquals(['test'], $filterController->getArguments());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -205,9 +205,9 @@ class FileProfilerStorageTest extends TestCase
|
|||||||
|
|
||||||
$records = $this->storage->find('', '', 3, 'GET', $start, time() + 3 * 60);
|
$records = $this->storage->find('', '', 3, 'GET', $start, time() + 3 * 60);
|
||||||
$this->assertCount(3, $records, '->find() returns all previously added records');
|
$this->assertCount(3, $records, '->find() returns all previously added records');
|
||||||
$this->assertEquals($records[0]['token'], 'time_2', '->find() returns records ordered by time in descendant order');
|
$this->assertEquals('time_2', $records[0]['token'], '->find() returns records ordered by time in descendant order');
|
||||||
$this->assertEquals($records[1]['token'], 'time_1', '->find() returns records ordered by time in descendant order');
|
$this->assertEquals('time_1', $records[1]['token'], '->find() returns records ordered by time in descendant order');
|
||||||
$this->assertEquals($records[2]['token'], 'time_0', '->find() returns records ordered by time in descendant order');
|
$this->assertEquals('time_0', $records[2]['token'], '->find() returns records ordered by time in descendant order');
|
||||||
|
|
||||||
$records = $this->storage->find('', '', 3, 'GET', $start, time() + 2 * 60);
|
$records = $this->storage->find('', '', 3, 'GET', $start, time() + 2 * 60);
|
||||||
$this->assertCount(2, $records, '->find() should return only first two of the previously added records');
|
$this->assertCount(2, $records, '->find() should return only first two of the previously added records');
|
||||||
|
@ -87,12 +87,12 @@ class AdapterTest extends LdapTestCase
|
|||||||
$ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
|
$ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
|
||||||
|
|
||||||
$query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', [
|
$query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', [
|
||||||
'scope' => Query::SCOPE_BASE,
|
'scope' => Query::SCOPE_BASE,
|
||||||
]);
|
]);
|
||||||
$result = $query->execute();
|
$result = $query->execute();
|
||||||
|
|
||||||
$entry = $result[0];
|
$entry = $result[0];
|
||||||
$this->assertEquals($result->count(), 1);
|
$this->assertEquals(1, $result->count());
|
||||||
$this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
|
$this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +109,7 @@ class AdapterTest extends LdapTestCase
|
|||||||
$subtree_count = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)')->execute()->count();
|
$subtree_count = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)')->execute()->count();
|
||||||
|
|
||||||
$this->assertNotEquals($one_level_result->count(), $subtree_count);
|
$this->assertNotEquals($one_level_result->count(), $subtree_count);
|
||||||
$this->assertEquals($one_level_result->count(), 1);
|
$this->assertEquals(1, $one_level_result->count());
|
||||||
$this->assertEquals($one_level_result[0]->getAttribute('ou'), ['Ldap']);
|
$this->assertEquals(['Ldap'], $one_level_result[0]->getAttribute('ou'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,7 @@ class LdapManagerTest extends LdapTestCase
|
|||||||
|
|
||||||
$result = $this->executeSearchQuery(1);
|
$result = $this->executeSearchQuery(1);
|
||||||
$renamedEntry = $result[0];
|
$renamedEntry = $result[0];
|
||||||
$this->assertEquals($renamedEntry->getAttribute('cn')[0], 'Kevin');
|
$this->assertEquals('Kevin', $renamedEntry->getAttribute('cn')[0]);
|
||||||
|
|
||||||
$oldRdn = $entry->getAttribute('cn')[0];
|
$oldRdn = $entry->getAttribute('cn')[0];
|
||||||
$entryManager->rename($renamedEntry, 'cn='.$oldRdn);
|
$entryManager->rename($renamedEntry, 'cn='.$oldRdn);
|
||||||
|
@ -62,11 +62,11 @@ class PhpExecutableFinderTest extends TestCase
|
|||||||
$f = new PhpExecutableFinder();
|
$f = new PhpExecutableFinder();
|
||||||
|
|
||||||
if (\defined('HHVM_VERSION')) {
|
if (\defined('HHVM_VERSION')) {
|
||||||
$this->assertEquals($f->findArguments(), ['--php'], '::findArguments() returns HHVM arguments');
|
$this->assertEquals(['--php'], $f->findArguments(), '::findArguments() returns HHVM arguments');
|
||||||
} elseif ('phpdbg' === \PHP_SAPI) {
|
} elseif ('phpdbg' === \PHP_SAPI) {
|
||||||
$this->assertEquals($f->findArguments(), ['-qrr'], '::findArguments() returns phpdbg arguments');
|
$this->assertEquals(['-qrr'], $f->findArguments(), '::findArguments() returns phpdbg arguments');
|
||||||
} else {
|
} else {
|
||||||
$this->assertEquals($f->findArguments(), [], '::findArguments() returns no arguments');
|
$this->assertEquals([], $f->findArguments(), '::findArguments() returns no arguments');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -179,9 +179,9 @@ class PhpEngineTest extends TestCase
|
|||||||
|
|
||||||
$this->loader->setTemplate('global.php', '<?php echo $global; ?>');
|
$this->loader->setTemplate('global.php', '<?php echo $global; ?>');
|
||||||
|
|
||||||
$this->assertEquals($engine->render('global.php'), 'global variable');
|
$this->assertEquals('global variable', $engine->render('global.php'));
|
||||||
|
|
||||||
$this->assertEquals($engine->render('global.php', ['global' => 'overwritten']), 'overwritten');
|
$this->assertEquals('overwritten', $engine->render('global.php', ['global' => 'overwritten']));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetLoader()
|
public function testGetLoader()
|
||||||
|
@ -100,9 +100,9 @@ class PluralizationRulesTest extends TestCase
|
|||||||
foreach ($matrix as $langCode => $data) {
|
foreach ($matrix as $langCode => $data) {
|
||||||
$indexes = array_flip($data);
|
$indexes = array_flip($data);
|
||||||
if ($expectSuccess) {
|
if ($expectSuccess) {
|
||||||
$this->assertEquals($nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
|
$this->assertCount((int) $nplural, $indexes, "Langcode '$langCode' has '$nplural' plural forms.");
|
||||||
} else {
|
} else {
|
||||||
$this->assertNotEquals((int) $nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
|
$this->assertNotCount((int) $nplural, $indexes, "Langcode '$langCode' has '$nplural' plural forms.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user