From 73c9d923e7cc77847cfcbff4b90ad4815699a4fa Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 22 Aug 2018 03:10:08 +0200
Subject: Renamed RoutingServiceProvider to Http\UrlGeneratorServiceProvider

---
 tests/Unit/HelpersTest.php                         |  4 +-
 .../Unit/Http/UrlGeneratorServiceProviderTest.php  | 29 ++++++++++++
 tests/Unit/Http/UrlGeneratorTest.php               | 51 ++++++++++++++++++++++
 tests/Unit/Routing/RoutingServiceProviderTest.php  | 29 ------------
 tests/Unit/Routing/UrlGeneratorTest.php            | 51 ----------------------
 5 files changed, 82 insertions(+), 82 deletions(-)
 create mode 100644 tests/Unit/Http/UrlGeneratorServiceProviderTest.php
 create mode 100644 tests/Unit/Http/UrlGeneratorTest.php
 delete mode 100644 tests/Unit/Routing/RoutingServiceProviderTest.php
 delete mode 100644 tests/Unit/Routing/UrlGeneratorTest.php

(limited to 'tests/Unit')

diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index 82030169..b59b11ee 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -8,7 +8,7 @@ use Engelsystem\Container\Container;
 use Engelsystem\Http\Request;
 use Engelsystem\Http\Response;
 use Engelsystem\Renderer\Renderer;
-use Engelsystem\Routing\UrlGenerator;
+use Engelsystem\Http\UrlGenerator;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -202,7 +202,7 @@ class HelpersTest extends TestCase
         $urlGeneratorMock = $this->getMockBuilder(UrlGenerator::class)
             ->getMock();
 
-        $this->getAppMock('routing.urlGenerator', $urlGeneratorMock);
+        $this->getAppMock('http.urlGenerator', $urlGeneratorMock);
         $this->assertEquals($urlGeneratorMock, url());
 
         $urlGeneratorMock->expects($this->once())
