Allow empty delimiter

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

2 files changed, 19 insertions, 3 deletions

diff --git a/tests/FolderTest.php b/tests/FolderTest.php
index c45d107aa..de6d9a9b5 100644
--- a/tests/FolderTest.php
+++ b/tests/FolderTest.php
@@ -60,6 +60,12 @@ class FolderTest extends TestCase {
 		$this->assertSame(',', $this->folder->getDelimiter());
 	}
 
+	public function testGetDelimiterNull(): void {
+		$this->mockFolder([], null);
+
+		$this->assertNull($this->folder->getDelimiter());
+	}
+
 	public function testGetAttributes() {
 		$this->mockFolder(['\noselect']);
 
diff --git a/tests/Unit/IMAP/FolderMapperTest.php b/tests/Unit/IMAP/FolderMapperTest.php
index 4a5447ea3..8ff9921f9 100644
--- a/tests/Unit/IMAP/FolderMapperTest.php
+++ b/tests/Unit/IMAP/FolderMapperTest.php
@@ -230,7 +230,10 @@ class FolderMapperTest extends TestCase {
 		$this->mapper->detectFolderSpecialUse($folders);
 	}
 
-	public function testDetectSpecialUseFromFolderName() {
+	/**
+	 * @dataProvider dataDetectSpecialUseFromFolderName
+	 */
+	public function testDetectSpecialUseFromFolderName(?string $delimiter, int $countGetDelimiter): void {
 		$folders = [
 			$this->createMock(Folder::class),
 		];
@@ -240,9 +243,9 @@ class FolderMapperTest extends TestCase {
 		$folders[0]->expects($this->once())
 			->method('getSpecialUse')
 			->willReturn([]);
-		$folders[0]->expects($this->once())
+		$folders[0]->expects($this->exactly($countGetDelimiter))
 			->method('getDelimiter')
-			->willReturn('.');
+			->willReturn($delimiter);
 		$folders[0]->expects($this->once())
 			->method('getMailbox')
 			->willReturn('Sent');
@@ -252,4 +255,11 @@ class FolderMapperTest extends TestCase {
 
 		$this->mapper->detectFolderSpecialUse($folders);
 	}
+
+	public function dataDetectSpecialUseFromFolderName(): array {
+		return [
+			'delimiter .' => ['.', 2],
+			'delimiter null' => [null, 1],
+		];
+	}
 }