From bbfafe3c2d3f8410d27d451415bbf137b873e4dc Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Thu, 29 Aug 2019 10:50:46 +0200
Subject: [PATCH] Fix risky and unreliable tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 tests/AppInfo/ApplicationTest.php                        | 2 ++
 tests/Controller/MessagesControllerTest.php              | 3 +++
 tests/FolderTest.php                                     | 2 ++
 .../Integration/Service/AvatarServiceIntegrationTest.php | 3 +++
 .../Service/MailTransmissionIntegrationTest.php          | 9 +++++++++
 tests/Service/AccountServiceTest.php                     | 1 +
 6 files changed, 20 insertions(+)

diff --git a/tests/AppInfo/ApplicationTest.php b/tests/AppInfo/ApplicationTest.php
index 2df213ad7..0fefb7ba2 100644
--- a/tests/AppInfo/ApplicationTest.php
+++ b/tests/AppInfo/ApplicationTest.php
@@ -29,6 +29,8 @@ class ApplicationTest extends TestCase {
 	public function testConstrucor() {
 		// Not really a test – it's just about code coverage
 		new Application();
+
+		$this->addToAssertionCount(1);
 	}
 
 }
diff --git a/tests/Controller/MessagesControllerTest.php b/tests/Controller/MessagesControllerTest.php
index 9efd630f4..e5b1b1504 100644
--- a/tests/Controller/MessagesControllerTest.php
+++ b/tests/Controller/MessagesControllerTest.php
@@ -92,14 +92,17 @@ class MessagesControllerTest extends TestCase {
 
 	public function testIndex() {
 		// TODO: write test
+		$this->markTestSkipped('todo');
 	}
 
 	public function testShow() {
 		// TODO: write test
+		$this->markTestSkipped('todo');
 	}
 
 	public function testShowMessageNotFound() {
 		// TODO: write test
+		$this->markTestSkipped('todo');
 	}
 
 	public function testGetHtmlBody() {
diff --git a/tests/FolderTest.php b/tests/FolderTest.php
index 512b9a37b..c0649376c 100644
--- a/tests/FolderTest.php
+++ b/tests/FolderTest.php
@@ -85,6 +85,8 @@ class FolderTest extends TestCase {
 		$this->folder->setStatus([
 			'unseen' => 4,
 		]);
+
+		$this->addToAssertionCount(1);
 	}
 
 	public function testSpecialUse() {
diff --git a/tests/Integration/Service/AvatarServiceIntegrationTest.php b/tests/Integration/Service/AvatarServiceIntegrationTest.php
index 13b6048d4..f1dd5286f 100644
--- a/tests/Integration/Service/AvatarServiceIntegrationTest.php
+++ b/tests/Integration/Service/AvatarServiceIntegrationTest.php
@@ -59,6 +59,9 @@ class AvatarServiceIntegrationTest extends TestCase {
 	}
 
 	public function testGithubFavicon() {
+		$this->markTestSkipped('does not work reliably at the moment');
+		return;
+
 		$avatar = $this->service->getAvatar('no-reply@github.com', 'jane');
 		$this->assertNotNull($avatar);
 		$this->assertEquals('https://github.githubassets.com/favicon.ico', $avatar->getUrl());
diff --git a/tests/Integration/Service/MailTransmissionIntegrationTest.php b/tests/Integration/Service/MailTransmissionIntegrationTest.php
index 5deafe547..98c24a666 100644
--- a/tests/Integration/Service/MailTransmissionIntegrationTest.php
+++ b/tests/Integration/Service/MailTransmissionIntegrationTest.php
@@ -81,7 +81,10 @@ class MailTransmissionIntegrationTest extends TestCase {
 	public function testSendMail() {
 		$message = NewMessageData::fromRequest($this->account, 'recipient@domain.com', null, null, 'greetings', 'hello there', []);
 		$reply = new RepliedMessageData($this->account, null, null);
+
 		$this->transmission->sendMessage('ferdinand', $message, $reply);
+
+		$this->addToAssertionCount(1);
 	}
 
 	public function testSendMailWithLocalAttachment() {
@@ -97,7 +100,10 @@ class MailTransmissionIntegrationTest extends TestCase {
 				],
 		]);
 		$reply = new RepliedMessageData($this->account, null, null);
+
 		$this->transmission->sendMessage('gerald', $message, $reply);
+
+		$this->addToAssertionCount(1);
 	}
 
 	public function testSendMailWithCloudAttachment() {
@@ -110,7 +116,10 @@ class MailTransmissionIntegrationTest extends TestCase {
 				],
 		]);
 		$reply = new RepliedMessageData($this->account, null, null);
+
 		$this->transmission->sendMessage($this->user->getUID(), $message, $reply);
+
+		$this->addToAssertionCount(1);
 	}
 
 	public function testSendReply() {
diff --git a/tests/Service/AccountServiceTest.php b/tests/Service/AccountServiceTest.php
index 9efc635fb..0152f7c20 100644
--- a/tests/Service/AccountServiceTest.php
+++ b/tests/Service/AccountServiceTest.php
@@ -104,6 +104,7 @@ class AccountServiceTest extends TestCase {
 
 	public function testFindNotFound() {
 		// TODO: implement code + write tests
+		$this->markTestSkipped('todo');
 	}
 
 	public function testDelete() {