diff --git a/tests/Unit/Http/UrlGeneratorServiceProviderTest.php b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php
new file mode 100644
index 00000000..f3d5e018
--- /dev/null
+++ b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Routing;
+
+use Engelsystem\Http\UrlGenerator;
+use Engelsystem\Http\UrlGeneratorServiceProvider;
+use Engelsystem\Test\Unit\ServiceProviderTest;
+use PHPUnit_Framework_MockObject_MockObject;
+
+class UrlGeneratorServiceProviderTest extends ServiceProviderTest
+{
+    /**
+     * @covers \Engelsystem\Http\UrlGeneratorServiceProvider::register()
+     */
+    public function testRegister()
+    {
+        /** @var PHPUnit_Framework_MockObject_MockObject|UrlGenerator $urlGenerator */
+        $urlGenerator = $this->getMockBuilder(UrlGenerator::class)
+            ->getMock();
+
+        $app = $this->getApp();
+
+        $this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator);
+        $this->setExpects($app, 'instance', ['http.urlGenerator', $urlGenerator]);
+
+        $serviceProvider = new UrlGeneratorServiceProvider($app);
+        $serviceProvider->register();
+    }
+}
diff --git a/tests/Unit/Http/UrlGeneratorTest.php b/tests/Unit/Http/UrlGeneratorTest.php
new file mode 100644
index 00000000..89ffa7dd
--- /dev/null
+++ b/tests/Unit/Http/UrlGeneratorTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Routing;
+
+use Engelsystem\Application;
+use Engelsystem\Container\Container;
+use Engelsystem\Http\Request;
+use Engelsystem\Http\UrlGenerator;
+use PHPUnit\Framework\TestCase;
+
+class UrlGeneratorTest extends TestCase
+{
+    public function provideLinksTo()
+    {
+        return [
+            ['/foo/path', '/foo/path', 'http://foo.bar/foo/path', [], 'http://foo.bar/foo/path'],
+            ['foo', '/foo', 'https://foo.bar/foo', [], 'https://foo.bar/foo'],
+            ['foo', '/foo', 'http://f.b/foo', ['test' => 'abc', 'bla' => 'foo'], 'http://f.b/foo?test=abc&bla=foo'],
+        ];
+    }
+
+    /**
+     * @dataProvider provideLinksTo
+     * @covers       \Engelsystem\Http\UrlGenerator::to
+     *
+     * @param string   $path
+     * @param string   $willReturn
+     * @param string   $urlToPath
+     * @param string[] $arguments
+     * @param string   $expectedUrl
+     */
+    public function testTo($urlToPath, $path, $willReturn, $arguments, $expectedUrl)
+    {
+        $app = new Container();
+        $urlGenerator = new UrlGenerator();
+        Application::setInstance($app);
+
+        $request = $this->getMockBuilder(Request::class)
+            ->getMock();
+
+        $request->expects($this->once())
+            ->method('getUriForPath')
+            ->with($path)
+            ->willReturn($willReturn);
+
+        $app->instance('request', $request);
+
+        $url = $urlGenerator->to($urlToPath, $arguments);
+        $this->assertEquals($expectedUrl, $url);
+    }
+}
diff --git a/tests/Unit/Routing/RoutingServiceProviderTest.php b/tests/Unit/Routing/RoutingServiceProviderTest.php
deleted file mode 100644
index dd9441eb..00000000
--- a/tests/Unit/Routing/RoutingServiceProviderTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Engelsystem\Test\Unit\Routing;
-
-use Engelsystem\Routing\RoutingServiceProvider;
-use Engelsystem\Routing\UrlGenerator;
-use Engelsystem\Test\Unit\ServiceProviderTest;
-use PHPUnit_Framework_MockObject_MockObject;
-
-class RoutingServiceProviderTest extends ServiceProviderTest
-{
-    /**
-     * @covers \Engelsystem\Routing\RoutingServiceProvider::register()
-     */
-    public function testRegister()
-    {
-        /** @var PHPUnit_Framework_MockObject_MockObject|UrlGenerator $urlGenerator */
-        $urlGenerator = $this->getMockBuilder(UrlGenerator::class)
-            ->getMock();
-
-        $app = $this->getApp();
-
-        $this->setExpects($app, 'make', [UrlGenerator::class], $urlGenerator);
-        $this->setExpects($app, 'instance', ['routing.urlGenerator', $urlGenerator]);
-
-        $serviceProvider = new RoutingServiceProvider($app);
-        $serviceProvider->register();
-    }
-}
diff --git a/tests/Unit/Routing/UrlGeneratorTest.php b/tests/Unit/Routing/UrlGeneratorTest.php
deleted file mode 100644
index 6da59a4f..00000000
--- a/tests/Unit/Routing/UrlGeneratorTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Engelsystem\Test\Unit\Routing;
-
-use Engelsystem\Application;
-use Engelsystem\Container\Container;
-use Engelsystem\Http\Request;
-use Engelsystem\Routing\UrlGenerator;
-use PHPUnit\Framework\TestCase;
-
-class UrlGeneratorTest extends TestCase
-{
-    public function provideLinksTo()
-    {
-        return [
-            ['/foo/path', '/foo/path', 'http://foo.bar/foo/path', [], 'http://foo.bar/foo/path'],
-            ['foo', '/foo', 'https://foo.bar/foo', [], 'https://foo.bar/foo'],
-            ['foo', '/foo', 'http://f.b/foo', ['test' => 'abc', 'bla' => 'foo'], 'http://f.b/foo?test=abc&bla=foo'],
-        ];
-    }
-
-    /**
-     * @dataProvider provideLinksTo
-     * @covers       \Engelsystem\Routing\UrlGenerator::to
-     *
-     * @param string   $path
-     * @param string   $willReturn
-     * @param string   $urlToPath
-     * @param string[] $arguments
-     * @param string   $expectedUrl
-     */
-    public function testTo($urlToPath, $path, $willReturn, $arguments, $expectedUrl)
-    {
-        $app = new Container();
-        $urlGenerator = new UrlGenerator();
-        Application::setInstance($app);
-
-        $request = $this->getMockBuilder(Request::class)
-            ->getMock();
-
-        $request->expects($this->once())
-            ->method('getUriForPath')
-            ->with($path)
-            ->willReturn($willReturn);
-
-        $app->instance('request', $request);
-
-        $url = $urlGenerator->to($urlToPath, $arguments);
-        $this->assertEquals($expectedUrl, $url);
-    }
-}
-- 
cgit v1.2.3-54-g00ecf