Backend work to provide NC whats New info to users

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

3 files changed, 165 insertions, 2 deletions

diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php
index 3008e0a239c..be842cf12c7 100644
--- a/tests/lib/L10N/FactoryTest.php
+++ b/tests/lib/L10N/FactoryTest.php
@@ -14,6 +14,7 @@ use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\L10N\ILanguageIterator;
 use Test\TestCase;
 
 /**
@@ -596,4 +597,33 @@ class FactoryTest extends TestCase {
 		$this->assertSame($expected, $result);
 	}
 
+	public function languageIteratorRequestProvider():array {
+		return [
+			[ true, $this->createMock(IUser::class)],
+			[ false, $this->createMock(IUser::class)],
+			[ false, null]
+		];
+	}
+
+	/**
+	 * @dataProvider languageIteratorRequestProvider
+	 */
+	public function testGetLanguageIterator(bool $hasSession, IUser $iUserMock = null) {
+		$factory = $this->getFactory();
+
+		if($iUserMock === null) {
+			$matcher  = $this->userSession->expects($this->once())
+				->method('getUser');
+
+			if($hasSession) {
+				$matcher->willReturn($this->createMock(IUser::class));
+			} else {
+				$this->expectException(\RuntimeException::class);
+			}
+		}
+
+		$iterator = $factory->getLanguageIterator($iUserMock);
+		$this->assertInstanceOf(ILanguageIterator::class, $iterator);
+	}
+
 }
diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/lib/L10N/LanguageIteratorTest.php
new file mode 100644
index 00000000000..c8b1b24685f
--- /dev/null
+++ b/tests/lib/L10N/LanguageIteratorTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\L10N;
+
+use OC\L10N\LanguageIterator;
+use OCP\IConfig;
+use OCP\IUser;
+use Test\TestCase;
+
+class LanguageIteratorTest extends TestCase {
+	/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
+	protected $user;
+	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+	/** @var LanguageIterator */
+	protected $iterator;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->user = $this->createMock(IUser::class);
+		$this->config = $this->createMock(IConfig::class);
+
+		$this->iterator = new LanguageIterator($this->user, $this->config);
+	}
+
+	public function languageSettingsProvider() {
+		return [
+			// all language settings set
+			[ 'de_DE', 'es_CU', 'zh_TW', ['de_DE', 'de', 'es_CU', 'es', 'zh_TW', 'zh', 'en']],
+			[ 'de', 'es', 'zh', ['de', 'es', 'zh', 'en']],
+			[ 'en', 'en', 'en', ['en', 'en', 'en', 'en']],
+			// one possible setting is missing each
+			[ false, 'es_CU', 'zh_TW', ['es_CU', 'es', 'zh_TW', 'zh', 'en']],
+			[ false, 'es', 'zh_TW', ['es', 'zh_TW', 'zh', 'en']],
+			[ false, 'es_CU', 'zh', ['es_CU', 'es', 'zh', 'en']],
+			[ 'de_DE', null, 'zh_TW', ['de_DE', 'de', 'zh_TW', 'zh', 'en']],
+			[ 'de_DE', null, 'zh', ['de_DE', 'de', 'zh', 'en']],
+			[ 'de', null, 'zh_TW', ['de', 'zh_TW', 'zh', 'en']],
+			[ 'de_DE', 'es_CU', 'en', ['de_DE', 'de', 'es_CU', 'es', 'en', 'en']],
+			[ 'de', 'es_CU', 'en', ['de', 'es_CU', 'es', 'en', 'en']],
+			[ 'de_DE', 'es', 'en', ['de_DE', 'de', 'es', 'en', 'en']],
+			// two possible settings are missing each
+			[ false, null, 'zh_TW', ['zh_TW', 'zh', 'en']],
+			[ false, null, 'zh', ['zh', 'en']],
+			[ false, 'es_CU', 'en', ['es_CU', 'es', 'en', 'en']],
+			[ false, 'es', 'en', ['es', 'en', 'en']],
+			[ 'de_DE', null, 'en', ['de_DE', 'de', 'en', 'en']],
+			[ 'de', null, 'en', ['de', 'en', 'en']],
+			// nothing is set
+			[ false, null, 'en', ['en', 'en']],
+
+		];
+	}
+
+	/**
+	 * @dataProvider languageSettingsProvider
+	 */
+	public function testIterator($forcedLang, $userLang, $sysLang, $expectedValues) {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->willReturnMap([
+				['force_language', false, $forcedLang],
+				['default_language', 'en', $sysLang],
+			]);
+		$this->config->expects($this->any())
+			->method('getUserValue')
+			->willReturn($userLang);
+
+		foreach ($expectedValues as $expected) {
+			$this->assertTrue($this->iterator->valid());
+			$this->assertSame($expected, $this->iterator->current());
+			$this->iterator->next();
+		}
+		$this->assertFalse($this->iterator->valid());
+	}
+}
diff --git a/tests/lib/Updater/ChangesCheckTest.php b/tests/lib/Updater/ChangesCheckTest.php
index cbb298647d0..fe25e8cebaf 100644
--- a/tests/lib/Updater/ChangesCheckTest.php
+++ b/tests/lib/Updater/ChangesCheckTest.php
@@ -29,11 +29,11 @@ namespace Test\Updater;
 use OC\Updater\ChangesCheck;
 use OC\Updater\ChangesMapper;
 use OC\Updater\ChangesResult;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
 use OCP\ILogger;
