diff -r b64c8c35c67d -r d2e6ee099125 server/src/tests/Services/GeonamesResolverTest.php --- a/server/src/tests/Services/GeonamesResolverTest.php Sat Jun 10 22:43:58 2017 +0200 +++ b/server/src/tests/Services/GeonamesResolverTest.php Mon Jun 12 14:53:59 2017 +0200 @@ -28,7 +28,7 @@ array_push($responses, new Response(200, [], file_get_contents(self::TEST_INPUT_DOCS[$key]))); } else { - array_push($responses, new Response(intval($key))); + array_push($responses, new Response(intval($key))); } } @@ -45,7 +45,7 @@ foreach(self::TEST_INPUT_DOCS as $key => $inputDoc) { $this->inputGraphes[$key] = new EasyRdf\Graph(config('corpusparole.geonames_base_url').$key."/", file_get_contents($inputDoc)); } - } + } /** * Just test the setup. @@ -65,7 +65,7 @@ $container = []; $client = $this->getClient(['2968801'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $label = $resolver->getLabel('2968801'); $this->assertEquals('Villedieu-les-Poêles', $label, "Label is Villedieu-les-Poêles"); @@ -84,7 +84,7 @@ $container = []; $client = $this->getClient(['2988507'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $label = $resolver->getLabel('2988507'); $this->assertEquals('Paris', $label, "Label is Paris"); @@ -103,7 +103,7 @@ $container = []; $client = $this->getClient(['6255148'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $label = $resolver->getLabel('6255148'); $this->assertEquals('Europe', $label, "Label is Europe"); @@ -122,12 +122,12 @@ $container = []; $client = $this->getClient(['404'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $name = $resolver->getLabel('12345'); $this->assertNull($name); - + $this->assertCount(1, $container); $this->assertEquals("http://sws.geonames.org/12345/", (string)$container[0]['request']->getUri()); @@ -140,12 +140,12 @@ $container = []; $client = $this->getClient(['6255148'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $name = $resolver->getLabel('12345'); $this->assertNull($name); - + $this->assertCount(1, $container); $this->assertEquals("http://sws.geonames.org/12345/", (string)$container[0]['request']->getUri()); @@ -159,7 +159,7 @@ $container = []; $client = $this->getClient(['2968801', '2988507', '6255148'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $labels = $resolver->getLabels(['2968801', '2988507', '6255148']); $this->assertEquals(['2968801' => 'Villedieu-les-Poêles', '2988507' => 'Paris', '6255148' => 'Europe'] , $labels); @@ -182,7 +182,7 @@ $container = []; $client = $this->getClient(['401'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $name = $resolver->getLabel('12345'); } @@ -198,7 +198,7 @@ $container = []; $client = $this->getClient(['500'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $name = $resolver->getLabel('12345'); } @@ -213,7 +213,7 @@ $container = []; $client = $this->getClient(['200'], $container); - $resolver = $this->app->make('CorpusParole\Services\GeonamesResolver', [$client]); + $resolver = new \CorpusParole\Services\GeonamesResolver($client); $name = $resolver->getLabel('abcd'); }