Enhancement: Extract fixtures into separate classes (#234)

localheinz · web-flow · commit 619cecac8388 · 2021-01-28T13:07:59.000+01:00
diff --git a/composer.json b/composer.json
@@ -30,7 +30,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Faker\\Test\\": "test/Faker/"
+            "Faker\\Test\\": "test/Faker/",
+            "Faker\\Test\\Fixture\\": "test/Fixture/"
         }
     },
     "conflict": {
diff --git a/test/Faker/GeneratorTest.php b/test/Faker/GeneratorTest.php
@@ -56,29 +56,29 @@ public function testMimeType(): void
 
     public function testAddProviderGivesPriorityToNewlyAddedProvider()
     {
-        $this->faker->addProvider(new FooProvider());
-        $this->faker->addProvider(new BarProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\BarProvider());
         self::assertEquals('barfoo', $this->faker->format('fooFormatter'));
     }
 
     public function testGetProvidersReturnsCorrectProviders()
     {
-        $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]);
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\BarProvider());
+        self::assertInstanceOf(Fixture\Provider\FooProvider::class, $this->faker->getProviders()[1]);
+        self::assertInstanceOf(Fixture\Provider\BarProvider::class, $this->faker->getProviders()[0]);
         self::assertCount(2, $this->faker->getProviders());
     }
 
     public function testGetFormatterReturnsCallable()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertIsCallable($this->faker->getFormatter('fooFormatter'));
     }
 
     public function testGetFormatterReturnsCorrectFormatter()
     {
-        $provider = new FooProvider();
+        $provider = new Fixture\Provider\FooProvider();
         $this->faker->addProvider($provider);
         $expected = [$provider, 'fooFormatter'];
         self::assertEquals($expected, $this->faker->getFormatter('fooFormatter'));
@@ -93,20 +93,20 @@ public function testGetFormatterThrowsExceptionOnIncorrectProvider()
     public function testGetFormatterThrowsExceptionOnIncorrectFormatter()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         $this->faker->getFormatter('barFormatter');
     }
 
     public function testFormatCallsFormatterOnProvider()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertEquals('foobar', $this->faker->format('fooFormatter'));
     }
 
     public function testFormatTransfersArgumentsToFormatter()
     {
         $this->faker = new Generator();
-        $provider = new FooProvider();
+        $provider = new Fixture\Provider\FooProvider();
         $this->faker->addProvider($provider);
         self::assertEquals('bazfoo', $this->faker->format('fooFormatterWithArguments', ['foo']));
     }
@@ -118,7 +118,7 @@ public function testParseReturnsSameStringWhenItContainsNoCurlyBraces()
 
     public function testParseReturnsStringWithTokensReplacedByFormatters()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertEquals('This is foobar a text with foobar', $this->faker->parse('This is {{fooFormatter}} a text with {{ fooFormatter }}'));
     }
 
@@ -127,19 +127,19 @@ public function testParseReturnsStringWithTokensReplacedByFormatters()
      */
     public function testMagicGetCallsFormat()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertEquals('foobar', $this->faker->fooFormatter);
     }
 
     public function testMagicCallCallsFormat()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertEquals('foobar', $this->faker->fooFormatter());
     }
 
     public function testMagicCallCallsFormatWithArguments()
     {
-        $this->faker->addProvider(new FooProvider());
+        $this->faker->addProvider(new Fixture\Provider\FooProvider());
         self::assertEquals('bazfoo', $this->faker->fooFormatterWithArguments('foo'));
     }
 
@@ -285,24 +285,3 @@ public function word(): string
         $uniqueGenerator->word();
     }
 }