-use const Solarium\QueryType\Select\Query\Component\Facet\INCLUDE_LOWER;
 use Test\TestCase;
 
 class ChangesCheckTest extends TestCase {
@@ -338,7 +338,42 @@ class ChangesCheckTest extends TestCase {
 	 * @dataProvider versionProvider
 	 */
 	public function testNormalizeVersion(string $input, string $expected) {
-		$normalized = $this->invokePrivate($this->checker, 'normalizeVersion', [$input]);
+		$normalized = $this->checker->normalizeVersion($input);
 		$this->assertSame($expected, $normalized);
 	}
+
+	public function changeDataProvider():array {
+		$testDataFound = $testDataNotFound = $this->versionProvider();
+		array_walk($testDataFound, function(&$params) { $params[] = true; });
+		array_walk($testDataNotFound, function(&$params) { $params[] = false; });
+		return array_merge($testDataFound, $testDataNotFound);
+	}
+
+	/**
+	 * @dataProvider changeDataProvider
+	 *
+	 */
+	public function testGetChangesForVersion(string $inputVersion, string $normalizedVersion, bool $isFound) {
+		$mocker = $this->mapper->expects($this->once())
+			->method('getChanges')
+			->with($normalizedVersion);
+
+		if(!$isFound) {
+			$this->expectException(DoesNotExistException::class);
+			$mocker->willThrowException(new DoesNotExistException('Changes info is not present'));
+		} else {
+			$entry = $this->createMock(ChangesResult::class);
+			$entry->expects($this->once())
+				->method('__call')
+				->with('getData')
+				->willReturn('{"changelogURL":"https:\/\/nextcloud.com\/changelog\/#13-0-0","whatsNew":{"en":{"regular":["Refined user interface","End-to-end Encryption","Video and Text Chat"],"admin":["Changes to the Nginx configuration","Theming: CSS files were consolidated"]},"de":{"regular":["\u00dcberarbeitete Benutzerschnittstelle","Ende-zu-Ende Verschl\u00fcsselung","Video- und Text-Chat"],"admin":["\u00c4nderungen an der Nginx Konfiguration","Theming: CSS Dateien wurden konsolidiert"]}}}');
+
+			$mocker->willReturn($entry);
+		}
+
+		/** @noinspection PhpUnhandledExceptionInspection */
+		$data = $this->checker->getChangesForVersion($inputVersion);
+		$this->assertTrue(isset($data['whatsNew']['en']['regular']));
+		$this->assertTrue(isset($data['changelogURL']));
+	}
 }