fix tests

ASKozienko · ASKozienko · commit fdc27a37b361 · 2018-11-05T16:22:54.000+02:00
diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php
@@ -15,16 +15,11 @@
  */
 class AsyncListenerTest extends WebTestCase
 {
-    public function setUp()
+    protected function tearDown()
     {
-        parent::setUp();
+        parent::tearDown();
 
-        /** @var AsyncListener $asyncListener */
-        $asyncListener = static::$container->get('enqueue.events.async_listener');
-
-        $asyncListener->resetSyncMode();
-        static::$container->get('test_async_subscriber')->calls = [];
-        static::$container->get('test_async_listener')->calls = [];
+        static::$container = null;
     }
 
     public function testShouldNotCallRealListenerIfMarkedAsAsync()
diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\Bundle\Tests\Functional\Events;
 
-use Enqueue\AsyncEventDispatcher\AsyncListener;
 use Enqueue\AsyncEventDispatcher\AsyncProcessor;
 use Enqueue\Bundle\Tests\Functional\App\TestAsyncListener;
 use Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber;
@@ -18,14 +17,11 @@
  */
 class AsyncProcessorTest extends WebTestCase
 {
-    public function setUp()
+    protected function tearDown()
     {
-        parent::setUp();
+        parent::tearDown();
 
-        /** @var AsyncListener $asyncListener */
-        $asyncListener = static::$container->get('enqueue.events.async_listener');
-
-        $asyncListener->resetSyncMode();
+        static::$container = null;
     }
 
     public function testCouldBeGetFromContainerAsService()
diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\Bundle\Tests\Functional\Events;
 
-use Enqueue\AsyncEventDispatcher\AsyncListener;
 use Enqueue\Bundle\Tests\Functional\App\TestAsyncListener;
 use Enqueue\Bundle\Tests\Functional\WebTestCase;
 use Enqueue\Client\TraceableProducer;
@@ -15,16 +14,11 @@
  */
 class AsyncSubscriberTest extends WebTestCase
 {
-    public function setUp()
+    protected function tearDown()
     {
-        parent::setUp();
+        parent::tearDown();
 
-        /** @var AsyncListener $asyncListener */
-        $asyncListener = static::$container->get('enqueue.events.async_listener');
-
-        $asyncListener->resetSyncMode();
-        static::$container->get('test_async_subscriber')->calls = [];
-        static::$container->get('test_async_listener')->calls = [];
+        static::$container = null;
     }
 
     public function testShouldNotCallRealSubscriberIfMarkedAsAsync()

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,11 @@`
`15`	`15`	`*/`
`16`	`16`	`class AsyncListenerTest extends WebTestCase`
`17`	`17`	`{`
`18`		`- public function setUp()`
	`18`	`+ protected function tearDown()`
`19`	`19`	`{`
`20`		`- parent::setUp();`
	`20`	`+ parent::tearDown();`
`21`	`21`
`22`		`- /** @var AsyncListener $asyncListener */`
`23`		`- $asyncListener = static::$container->get('enqueue.events.async_listener');`
`24`		`-`
`25`		`- $asyncListener->resetSyncMode();`
`26`		`- static::$container->get('test_async_subscriber')->calls = [];`
`27`		`- static::$container->get('test_async_listener')->calls = [];`
	`22`	`+ static::$container = null;`
`28`	`23`	`}`
`29`	`24`
`30`	`25`	`public function testShouldNotCallRealListenerIfMarkedAsAsync()`