Fix: Move test assets to Fixtures namespace

localheinz · localheinz · commit 1f54c6011c39 · 2016-05-26T15:10:38.000+02:00
diff --git a/tests/FacebookClientTest.php b/tests/FacebookClientTest.php
@@ -35,6 +35,8 @@
 use Facebook\HttpClients\FacebookCurlHttpClient;
 use Facebook\HttpClients\FacebookGuzzleHttpClient;
 use Facebook\HttpClients\FacebookStreamHttpClient;
+use Facebook\Tests\Fixtures\MyFooBatchClientHandler;
+use Facebook\Tests\Fixtures\MyFooClientHandler;
 
 class FacebookClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -70,7 +72,7 @@ public function testACustomHttpClientCanBeInjected()
         $client = new FacebookClient($handler);
         $httpHandler = $client->getHttpClientHandler();
 
-        $this->assertInstanceOf('Facebook\Tests\MyFooClientHandler', $httpHandler);
+        $this->assertInstanceOf('Facebook\Tests\Fixtures\MyFooClientHandler', $httpHandler);
     }
 
     public function testTheHttpClientWillFallbackToDefault()
diff --git a/tests/FacebookTest.php b/tests/FacebookTest.php
@@ -28,7 +28,11 @@
 use Facebook\FacebookRequest;
 use Facebook\Authentication\AccessToken;
 use Facebook\GraphNodes\GraphEdge;
-use Facebook\Tests\FakeGraphApi\FakeGraphApiForResumableUpload;
+use Facebook\Tests\Fixtures\FakeGraphApiForResumableUpload;
+use Facebook\Tests\Fixtures\FooBarPseudoRandomStringGenerator;
+use Facebook\Tests\Fixtures\FooClientInterface;
+use Facebook\Tests\Fixtures\FooPersistentDataInterface;
+use Facebook\Tests\Fixtures\FooUrlDetectionInterface;
 
 class FacebookTest extends \PHPUnit_Framework_TestCase
 {
@@ -292,19 +296,19 @@ public function testCanInjectCustomHandlers()
         $fb = new Facebook($config);
 
         $this->assertInstanceOf(
-            'Facebook\Tests\FooClientInterface',
+            'Facebook\Tests\Fixtures\FooClientInterface',
             $fb->getClient()->getHttpClientHandler()
         );
         $this->assertInstanceOf(
-            'Facebook\Tests\FooPersistentDataInterface',
+            'Facebook\Tests\Fixtures\FooPersistentDataInterface',
             $fb->getRedirectLoginHelper()->getPersistentDataHandler()
         );
         $this->assertInstanceOf(
-            'Facebook\Tests\FooUrlDetectionInterface',
+            'Facebook\Tests\Fixtures\FooUrlDetectionInterface',
             $fb->getRedirectLoginHelper()->getUrlDetectionHandler()
         );
         $this->assertInstanceOf(
-            'Facebook\Tests\FooBarPseudoRandomStringGenerator',
+            'Facebook\Tests\Fixtures\FooBarPseudoRandomStringGenerator',
             $fb->getRedirectLoginHelper()->getPseudoRandomStringGenerator()
         );
     }
diff --git a/tests/FileUpload/FacebookResumableUploaderTest.php b/tests/FileUpload/FacebookResumableUploaderTest.php
@@ -29,7 +29,7 @@
 use Facebook\FacebookClient;
 use Facebook\FileUpload\FacebookResumableUploader;
 use Facebook\FileUpload\FacebookTransferChunk;
-use Facebook\Tests\FakeGraphApi\FakeGraphApiForResumableUpload;
+use Facebook\Tests\Fixtures\FakeGraphApiForResumableUpload;
 
 class FacebookResumableUploaderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Fixtures/FakeGraphApiForResumableUpload.php b/tests/Fixtures/FakeGraphApiForResumableUpload.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace Facebook\Tests\FakeGraphApi;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Http\GraphRawResponse;
 use Facebook\HttpClients\FacebookHttpClientInterface;
diff --git a/tests/Fixtures/FooBarPseudoRandomStringGenerator.php b/tests/Fixtures/FooBarPseudoRandomStringGenerator.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface;
 
diff --git a/tests/Fixtures/FooClientInterface.php b/tests/Fixtures/FooClientInterface.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Http\GraphRawResponse;
 use Facebook\HttpClients\FacebookHttpClientInterface;
diff --git a/tests/Fixtures/FooPersistentDataInterface.php b/tests/Fixtures/FooPersistentDataInterface.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\PersistentData\PersistentDataInterface;
 
diff --git a/tests/Fixtures/FooPseudoRandomStringGenerator.php b/tests/Fixtures/FooPseudoRandomStringGenerator.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\Helpers;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface;
 