-
-final class FooProvider
-{
-    public function fooFormatter()
-    {
-        return 'foobar';
-    }
-
-    public function fooFormatterWithArguments($value = '')
-    {
-        return 'baz' . $value;
-    }
-}
-
-final class BarProvider
-{
-    public function fooFormatter()
-    {
-        return 'barfoo';
-    }
-}
diff --git a/test/Fixture/Provider/BarProvider.php b/test/Fixture/Provider/BarProvider.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Faker\Test\Fixture\Provider;
+
+final class BarProvider
+{
+    public function fooFormatter()
+    {
+        return 'barfoo';
+    }
+}
diff --git a/test/Fixture/Provider/FooProvider.php b/test/Fixture/Provider/FooProvider.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Faker\Test\Fixture\Provider;
+
+final class FooProvider
+{
+    public function fooFormatter()
+    {
+        return 'foobar';
+    }
+
+    public function fooFormatterWithArguments($value = '')
+    {
+        return 'baz' . $value;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -56,29 +56,29 @@ public function testMimeType(): void`
`56`	`56`
`57`	`57`	`public function testAddProviderGivesPriorityToNewlyAddedProvider()`
`58`	`58`	`{`
`59`		`- $this->faker->addProvider(new FooProvider());`
`60`		`- $this->faker->addProvider(new BarProvider());`
	`59`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
	`60`	`+ $this->faker->addProvider(new Fixture\Provider\BarProvider());`
`61`	`61`	`self::assertEquals('barfoo', $this->faker->format('fooFormatter'));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function testGetProvidersReturnsCorrectProviders()`
`65`	`65`	`{`
`66`		`- $this->faker->addProvider(new FooProvider());`
`67`		`- $this->faker->addProvider(new BarProvider());`
`68`		`- self::assertInstanceOf(FooProvider::class, $this->faker->getProviders()[1]);`
`69`		`- self::assertInstanceOf(BarProvider::class, $this->faker->getProviders()[0]);`
	`66`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
	`67`	`+ $this->faker->addProvider(new Fixture\Provider\BarProvider());`
	`68`	`+ self::assertInstanceOf(Fixture\Provider\FooProvider::class, $this->faker->getProviders()[1]);`
	`69`	`+ self::assertInstanceOf(Fixture\Provider\BarProvider::class, $this->faker->getProviders()[0]);`
`70`	`70`	`self::assertCount(2, $this->faker->getProviders());`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function testGetFormatterReturnsCallable()`
`74`	`74`	`{`
`75`		`- $this->faker->addProvider(new FooProvider());`
	`75`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`76`	`76`	`self::assertIsCallable($this->faker->getFormatter('fooFormatter'));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public function testGetFormatterReturnsCorrectFormatter()`
`80`	`80`	`{`
`81`		`- $provider = new FooProvider();`
	`81`	`+ $provider = new Fixture\Provider\FooProvider();`
`82`	`82`	`$this->faker->addProvider($provider);`
`83`	`83`	`$expected = [$provider, 'fooFormatter'];`
`84`	`84`	`self::assertEquals($expected, $this->faker->getFormatter('fooFormatter'));`
`@@ -93,20 +93,20 @@ public function testGetFormatterThrowsExceptionOnIncorrectProvider()`
`93`	`93`	`public function testGetFormatterThrowsExceptionOnIncorrectFormatter()`
`94`	`94`	`{`
`95`	`95`	`$this->expectException(\InvalidArgumentException::class);`
`96`		`- $this->faker->addProvider(new FooProvider());`
	`96`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`97`	`97`	`$this->faker->getFormatter('barFormatter');`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public function testFormatCallsFormatterOnProvider()`
`101`	`101`	`{`
`102`		`- $this->faker->addProvider(new FooProvider());`
	`102`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`103`	`103`	`self::assertEquals('foobar', $this->faker->format('fooFormatter'));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public function testFormatTransfersArgumentsToFormatter()`
`107`	`107`	`{`
`108`	`108`	`$this->faker = new Generator();`
`109`		`- $provider = new FooProvider();`
	`109`	`+ $provider = new Fixture\Provider\FooProvider();`
`110`	`110`	`$this->faker->addProvider($provider);`
`111`	`111`	`self::assertEquals('bazfoo', $this->faker->format('fooFormatterWithArguments', ['foo']));`
`112`	`112`	`}`
`@@ -118,7 +118,7 @@ public function testParseReturnsSameStringWhenItContainsNoCurlyBraces()`
`118`	`118`
`119`	`119`	`public function testParseReturnsStringWithTokensReplacedByFormatters()`
`120`	`120`	`{`
`121`		`- $this->faker->addProvider(new FooProvider());`
	`121`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`122`	`122`	`self::assertEquals('This is foobar a text with foobar', $this->faker->parse('This is {{fooFormatter}} a text with {{ fooFormatter }}'));`
`123`	`123`	`}`
`124`	`124`
`@@ -127,19 +127,19 @@ public function testParseReturnsStringWithTokensReplacedByFormatters()`
`127`	`127`	`*/`
`128`	`128`	`public function testMagicGetCallsFormat()`
`129`	`129`	`{`
`130`		`- $this->faker->addProvider(new FooProvider());`
	`130`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`131`	`131`	`self::assertEquals('foobar', $this->faker->fooFormatter);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public function testMagicCallCallsFormat()`
`135`	`135`	`{`
`136`		`- $this->faker->addProvider(new FooProvider());`
	`136`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`137`	`137`	`self::assertEquals('foobar', $this->faker->fooFormatter());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function testMagicCallCallsFormatWithArguments()`
`141`	`141`	`{`
`142`		`- $this->faker->addProvider(new FooProvider());`
	`142`	`+ $this->faker->addProvider(new Fixture\Provider\FooProvider());`
`143`	`143`	`self::assertEquals('bazfoo', $this->faker->fooFormatterWithArguments('foo'));`
`144`	`144`	`}`
`145`	`145`
`@@ -285,24 +285,3 @@ public function word(): string`
`285`	`285`	`$uniqueGenerator->word();`
`286`	`286`	`}`
`287`	`287`	`}`
`288`		`-`
`289`		`-final class FooProvider`
`290`		`-{`
`291`		`- public function fooFormatter()`
`292`		`- {`
`293`		`- return 'foobar';`
`294`		`- }`
`295`		`-`
`296`		`- public function fooFormatterWithArguments($value = '')`
`297`		`- {`
`298`		`- return 'baz' . $value;`
`299`		`- }`
`300`		`-}`
`301`		`-`
`302`		`-final class BarProvider`
`303`		`-{`
`304`		`- public function fooFormatter()`
`305`		`- {`
`306`		`- return 'barfoo';`
`307`		`- }`
`308`		`-}`