Debug Tests

overblog · Jan 14, 2015 · 8724ee5 · 8724ee5
1 parent d950a63
commit 8724ee5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/Tests/Client/ThriftClientTest.php b/Tests/Client/ThriftClientTest.php
@@ -28,13 +28,10 @@ protected function setUp()
         $this->factory = new ThriftFactory(array(
             'test' => array(
                 'definition' => 'Test',
-                'className' => 'Test',
+                'className' => 'TestService',
                 'namespace' => 'ThriftModel\Test'
             )
         ));
-        $this->factory->initLoader(array(
-            'ThriftModel' => __DIR__ . '/..'
-        ));
     }
 
     public function testHttpClient()
@@ -50,13 +47,13 @@ public function testHttpClient()
             ),
             'service_config' => array(
                 'definition' => 'Test',
-                'className' => 'Test',
+                'className' => 'TestService',
                 'namespace' => 'ThriftModel\Test',
                 'protocol' => 'Thrift\\Protocol\\TBinaryProtocolAccelerated'
             )
         ));
 
-        $this->assertInstanceOf('ThriftModel\Test\TestClient', $thriftClient->getClient());
+        $this->assertInstanceOf('ThriftModel\Test\TestServiceClient', $thriftClient->getClient());
 
         $this->assertInstanceOf(
             'ThriftModel\Test\Test',
@@ -101,7 +98,7 @@ public function testSocketClient__NoServer()
 			'TSocket: Could not connect to localhost:9090 (Connexion refusée [111])'
 		);
 
-        $this->assertInstanceOf('ThriftModel\Test\TestClient', $thriftClient->getClient());
+        $this->assertInstanceOf('ThriftModel\Test\TestServiceClient', $thriftClient->getClient());
     }
 
     public function testSocketClient()
@@ -118,7 +115,7 @@ public function testSocketClient()
         $processor = $this->factory->getProcessorInstance('test', $handler);
 
         $this->assertInstanceOf(
-            'ThriftModel\Test\TestProcessor',
+            'ThriftModel\Test\TestServiceProcessor',
             $processor
         );
 
@@ -143,7 +140,7 @@ public function testSocketClient()
             sleep(2);
 
             $client = $thriftClient->getClient();
-            $this->assertInstanceOf('ThriftModel\Test\TestClient', $client);
+            $this->assertInstanceOf('ThriftModel\Test\TestServiceClient', $client);
 
             // Void Method
             $this->assertNull($client->ping());
@@ -242,7 +239,7 @@ public function testMultiSocketClient()
             ),
             'service_config' => array(
                 'definition' => 'Test',
-                'className' => 'Test',
+                'className' => 'TestService',
                 'namespace' => 'ThriftModel\Test',
                 'protocol' => 'Thrift\\Protocol\\TBinaryProtocolAccelerated'
             )

diff --git a/Tests/Factory/ThriftFactoryTest.php b/Tests/Factory/ThriftFactoryTest.php
@@ -22,13 +22,10 @@ public function testFactory()
         $factory = new ThriftFactory(array(
             'test' => array(
                 'definition' => 'Test',
-                'className' => 'Test',
+                'className' => 'TestService',
                 'namespace' => 'ThriftModel\Test'
             )
         ));
-        $factory->initLoader(array(
-            'ThriftModel' => __DIR__ . '/..'
-        ));
 
         $this->assertInstanceOf(
             'ThriftModel\Test\Test',
@@ -51,12 +48,12 @@ public function testFactory()
         );
 
         $this->assertInstanceOf(
-            'ThriftModel\Test\TestProcessor',
+            'ThriftModel\Test\TestServiceProcessor',
             $factory->getProcessorInstance('test', null)
         );
 
         $this->assertInstanceOf(
-            'ThriftModel\Test\TestClient',
+            'ThriftModel\Test\TestServiceClient',
             $factory->getClientInstance('test', null)
         );
     }

diff --git a/Tests/ThriftBundleTestCase.php b/Tests/ThriftBundleTestCase.php
@@ -3,6 +3,8 @@
 namespace Overblog\ThriftBundle\Tests;
 
 use Overblog\ThriftBundle\Compiler\ThriftCompiler;
+use Symfony\Component\ClassLoader\MapClassLoader;
+use Symfony\Component\ClassLoader\ClassMapGenerator;
 
 class ThriftBundleTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -23,6 +25,10 @@ protected function compile()
         $this->compiler = new ThriftCompiler();
         $this->compiler->setModelPath($this->modelPath);
         $this->compiler->compile($this->definitionPath, true);
+
+        // Init Loader
+        $l = new MapClassLoader(ClassMapGenerator::createMap($this->modelPath));
+        $l->register();
     }
 
     protected function tearDown()

diff --git a/Tests/ThriftDefinition/Test.thrift b/Tests/ThriftDefinition/Test.thrift
@@ -15,7 +15,7 @@ exception InvalidValueException {
     2: string error_msg
 }
 
-service Test {
+service TestService {
     void ping(),
     Test get(1: i32 id) throws (1: InvalidValueException e),
     list<Test> getList(1: i32 id) throws (1: InvalidValueException e),

diff --git a/composer.json b/composer.json
@@ -12,7 +12,8 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "apache/thrift": ">=0.9.1"
+        "apache/thrift": ">=0.9.1",
+        "symfony/symfony": ">=2.4.0"
     },
     "target-dir": "Overblog/ThriftBundle",
     "autoload": {