]> source.dussan.org Git - nextcloud-server.git/commitdiff
Tests
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Fri, 26 Oct 2018 17:01:38 +0000 (19:01 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Thu, 1 Nov 2018 14:00:49 +0000 (15:00 +0100)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
lib/private/Repair/NC15/SetVcardDatabaseUID.php
tests/lib/Repair/SetVcardDatabaseUIDTest.php [new file with mode: 0644]

index e82a0aad18a130c687f4920c0fb1983101a0cdc1..4d2805247bf7cdd8dddef0c38cf010a2569e4e27 100644 (file)
@@ -71,7 +71,7 @@ class SetVcardDatabaseUID implements IRepairStep {
        }
 
        private function getUid($carddata) {
-               preg_match('/^UID:(.*)$/m', $carddata, $matches);
+               preg_match('/UID:(.*)$/m', $carddata, $matches);
                if (count($matches) > 1) {
                        return $matches[1];
                }
diff --git a/tests/lib/Repair/SetVcardDatabaseUIDTest.php b/tests/lib/Repair/SetVcardDatabaseUIDTest.php
new file mode 100644 (file)
index 0000000..59a115b
--- /dev/null
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @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\Repair;
+
+use OCP\IConfig;
+use OC\Repair\NC15\SetVcardDatabaseUID;
+use Test\TestCase;
+
+/**
+ * @group DB
+ */
+class SetVcardDatabaseUIDTest extends TestCase {
+
+       /** @var SetVcardDatabaseUID */
+       private $repair;
+
+       /** @var IConfig */
+       private $config;
+
+       protected function setUp() {
+               parent::setUp();
+
+               $this->config = $this->createMock(IConfig::class);
+               $this->repair = new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), $this->config);
+       }
+
+       protected function tearDown() {
+               return parent::tearDown();
+       }
+
+       public function dataTestVcards() {
+               return [
+                       // classic vcard
+                       ['BEGIN:VCARD
+                       VERSION:3.0
+                       PRODID:-//Sabre//Sabre VObject 4.1.2//EN
+                       UID:Test
+                       FN:Test
+                       N:Test;;;;
+                       END:VCARD', 'Test'],
+
+                       // UID as url
+                       ['BEGIN:VCARD
+                       VERSION:3.0
+                       PRODID:-//Sabre//Sabre VObject 4.1.2//EN
+                       UID:https://User@old.domain.com/remote.php/carddav/addressbooks/User/contacts/2EAF6525-17ADC861-38D6BB1D.vcf
+                       FN:Test
+                       N:Test;;;;
+                       END:VCARD', 'https://User@old.domain.com/remote.php/carddav/addressbooks/User/contacts/2EAF6525-17ADC861-38D6BB1D.vcf'],
+
+                       // No uid
+                       ['BEGIN:VCARD
+                       VERSION:3.0
+                       PRODID:-//Sabre//Sabre VObject 4.1.2//EN
+                       FN:Test
+                       N:Test;;;;
+                       END:VCARD', false]
+               ];
+       }
+
+       /**
+        * @dataProvider dataTestVcards
+        *
+        * @param string $from
+        * @param string|boolean $expected
+        */
+       public function testExtractUIDFromVcard($from, $expected) {
+               $uid = $this->invokePrivate($this->repair, 'getUid', ['carddata' => $from]);
+               $this->assertEquals($expected, $uid);
+       }
+
+       public function shouldRunDataProvider() {
+               return [
+                       ['11.0.0.0', true],
+                       ['15.0.0.3', false],
+                       ['13.0.5.2', true],
+                       ['12.0.0.0', true],
+                       ['16.0.0.1', false],
+                       ['15.0.0.2', true],
+                       ['13.0.0.0', true],
+                       ['13.0.0.1', true]
+               ];
+       }
+
+       /**
+        * @dataProvider shouldRunDataProvider
+        *
+        * @param string $from
+        * @param boolean $expected
+        */
+       public function testShouldRun($from, $expected) {
+               $this->config->expects($this->any())
+                      ->method('getSystemValue')
+                      ->with('version', '0.0.0.0')
+                      ->willReturn($from);
+
+               $this->assertEquals($expected, $this->invokePrivate($this->repair, 'shouldRun'));
+       }
+
+}
\ No newline at end of file