From a7a651f4a44be00b7be777baf4adfa76a8490c9f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 13 Sep 2017 14:39:04 +0200
Subject: [PATCH] move splitUserRemote unit tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 .../Controller/ShareesAPIControllerTest.php   | 72 ------------------
 .../Collaborators/RemotePluginTest.php        | 75 +++++++++++++++++++
 2 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
index 85b4f5ae35..80cc66afaa 100644
--- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
@@ -451,78 +451,6 @@ class ShareesAPIControllerTest extends TestCase {
 		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'isV2'));
 	}
 
-	/**
-	 * @dataProvider dataTestSplitUserRemote
-	 *
-	 * @param string $remote
-	 * @param string $expectedUser
-	 * @param string $expectedUrl
-	 */
-	public function testSplitUserRemote($remote, $expectedUser, $expectedUrl) {
-		list($remoteUser, $remoteUrl) = $this->sharees->splitUserRemote($remote);
-		$this->assertSame($expectedUser, $remoteUser);
-		$this->assertSame($expectedUrl, $remoteUrl);
-	}
-
-	public function dataTestSplitUserRemote() {
-		$userPrefix = ['user@name', 'username'];
-		$protocols = ['', 'http://', 'https://'];
-		$remotes = [
-			'localhost',
-			'local.host',
-			'dev.local.host',
-			'dev.local.host/path',
-			'dev.local.host/at@inpath',
-			'127.0.0.1',
-			'::1',
-			'::192.0.2.128',
-			'::192.0.2.128/at@inpath',
-		];
-
-		$testCases = [];
-		foreach ($userPrefix as $user) {
-			foreach ($remotes as $remote) {
-				foreach ($protocols as $protocol) {
-					$baseUrl = $user . '@' . $protocol . $remote;
-
-					$testCases[] = [$baseUrl, $user, $protocol . $remote];
-					$testCases[] = [$baseUrl . '/', $user, $protocol . $remote];
-					$testCases[] = [$baseUrl . '/index.php', $user, $protocol . $remote];
-					$testCases[] = [$baseUrl . '/index.php/s/token', $user, $protocol . $remote];
-				}
-			}
-		}
-		return $testCases;
-	}
-
-	public function dataTestSplitUserRemoteError() {
-		return array(
-			// Invalid path
-			array('user@'),
-
-			// Invalid user
-			array('@server'),
-			array('us/er@server'),
-			array('us:er@server'),
-
-			// Invalid splitting
-			array('user'),
-			array(''),
-			array('us/erserver'),
-			array('us:erserver'),
-		);
-	}
-
-	/**
-	 * @dataProvider dataTestSplitUserRemoteError
-	 *
-	 * @param string $id
-	 * @expectedException \Exception
-	 */
-	public function testSplitUserRemoteError($id) {
-		$this->sharees->splitUserRemote($id);
-	}
-
 	/**
 	 * @dataProvider dataTestFixRemoteUrl
 	 *
diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
index 4856230bf6..78ef45d014 100644
--- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php
@@ -103,6 +103,32 @@ class RemotePluginTest extends TestCase {
 		$this->assertSame($reachedEnd, $moreResults);
 	}
 
+	/**
+	 * @dataProvider dataTestSplitUserRemote
+	 *
+	 * @param string $remote
+	 * @param string $expectedUser
+	 * @param string $expectedUrl
+	 */
+	public function testSplitUserRemote($remote, $expectedUser, $expectedUrl) {
+		$this->instantiatePlugin();
+
+		list($remoteUser, $remoteUrl) = $this->plugin->splitUserRemote($remote);
+		$this->assertSame($expectedUser, $remoteUser);
+		$this->assertSame($expectedUrl, $remoteUrl);
+	}
+
+	/**
+	 * @dataProvider dataTestSplitUserRemoteError
+	 *
+	 * @param string $id
+	 * @expectedException \Exception
+	 */
+	public function testSplitUserRemoteError($id) {
+		$this->instantiatePlugin();
+		$this->plugin->splitUserRemote($id);
+	}
+
 	public function dataGetRemote() {
 		return [
 			['test', [], true, ['remotes' => [], 'exact' => ['remotes' => []]], false, true],
@@ -311,4 +337,53 @@ class RemotePluginTest extends TestCase {
 			],
 		];
 	}
+
+	public function dataTestSplitUserRemote() {
+		$userPrefix = ['user@name', 'username'];
+		$protocols = ['', 'http://', 'https://'];
+		$remotes = [
+			'localhost',
+			'local.host',
+			'dev.local.host',
+			'dev.local.host/path',
+			'dev.local.host/at@inpath',
+			'127.0.0.1',
+			'::1',
+			'::192.0.2.128',
+			'::192.0.2.128/at@inpath',
+		];
+
+		$testCases = [];
+		foreach ($userPrefix as $user) {
+			foreach ($remotes as $remote) {
+				foreach ($protocols as $protocol) {
+					$baseUrl = $user . '@' . $protocol . $remote;
+
+					$testCases[] = [$baseUrl, $user, $protocol . $remote];
+					$testCases[] = [$baseUrl . '/', $user, $protocol . $remote];
+					$testCases[] = [$baseUrl . '/index.php', $user, $protocol . $remote];
+					$testCases[] = [$baseUrl . '/index.php/s/token', $user, $protocol . $remote];
+				}
+			}
+		}
+		return $testCases;
+	}
+
+	public function dataTestSplitUserRemoteError() {
+		return array(
+			// Invalid path
+			array('user@'),
+
+			// Invalid user
+			array('@server'),
+			array('us/er@server'),
+			array('us:er@server'),
+
+			// Invalid splitting
+			array('user'),
+			array(''),
+			array('us/erserver'),
+			array('us:erserver'),
+		);
+	}
 }