diff --git a/tests/Fixtures/FooRedirectLoginOAuth2Client.php b/tests/Fixtures/FooRedirectLoginOAuth2Client.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\Helpers;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Authentication\OAuth2Client;
 
diff --git a/tests/Fixtures/FooSignedRequestHelper.php b/tests/Fixtures/FooSignedRequestHelper.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\Helpers;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Helpers\FacebookSignedRequestFromInputHelper;
 
diff --git a/tests/Fixtures/FooSignedRequestHelperFacebookClient.php b/tests/Fixtures/FooSignedRequestHelperFacebookClient.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\Helpers;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\FacebookClient;
 use Facebook\FacebookRequest;
diff --git a/tests/Fixtures/FooUrlDetectionInterface.php b/tests/Fixtures/FooUrlDetectionInterface.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Url\UrlDetectionInterface;
 
diff --git a/tests/Fixtures/MyFooBarPseudoRandomStringGenerator.php b/tests/Fixtures/MyFooBarPseudoRandomStringGenerator.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\PseudoRandomString;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\PseudoRandomString\PseudoRandomStringGeneratorTrait;
 
diff --git a/tests/Fixtures/MyFooBatchClientHandler.php b/tests/Fixtures/MyFooBatchClientHandler.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Http\GraphRawResponse;
 use Facebook\HttpClients\FacebookHttpClientInterface;
diff --git a/tests/Fixtures/MyFooClientHandler.php b/tests/Fixtures/MyFooClientHandler.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\Http\GraphRawResponse;
 use Facebook\HttpClients\FacebookHttpClientInterface;
diff --git a/tests/Fixtures/MyFooGraphNode.php b/tests/Fixtures/MyFooGraphNode.php
@@ -21,13 +21,13 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\GraphNodes;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\GraphNodes\GraphNode;
 
 class MyFooGraphNode extends GraphNode
 {
     protected static $graphObjectMap = [
-        'foo_object' => '\Facebook\Tests\GraphNodes\MyFooSubClassGraphNode',
+        'foo_object' => '\Facebook\Tests\Fixtures\MyFooSubClassGraphNode',
     ];
 }
diff --git a/tests/Fixtures/MyFooSubClassGraphNode.php b/tests/Fixtures/MyFooSubClassGraphNode.php
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook\Tests\GraphNodes;
+namespace Facebook\Tests\Fixtures;
 
 use Facebook\GraphNodes\GraphNode;
 
diff --git a/tests/GraphNodes/GraphNodeFactoryTest.php b/tests/GraphNodes/GraphNodeFactoryTest.php
@@ -114,7 +114,7 @@ public function testValidSubClassesWillNotThrow()
     {
         GraphNodeFactory::validateSubclass('\Facebook\GraphNodes\GraphNode');
         GraphNodeFactory::validateSubclass('\Facebook\GraphNodes\GraphAlbum');
-        GraphNodeFactory::validateSubclass('\Facebook\Tests\GraphNodes\MyFooGraphNode');
+        GraphNodeFactory::validateSubclass('\Facebook\Tests\Fixtures\MyFooGraphNode');
     }
 
     public function testCastingAsASubClassObjectWillInstantiateTheSubClass()
@@ -123,9 +123,9 @@ public function testCastingAsASubClassObjectWillInstantiateTheSubClass()
         $res = new FacebookResponse($this->request, $data);
 
         $factory = new GraphNodeFactory($res);
-        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\GraphNodes\MyFooGraphNode');
+        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\Fixtures\MyFooGraphNode');
 
-        $this->assertInstanceOf('\Facebook\Tests\GraphNodes\MyFooGraphNode', $mySubClassObject);
+        $this->assertInstanceOf('\Facebook\Tests\Fixtures\MyFooGraphNode', $mySubClassObject);
     }
 
     public function testASubClassMappingWillAutomaticallyInstantiateSubClass()
@@ -134,11 +134,11 @@ public function testASubClassMappingWillAutomaticallyInstantiateSubClass()
         $res = new FacebookResponse($this->request, $data);
 
         $factory = new GraphNodeFactory($res);
-        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\GraphNodes\MyFooGraphNode');
+        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\Fixtures\MyFooGraphNode');
         $fooObject = $mySubClassObject->getField('foo_object');
 
-        $this->assertInstanceOf('\Facebook\Tests\GraphNodes\MyFooGraphNode', $mySubClassObject);
-        $this->assertInstanceOf('\Facebook\Tests\GraphNodes\MyFooSubClassGraphNode', $fooObject);
+        $this->assertInstanceOf('\Facebook\Tests\Fixtures\MyFooGraphNode', $mySubClassObject);
+        $this->assertInstanceOf('\Facebook\Tests\Fixtures\MyFooSubClassGraphNode', $fooObject);
     }
 
     public function testAnUnknownGraphNodeWillBeCastAsAGenericGraphNode()
