Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data

[friendica.git] / tests / src / Util / BaseURLTest.php

diff --git a/tests/src/Util/BaseURLTest.php b/tests/src/Util/BaseURLTest.php
index 1e74af39fe3937d96811b7d1bd21736830619500..79f0637e3f179a11882a02ab8fa73592759581bd 100644 (file)
--- a/tests/src/Util/BaseURLTest.php
+++ b/tests/src/Util/BaseURLTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Friendica\Test\src\Util;
 
-use Friendica\Core\Config\Configuration;
+use Friendica\App\BaseURL;
+use Friendica\Core\Config\IConfig;
 use Friendica\Test\MockedTest;
-use Friendica\Util\BaseURL;
 
 class BaseURLTest extends MockedTest
 {
@@ -173,7 +173,7 @@ class BaseURLTest extends MockedTest
         */
        public function testCheck($server, $input, $assert)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn($input['hostname']);
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn($input['urlPath']);
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($input['sslPolicy']);
@@ -201,11 +201,11 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, $server);
 
-               $this->assertEquals($assert['hostname'], $baseUrl->getHostname());
-               $this->assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
-               $this->assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
-               $this->assertEquals($assert['scheme'], $baseUrl->getScheme());
-               $this->assertEquals($assert['url'], $baseUrl->get());
+               self::assertEquals($assert['hostname'], $baseUrl->getHostname());
+               self::assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
+               self::assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
+               self::assertEquals($assert['scheme'], $baseUrl->getScheme());
+               self::assertEquals($assert['url'], $baseUrl->get());
        }
 
        public function dataSave()
@@ -295,7 +295,7 @@ class BaseURLTest extends MockedTest
         */
        public function testSave($input, $save, $url)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn($input['hostname']);
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn($input['urlPath']);
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($input['sslPolicy']);
@@ -320,7 +320,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl->save($save['hostname'], $save['sslPolicy'], $save['urlPath']);
 
-               $this->assertEquals($url, $baseUrl->get());
+               self::assertEquals($url, $baseUrl->get());
        }
 
        /**
@@ -333,7 +333,7 @@ class BaseURLTest extends MockedTest
         */
        public function testSaveByUrl($input, $save, $url)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn($input['hostname']);
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn($input['urlPath']);
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($input['sslPolicy']);
@@ -358,7 +358,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl->saveByURL($url);
 
-               $this->assertEquals($url, $baseUrl->get());
+               self::assertEquals($url, $baseUrl->get());
        }
 
        public function dataGetBaseUrl()
@@ -409,7 +409,7 @@ class BaseURLTest extends MockedTest
         */
        public function testGetURL($sslPolicy, $ssl, $url, $assert)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn('friendica.local');
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn('new/test');
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($sslPolicy);
@@ -417,7 +417,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, []);
 
-               $this->assertEquals($assert, $baseUrl->get($ssl));
+               self::assertEquals($assert, $baseUrl->get($ssl));
        }
 
        public function dataCheckRedirectHTTPS()
@@ -467,7 +467,7 @@ class BaseURLTest extends MockedTest
         */
        public function testCheckRedirectHTTPS($server, $forceSSL, $sslPolicy, $url, $redirect)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn('friendica.local');
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn('new/test');
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($sslPolicy);
@@ -476,7 +476,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, $server);
 
-               $this->assertEquals($redirect, $baseUrl->checkRedirectHttps());
+               self::assertEquals($redirect, $baseUrl->checkRedirectHttps());
        }
 
        public function dataWrongSave()
@@ -503,7 +503,7 @@ class BaseURLTest extends MockedTest
         */
        public function testWrongSave($fail)
        {
-               $configMock = \Mockery::mock(Configuration::class);
+               $configMock = \Mockery::mock(IConfig::class);
                $configMock->shouldReceive('get')->with('config', 'hostname')->andReturn('friendica.local');
                $configMock->shouldReceive('get')->with('system', 'urlpath')->andReturn('new/test');
                $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn(BaseURL::DEFAULT_SSL_SCHEME);
@@ -531,12 +531,12 @@ class BaseURLTest extends MockedTest
                }
 
                $baseUrl = new BaseURL($configMock, []);
-               $this->assertFalse($baseUrl->save('test', 10, 'nope'));
+               self::assertFalse($baseUrl->save('test', 10, 'nope'));
 
                // nothing should have changed because we never successfully saved anything
-               $this->assertEquals($baseUrl->getHostname(), 'friendica.local');
-               $this->assertEquals($baseUrl->getUrlPath(), 'new/test');
-               $this->assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
-               $this->assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
+               self::assertEquals('friendica.local', $baseUrl->getHostname());
+               self::assertEquals('new/test', $baseUrl->getUrlPath());
+               self::assertEquals(BaseURL::DEFAULT_SSL_SCHEME, $baseUrl->getSSLPolicy());
+               self::assertEquals('http://friendica.local/new/test', $baseUrl->get());
        }
 }