Merge pull request #6923 from nupplaphil/issue/fix_tests

Fixing Unittests

tests/src/Content/Text/BBCodeTest.php

@@ -1,130 +1,133 @@
-<?php
+<?php
-
+
-namespace Friendica\Test\src\Content\Text;
+namespace Friendica\Test\src\Content\Text;
-
+
-use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\BBCode;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTest;
-use Friendica\Test\Util\AppMockTrait;
+use Friendica\Test\Util\AppMockTrait;
-use Friendica\Test\Util\L10nMockTrait;
+use Friendica\Test\Util\L10nMockTrait;
-use Friendica\Test\Util\VFSTrait;
+use Friendica\Test\Util\VFSTrait;
-
+
-/**
+/**
- * @runTestsInSeparateProcesses
+ * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
+ * @preserveGlobalState disabled
- */
+ */
-class BBCodeTest extends MockedTest
+class BBCodeTest extends MockedTest
-{
+{
-	use VFSTrait;
+	use VFSTrait;
-	use AppMockTrait;
+	use AppMockTrait;
-	use L10nMockTrait;
+	use L10nMockTrait;
-
+
-	protected function setUp()
+	protected function setUp()
-	{
+	{
-		parent::setUp();
+		parent::setUp();
-		$this->setUpVfsDir();
+		$this->setUpVfsDir();
-		$this->mockApp($this->root);
+		$this->mockApp($this->root);
-		$this->app->videowidth = 425;
+		$this->app->videowidth = 425;
-		$this->app->videoheight = 350;
+		$this->app->videoheight = 350;
-		$this->configMock->shouldReceive('get')
+		$this->configMock->shouldReceive('get')
-			->with('system', 'remove_multiplicated_lines')
+			->with('system', 'remove_multiplicated_lines')
-			->andReturn(false);
+			->andReturn(false);
-		$this->configMock->shouldReceive('get')
+		$this->configMock->shouldReceive('get')
-			->with('system', 'no_oembed')
+			->with('system', 'no_oembed')
-			->andReturn(false);
+			->andReturn(false);
-		$this->configMock->shouldReceive('get')
+		$this->configMock->shouldReceive('get')
-			->with('system', 'allowed_link_protocols')
+			->with('system', 'allowed_link_protocols')
-			->andReturn(null);
+			->andReturn(null);
-		$this->configMock->shouldReceive('get')
+		$this->configMock->shouldReceive('get')
-			->with('system', 'itemcache_duration')
+			->with('system', 'itemcache_duration')
-			->andReturn(-1);
+			->andReturn(-1);
-		$this->mockL10nT();
+		$this->configMock->shouldReceive('get')
-	}
+			->with('system', 'url')
-
+			->andReturn('friendica.local');
-	public function dataLinks()
+		$this->mockL10nT();
-	{
+	}
-		return [
+
-			/** @see https://github.com/friendica/friendica/issues/2487 */
+	public function dataLinks()
-			'bug-2487-1' => [
+	{
-				'data' => 'https://de.wikipedia.org/wiki/Juha_Sipilä',
+		return [
-				'assertHTML' => true,
+			/** @see https://github.com/friendica/friendica/issues/2487 */
-			],
+			'bug-2487-1' => [
-			'bug-2487-2' => [
+				'data' => 'https://de.wikipedia.org/wiki/Juha_Sipilä',
-				'data' => 'https://de.wikipedia.org/wiki/Dnepr_(Motorradmarke)',
+				'assertHTML' => true,
-				'assertHTML' => true,
+			],
-			],
+			'bug-2487-2' => [
-			'bug-2487-3' => [
+				'data' => 'https://de.wikipedia.org/wiki/Dnepr_(Motorradmarke)',
-				'data' => 'https://friendica.wäckerlin.ch/friendica',
+				'assertHTML' => true,
-				'assertHTML' => true,
+			],
-			],
+			'bug-2487-3' => [
-			'bug-2487-4' => [
+				'data' => 'https://friendica.wäckerlin.ch/friendica',
-				'data' => 'https://mastodon.social/@morevnaproject',
+				'assertHTML' => true,
-				'assertHTML' => true,
+			],
-			],
+			'bug-2487-4' => [
-			/** @see https://github.com/friendica/friendica/issues/5795 */
+				'data' => 'https://mastodon.social/@morevnaproject',
-			'bug-5795' => [
+				'assertHTML' => true,
-				'data' => 'https://social.nasqueron.org/@liw/100798039015010628',
+			],
-				'assertHTML' => true,
+			/** @see https://github.com/friendica/friendica/issues/5795 */
-			],
+			'bug-5795' => [
-			/** @see https://github.com/friendica/friendica/issues/6095 */
+				'data' => 'https://social.nasqueron.org/@liw/100798039015010628',
-			'bug-6095' => [
+				'assertHTML' => true,
-				'data' => 'https://en.wikipedia.org/wiki/Solid_(web_decentralization_project)',
+			],
-				'assertHTML' => true,
+			/** @see https://github.com/friendica/friendica/issues/6095 */
-			],
+			'bug-6095' => [
-			'no-protocol' => [
+				'data' => 'https://en.wikipedia.org/wiki/Solid_(web_decentralization_project)',
-				'data' => 'example.com/path',
+				'assertHTML' => true,
-				'assertHTML' => false
+			],
-			],
+			'no-protocol' => [
-			'wrong-protocol' => [
+				'data' => 'example.com/path',
-				'data' => 'ftp://example.com',
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'wrong-protocol' => [
-			'wrong-domain-without-path' => [
+				'data' => 'ftp://example.com',
-				'data' => 'http://example',
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'wrong-domain-without-path' => [
-			'wrong-domain-with-path' => [
+				'data' => 'http://example',
-				'data' => 'http://example/path',
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'wrong-domain-with-path' => [
-			'bug-6857-domain-start' => [
+				'data' => 'http://example/path',
-				'data' => "http://\nexample.com",
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'bug-6857-domain-start' => [
-			'bug-6857-domain-end' => [
+				'data' => "http://\nexample.com",
-				'data' => "http://example\n.com",
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'bug-6857-domain-end' => [
-			'bug-6857-tld' => [
+				'data' => "http://example\n.com",
-				'data' => "http://example.\ncom",
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'bug-6857-tld' => [
-			'bug-6857-end' => [
+				'data' => "http://example.\ncom",
-				'data' => "http://example.com\ntest",
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'bug-6857-end' => [
-			'bug-6901' => [
+				'data' => "http://example.com\ntest",
-				'data' => "http://example.com<ul>",
+				'assertHTML' => false
-				'assertHTML' => false
+			],
-			],
+			'bug-6901' => [
-		];
+				'data' => "http://example.com<ul>",
-	}
+				'assertHTML' => false
-
+			],
-	/**
+		];
-	 * Test convert different links inside a text
+	}
-	 * @dataProvider dataLinks
+
-	 *
+	/**
-	 * @param string $data The data to text
+	 * Test convert different links inside a text
-	 * @param bool $assertHTML True, if the link is a HTML link (<a href...>...</a>)
+	 * @dataProvider dataLinks
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 *
-	 */
+	 * @param string $data The data to text
-	public function testAutoLinking($data, $assertHTML)
+	 * @param bool $assertHTML True, if the link is a HTML link (<a href...>...</a>)
-	{
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-		$output = BBCode::convert($data);
+	 */
-		$assert = '<a href="' . $data . '" target="_blank">' . $data . '</a>';
+	public function testAutoLinking($data, $assertHTML)
-		if ($assertHTML) {
+	{
-			$this->assertEquals($assert, $output);
+		$output = BBCode::convert($data);
-		} else {
+		$assert = '<a href="' . $data . '" target="_blank">' . $data . '</a>';
-			$this->assertNotEquals($assert, $output);
+		if ($assertHTML) {
-		}
+			$this->assertEquals($assert, $output);
-	}
+		} else {
-}
+			$this->assertNotEquals($assert, $output);
+		}
+	}
+}

tests/src/Core/Console/AutomaticInstallationConsoleTest.php

@@ -54,6 +54,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 		$this->configCache = new ConfigCache();
 		$this->configCache->set('system', 'basepath', $this->root->url());
 		$this->configCache->set('config', 'php_path', trim(shell_exec('which php')));
+		$this->configCache->set('system', 'theme', 'smarty3');
 
 		$this->mockApp($this->root, null, true);
 

tests/src/Core/Console/ConfigConsoleTest.php

@@ -24,14 +24,10 @@ class ConfigConsoleTest extends ConsoleTest
 			]
 		]);
 
-		$mode = \Mockery::mock(Mode::class);
+		$this->mode
-		$mode
 			->shouldReceive('has')
 			->andReturn(true);
 
-		$this->app
-			->shouldReceive('getMode')
-			->andReturn($mode);
 	}
 
 	function testSetGetKeyValue() {