@@ -155,12 +155,12 @@ public function testAnUnknownGraphNodeWillBeCastAsAGenericGraphNode()
 
         $factory = new GraphNodeFactory($res);
 
-        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\GraphNodes\MyFooGraphNode');
+        $mySubClassObject = $factory->makeGraphNode('\Facebook\Tests\Fixtures\MyFooGraphNode');
         $unknownObject = $mySubClassObject->getField('unknown_object');
 
-        $this->assertInstanceOf('\Facebook\Tests\GraphNodes\MyFooGraphNode', $mySubClassObject);
+        $this->assertInstanceOf('\Facebook\Tests\Fixtures\MyFooGraphNode', $mySubClassObject);
         $this->assertInstanceOf('\Facebook\GraphNodes\GraphNode', $unknownObject);
-        $this->assertNotInstanceOf('\Facebook\Tests\GraphNodes\MyFooGraphNode', $unknownObject);
+        $this->assertNotInstanceOf('\Facebook\Tests\Fixtures\MyFooGraphNode', $unknownObject);
     }
 
     public function testAListFromGraphWillBeCastAsAGraphEdge()
diff --git a/tests/Helpers/FacebookRedirectLoginHelperTest.php b/tests/Helpers/FacebookRedirectLoginHelperTest.php
@@ -28,6 +28,8 @@
 use Facebook\FacebookClient;
 use Facebook\Helpers\FacebookRedirectLoginHelper;
 use Facebook\PersistentData\FacebookMemoryPersistentDataHandler;
+use Facebook\Tests\Fixtures\FooPseudoRandomStringGenerator;
+use Facebook\Tests\Fixtures\FooRedirectLoginOAuth2Client;
 
 class FacebookRedirectLoginHelperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php b/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php
@@ -24,6 +24,8 @@
 namespace Facebook\Tests\Helpers;
 
 use Facebook\FacebookApp;
+use Facebook\Tests\Fixtures\FooSignedRequestHelper;
+use Facebook\Tests\Fixtures\FooSignedRequestHelperFacebookClient;
 
 class FacebookSignedRequestFromInputHelperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php b/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php
@@ -23,6 +23,8 @@
  */
 namespace Facebook\Tests\PseudoRandomString;
 
+use Facebook\Tests\Fixtures\MyFooBarPseudoRandomStringGenerator;
+
 class PseudoRandomStringGeneratorTraitTest extends \PHPUnit_Framework_TestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@`
`35`	`35`	`use Facebook\HttpClients\FacebookCurlHttpClient;`
`36`	`36`	`use Facebook\HttpClients\FacebookGuzzleHttpClient;`
`37`	`37`	`use Facebook\HttpClients\FacebookStreamHttpClient;`
	`38`	`+use Facebook\Tests\Fixtures\MyFooBatchClientHandler;`
	`39`	`+use Facebook\Tests\Fixtures\MyFooClientHandler;`
`38`	`40`
`39`	`41`	`class FacebookClientTest extends \PHPUnit_Framework_TestCase`
`40`	`42`	`{`
`@@ -70,7 +72,7 @@ public function testACustomHttpClientCanBeInjected()`
`70`	`72`	`$client = new FacebookClient($handler);`
`71`	`73`	`$httpHandler = $client->getHttpClientHandler();`
`72`	`74`
`73`		`- $this->assertInstanceOf('Facebook\Tests\MyFooClientHandler', $httpHandler);`
	`75`	`+ $this->assertInstanceOf('Facebook\Tests\Fixtures\MyFooClientHandler', $httpHandler);`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`public function testTheHttpClientWillFallbackToDefault()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`use Facebook\FacebookClient;`
`30`	`30`	`use Facebook\FileUpload\FacebookResumableUploader;`
`31`	`31`	`use Facebook\FileUpload\FacebookTransferChunk;`
`32`		`-use Facebook\Tests\FakeGraphApi\FakeGraphApiForResumableUpload;`
	`32`	`+use Facebook\Tests\Fixtures\FakeGraphApiForResumableUpload;`
`33`	`33`
`34`	`34`	`class FacebookResumableUploaderTest extends \PHPUnit_Framework_TestCase`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`	`24`
`25`		`-namespace Facebook\Tests\FakeGraphApi;`
	`25`	`+namespace Facebook\Tests\Fixtures;`
`26`	`26`
`27`	`27`	`use Facebook\Http\GraphRawResponse;`
`28`	`28`	`use Facebook\HttpClients\FacebookHttpClientInterface;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* DEALINGS IN THE SOFTWARE.`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`		`-namespace Facebook\Tests;`
	`24`	`+namespace Facebook\Tests\Fixtures;`
`25`	`25`
`26`	`26`	`use Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface;`
`27`	`27`