Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify tests #90

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
492 changes: 246 additions & 246 deletions test/Faker/Calculator/IbanTest.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/Faker/Calculator/InnTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function checksumProvider()
['500109285', '3'],
['500109285', '3'],
['500109285', '3'],
['027615723', '1']
['027615723', '1'],
];
}

Expand Down
62 changes: 31 additions & 31 deletions test/Faker/Calculator/LuhnTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,55 @@ final class LuhnTest extends TestCase
{
public function checkDigitProvider()
{
return array(
array('7992739871', '3'),
array('3852000002323', '7'),
array('37144963539843', '1'),
array('561059108101825', '0'),
array('601100099013942', '4'),
array('510510510510510', '0'),
array(7992739871, '3'),
array(3852000002323, '7'),
array('37144963539843', '1'),
array('561059108101825', '0'),
array('601100099013942', '4'),
array('510510510510510', '0')
);
return [
['7992739871', '3'],
['3852000002323', '7'],
['37144963539843', '1'],
['561059108101825', '0'],
['601100099013942', '4'],
['510510510510510', '0'],
[7992739871, '3'],
[3852000002323, '7'],
['37144963539843', '1'],
['561059108101825', '0'],
['601100099013942', '4'],
['510510510510510', '0'],
];
}

/**
* @dataProvider checkDigitProvider
*/
public function testComputeCheckDigit($partialNumber, $checkDigit)
{
$this->assertIsString($checkDigit);
$this->assertEquals($checkDigit, Luhn::computeCheckDigit($partialNumber));
self::assertIsString($checkDigit);
self::assertEquals($checkDigit, Luhn::computeCheckDigit($partialNumber));
}

public function validatorProvider()
{
return array(
array('79927398710', false),
array('79927398711', false),
array('79927398712', false),
array('79927398713', true),
array('79927398714', false),
array('79927398715', false),
array('79927398716', false),
array('79927398717', false),
array('79927398718', false),
array('79927398719', false),
array(79927398713, true),
array(79927398714, false),
);
return [
['79927398710', false],
['79927398711', false],
['79927398712', false],
['79927398713', true],
['79927398714', false],
['79927398715', false],
['79927398716', false],
['79927398717', false],
['79927398718', false],
['79927398719', false],
[79927398713, true],
[79927398714, false],
];
}

/**
* @dataProvider validatorProvider
*/
public function testIsValid($number, $isValid)
{
$this->assertEquals($isValid, Luhn::isValid($number));
self::assertEquals($isValid, Luhn::isValid($number));
}

public function testGenerateLuhnNumberWithInvalidPrefix()
Expand Down
38 changes: 20 additions & 18 deletions test/Faker/Calculator/TCNoTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,48 @@ final class TCNoTest extends TestCase
{
public function checksumProvider()
{
return array(
array('553006348', '82'),
array('350630743', '78'),
array('550600932', '88'),
array('487932947', '70'),
array('168113862', '40')
);
return [
['553006348', '82'],
['350630743', '78'],
['550600932', '88'],
['487932947', '70'],
['168113862', '40'],
];
}

/**
* @dataProvider checksumProvider
*
* @param $tcNo
* @param $checksum
*/
public function testChecksum($tcNo, $checksum)
{
$this->assertEquals($checksum, TCNo::checksum($tcNo), $tcNo);
self::assertSame($checksum, TCNo::checksum($tcNo), $tcNo);
}

public function validatorProvider()
{
return array(
array('22978160678', true),
array('26480045324', true),
array('47278360658', true),
array('34285002510', true),
array('19874561012', true),
return [
['22978160678', true],
['26480045324', true],
['47278360658', true],
['34285002510', true],
['19874561012', true],

array('11111111111', false),
array('11234567899', false),
);
['11111111111', false],
['11234567899', false],
];
}

/**
* @dataProvider validatorProvider
*
* @param $tcNo
* @param $isValid
*/
public function testIsValid($tcNo, $isValid)
{
$this->assertEquals($isValid, TCNo::isValid($tcNo), $tcNo);
self::assertSame($isValid, TCNo::isValid($tcNo), $tcNo);
}
}
10 changes: 5 additions & 5 deletions test/Faker/DefaultGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ final class DefaultGeneratorTest extends TestCase
{
public function testGeneratorReturnsNullByDefault()
{
$generator = new DefaultGenerator;
$this->assertNull($generator->value);
$generator = new DefaultGenerator();
self::assertNull($generator->value);
}

public function testGeneratorReturnsDefaultValueForAnyPropertyGet()
{
$generator = new DefaultGenerator(123);
$this->assertSame(123, $generator->foo);
$this->assertNotNull($generator->bar);
self::assertSame(123, $generator->foo);
self::assertNotNull($generator->bar);
}

public function testGeneratorReturnsDefaultValueForAnyMethodCall()
{
$generator = new DefaultGenerator(123);
$this->assertSame(123, $generator->foobar());
self::assertSame(123, $generator->foobar());
}
}
101 changes: 40 additions & 61 deletions test/Faker/GeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,126 +8,105 @@ final class GeneratorTest extends TestCase
{
public function testAddProviderGivesPriorityToNewlyAddedProvider()
{
$generator = new Generator;
$generator->addProvider(new FooProvider());
$generator->addProvider(new BarProvider());
$this->assertEquals('barfoo', $generator->format('fooFormatter'));
$this->faker->addProvider(new FooProvider());
$this->faker->addProvider(new BarProvider());
self::assertEquals('barfoo', $this->faker->format('fooFormatter'));
}

public function testGetProvidersReturnsCorrectProviders()
{
$generator = new Generator;
$generator->addProvider(new FooProvider());
$generator->addProvider(new BarProvider());
$this->assertInstanceOf(FooProvider::class, $generator->getProviders()[1]);
$this->assertInstanceOf(BarProvider::class, $generator->getProviders()[0]);
$this->assertCount(2, $generator->getProviders());
$this->faker->addProvider(new FooProvider());
$this->faker->addProvider(new BarProvider());
self::assertInstanceOf(FooProvider::class, $this->faker->getProviders()[1]);
self::assertInstanceOf(BarProvider::class, $this->faker->getProviders()[0]);
self::assertCount(2, $this->faker->getProviders());
}

public function testGetFormatterReturnsCallable()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertIsCallable($generator->getFormatter('fooFormatter'));
$this->faker->addProvider(new FooProvider());
self::assertIsCallable($this->faker->getFormatter('fooFormatter'));
}

public function testGetFormatterReturnsCorrectFormatter()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$expected = array($provider, 'fooFormatter');
$this->assertEquals($expected, $generator->getFormatter('fooFormatter'));
$this->faker->addProvider($provider);
$expected = [$provider, 'fooFormatter'];
self::assertEquals($expected, $this->faker->getFormatter('fooFormatter'));
}

