Merge pull request #2228 from nextcloud/fix/mysql

Fix mysql ci
nextcloud · Oct 7, 2024 · ee49534 · ee49534
2 parents 3156c1f + 9efa644
commit ee49534
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/tests/BackgroundJobTest.php b/tests/BackgroundJobTest.php
@@ -181,13 +181,13 @@ public function testGCJob() : void {
  */
  public function singleBookmarksProvider() {
  return array_map(function ($props) {
- return Bookmark::fromArray($props + ['userId' => 'test']);
+ return Bookmark::fromArray(array_merge($props, ['userId' => 'test']));
  }, [
  'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
- 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
- 'Simple URL' => ['url' => 'https://php.net/'],
- 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
- 'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/'],
+ 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
+ 'Simple URL' => ['url' => 'https://php.net/', 'title' => '', 'description' => ''],
+ 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
+ 'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/', 'title' => '', 'description' => ''],
  ]);
  }
 }
diff --git a/tests/BookmarkControllerTest.php b/tests/BookmarkControllerTest.php
@@ -262,6 +262,7 @@ public function setupBookmarksWithPublicFolder(): void {
  $this->treeMapper->move(TreeMapper::TYPE_FOLDER, $this->folder2->getId(), $this->folder1->getId());
 
  $this->publicFolder = new PublicFolder();
+ $this->publicFolder->setDescription('');
  $this->publicFolder->setFolderId($this->folder1->getId());
  $this->publicFolderMapper->insert($this->publicFolder);
 

diff --git a/tests/BookmarkMapperTest.php b/tests/BookmarkMapperTest.php
@@ -130,13 +130,13 @@ public function testDelete(Entity $bookmark) {
  * @return array
  */
  public function singleBookmarksProvider(): array {
- return array_map(static function ($props) {
+ return array_map(function ($props) {
  return [Db\Bookmark::fromArray($props)];
  }, [
  'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
- 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
- 'Simple URL' => ['url' => 'https://php.net/'],
- 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
+ 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
+ 'Simple URL' => ['url' => 'https://php.net/', 'title' => '', 'description' => ''],
+ 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
  ]);
  }
 }
diff --git a/tests/FindTest.php b/tests/FindTest.php
@@ -90,14 +90,14 @@ public function testFindAllWithAnd() {
 
  $params = new QueryParameters();
  $bookmarks = $this->bookmarkMapper->findAll($this->userId, $params->setSearch(['.com']));
- $this->assertCount(2, $bookmarks);
+ $this->assertCount(3, $bookmarks);
  }
 
 
  public function testFindAllWithOr() {
  $params = new QueryParameters();
  $bookmarks = $this->bookmarkMapper->findAll($this->userId, $params->setSearch(['wikipedia', 'nextcloud'])->setConjunction(QueryParameters::CONJ_OR));
- $this->assertCount(2, $bookmarks);
+ $this->assertCount(3, $bookmarks);
  }
 
  public function testFindByTags() {
@@ -120,9 +120,10 @@ public function singleBookmarksProvider() {
  return [$data[0], Db\Bookmark::fromArray($data[1])];
  }, [
  [['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
- [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
- [['three', 'one'], ['url' => 'https://php.net/']],
- [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
+ [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => '']],
+ [['three', 'one'], ['url' => 'https://php.net/', 'title' => '', 'description' => '']],
+ [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => '']],
+ [[],['url' => 'https:/nextcloud/bookmarks/projects/1', 'title' => '', 'description' => '']],
  ]);
  }
 }
diff --git a/tests/FolderControllerTest.php b/tests/FolderControllerTest.php
@@ -221,6 +221,7 @@ public function setupBookmarks() {
  public function setupPublicFolder(): void {
  $this->authorizer->setUserId($this->userId);
  $this->publicFolder = new PublicFolder();
+ $this->publicFolder->setDescription('');
  $this->publicFolder->setFolderId($this->folder1->getId());
  $this->publicFolderMapper->insert($this->publicFolder);
 

diff --git a/tests/HtmlImportExportTest.php b/tests/HtmlImportExportTest.php
@@ -166,10 +166,10 @@ public function exportProvider(): array {
  return Db\Bookmark::fromArray($props);
  }, [
  ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
- ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
- ['url' => 'https://php.net/'],
- ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
- ['url' => 'https:/nextcloud/bookmarks/projects/1'],
+ ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => ''],
+ ['url' => 'https://php.net/', 'title' => '', 'description' => ''],
+ ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => ''],
+ ['url' => 'https:/nextcloud/bookmarks/projects/1', 'title' => '', 'description' => ''],
  ]),
  ];
  }

diff --git a/tests/PublicFolderTest.php b/tests/PublicFolderTest.php
@@ -70,7 +70,7 @@ protected function setUp(): void {
  $this->folder = Db\Folder::fromParams(['title' => 'test', 'userId' => $this->userId]);
  $this->folderMapper->insert($this->folder);
 
- $this->publicFolder = Db\PublicFolder::fromParams(['folderId' => $this->folder->getId()]);
+ $this->publicFolder = Db\PublicFolder::fromParams(['folderId' => $this->folder->getId(), 'description' => '']);
  $this->folderPublicMapper->insert($this->publicFolder);
  }
 

diff --git a/tests/TagMapperTest.php b/tests/TagMapperTest.php
@@ -171,9 +171,9 @@ public function singleBookmarksProvider() {
  return [$data[0], Db\Bookmark::fromArray($data[1])];
  }, [
  [['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
- [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
- [['three', 'one'], ['url' => 'https://php.net/']],
- [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
+ [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud', 'description' => '']],
+ [['three', 'one'], ['url' => 'https://php.net/', 'title' => '', 'description' => '']],
+ [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C', 'title' => '', 'description' => '']],
  ]);
  }
 }