Add more tests for discovery (#192)

* Added failing tests for #188

* Use the actual discovery function

* Fixed tests

* Applied changes from StyleCI

Author: Nyholm

Discovery/ConfiguredClientsStrategy.php

@@ -35,6 +35,7 @@ public function __construct(HttpClient $httpClient = null, HttpAsyncClient $asyn
     {
         self::$client = $httpClient;
         self::$asyncClient = $asyncClient;
+        HttpClientDiscovery::clearCache();
     }
 
     /**

Tests/Functional/DiscoveredClientsTest.php

@@ -5,9 +5,14 @@
 use Http\Client\Common\PluginClient;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\Discovery\HttpAsyncClientDiscovery;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Strategy\CommonClassesStrategy;
 use Http\HttplugBundle\Collector\StackPlugin;
+use Http\HttplugBundle\Discovery\ConfiguredClientsStrategy;
 use Nyholm\NSA;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\EventDispatcher\Event;
 
 class DiscoveredClientsTest extends WebTestCase
 {
@@ -71,6 +76,31 @@ public function testDiscoveredAsyncClientWithProfilingEnabled()
         $this->assertEquals('auto_discovered_async', NSA::getProperty($plugins[0], 'client'));
     }
 
+    /**
+     * Test with httplug.discovery.client: "auto".
+     */
+    public function testDiscovery()
+    {
+        $container = $this->getContainer(true);
+
+        $this->assertTrue($container->has('httplug.auto_discovery.auto_discovered_client'));
+        $this->assertTrue($container->has('httplug.auto_discovery.auto_discovered_async'));
+        $this->assertTrue($container->has('httplug.strategy'));
+
+        $container->get('httplug.strategy');
+
+        $httpClient = $container->get('httplug.auto_discovery.auto_discovered_client');
+        $httpAsyncClient = $container->get('httplug.auto_discovery.auto_discovered_async');
+
+        $this->assertInstanceOf(PluginClient::class, $httpClient);
+        $this->assertSame(HttpClientDiscovery::find(), $httpClient);
+        $this->assertInstanceOf(PluginClient::class, $httpAsyncClient);
+        $this->assertSame(HttpAsyncClientDiscovery::find(), $httpAsyncClient);
+    }
+
+    /**
+     * Test with httplug.discovery.client: null.
+     */
     public function testDisabledDiscovery()
     {
         $container = $this->getContainer(true, 'discovery_disabled');
@@ -80,6 +110,9 @@ public function testDisabledDiscovery()
         $this->assertFalse($container->has('httplug.strategy'));
     }
 
+    /**
+     * Test with httplug.discovery.client: "httplug.client.acme".
+     */
     public function testForcedDiscovery()
     {
         $container = $this->getContainer(true, 'discovery_forced');
@@ -88,10 +121,10 @@ public function testForcedDiscovery()
         $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_async'));
         $this->assertTrue($container->has('httplug.strategy'));
 
-        $strategy = $container->get('httplug.strategy');
+        $container->get('httplug.strategy');
 
-        $this->assertEquals($container->get('httplug.client.acme'), NSA::getProperty($strategy, 'client'));
-        $this->assertEquals($container->get('httplug.client.acme'), NSA::getProperty($strategy, 'asyncClient'));
+        $this->assertEquals($container->get('httplug.client.acme'), HttpClientDiscovery::find());
+        $this->assertEquals($container->get('httplug.client.acme'), HttpAsyncClientDiscovery::find());
     }
 
     private function getContainer($debug, $environment = 'test')
@@ -100,4 +133,14 @@ private function getContainer($debug, $environment = 'test')
 
         return static::$kernel->getContainer();
     }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        // Reset values
+        $strategy = new ConfiguredClientsStrategy(null, null, null);
+        HttpClientDiscovery::setStrategies([CommonClassesStrategy::class]);
+        $strategy->onEvent(new Event());
+    }
 }