public function testGetFormatterThrowsExceptionOnIncorrectProvider()
{
$this->expectException(\InvalidArgumentException::class);
$generator = new Generator;
$generator->getFormatter('fooFormatter');
$this->faker->getFormatter('fooFormatter');
}

public function testGetFormatterThrowsExceptionOnIncorrectFormatter()
{
$this->expectException(\InvalidArgumentException::class);
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$generator->getFormatter('barFormatter');
$this->faker->addProvider(new FooProvider());
$this->faker->getFormatter('barFormatter');
}

public function testFormatCallsFormatterOnProvider()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('foobar', $generator->format('fooFormatter'));
$this->faker->addProvider(new FooProvider());
self::assertEquals('foobar', $this->faker->format('fooFormatter'));
}

public function testFormatTransfersArgumentsToFormatter()
{
$generator = new Generator;
$this->faker = new Generator();
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('bazfoo', $generator->format('fooFormatterWithArguments', array('foo')));
$this->faker->addProvider($provider);
self::assertEquals('bazfoo', $this->faker->format('fooFormatterWithArguments', ['foo']));
}

public function testParseReturnsSameStringWhenItContainsNoCurlyBraces()
{
$generator = new Generator();
$this->assertEquals('fooBar#?', $generator->parse('fooBar#?'));
self::assertEquals('fooBar#?', $this->faker->parse('fooBar#?'));
}

public function testParseReturnsStringWithTokensReplacedByFormatters()
{
$generator = new Generator();
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('This is foobar a text with foobar', $generator->parse('This is {{fooFormatter}} a text with {{ fooFormatter }}'));
$this->faker->addProvider(new FooProvider());
self::assertEquals('This is foobar a text with foobar', $this->faker->parse('This is {{fooFormatter}} a text with {{ fooFormatter }}'));
}

public function testMagicGetCallsFormat()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('foobar', $generator->fooFormatter);
$this->faker->addProvider(new FooProvider());
self::assertEquals('foobar', $this->faker->fooFormatter);
}

public function testMagicCallCallsFormat()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('foobar', $generator->fooFormatter());
$this->faker->addProvider(new FooProvider());
self::assertEquals('foobar', $this->faker->fooFormatter());
}

public function testMagicCallCallsFormatWithArguments()
{
$generator = new Generator;
$provider = new FooProvider();
$generator->addProvider($provider);
$this->assertEquals('bazfoo', $generator->fooFormatterWithArguments('foo'));
$this->faker->addProvider(new FooProvider());
self::assertEquals('bazfoo', $this->faker->fooFormatterWithArguments('foo'));
}

public function testSeed()
{
$generator = new Generator;

$generator->seed(0);
$this->faker->seed(0);
$mtRandWithSeedZero = mt_rand();
$generator->seed(0);
$this->assertEquals($mtRandWithSeedZero, mt_rand(), 'seed(0) should be deterministic.');
$this->faker->seed(0);
self::assertEquals($mtRandWithSeedZero, mt_rand(), 'seed(0) should be deterministic.');

$generator->seed();
$this->faker->seed();
$mtRandWithoutSeed = mt_rand();
$this->assertNotEquals($mtRandWithSeedZero, $mtRandWithoutSeed, 'seed() should be different than seed(0)');
$generator->seed();
$this->assertNotEquals($mtRandWithoutSeed, mt_rand(), 'seed() should not be deterministic.');
self::assertNotEquals($mtRandWithSeedZero, $mtRandWithoutSeed, 'seed() should be different than seed(0)');
$this->faker->seed();
self::assertNotEquals($mtRandWithoutSeed, mt_rand(), 'seed() should not be deterministic.');

$generator->seed('10');
$this->assertTrue(true, 'seeding with a non int value doesn\'t throw an exception');
$this->faker->seed('10');
self::assertTrue(true, 'seeding with a non int value doesn\'t throw an exception');
}
}

Expand All @@ -140,7 +119,7 @@ public function fooFormatter()

public function fooFormatterWithArguments($value = '')
{
return 'baz' . $value;
return 'baz'.$value;
}
}

Expand Down
Loading