From f383aa0bfb43ed3647dc9e539cdecc4f5d2eb0c8 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 6 Jan 2016 10:51:41 +0100
Subject: [PATCH] UITester: fix latest failing tests

---
 README.md            |  2 +-
 TestsUI/ChatTester.m | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f7de8f8d7..ab27c85e3 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ various ways:
 
 ## Help on translations
 
-<a target="_blank" style="text-decoration:none; color:black; font-size:66%" href="https://transifex.com/projects/p/linphone-ios/resource/localizablestrings/"
+<a target="_blank" style="text-decoration:none; color:black; font-size:66%" href="https://www.transifex.com/belledonne-communications/linphone-ios/"
 title="See more information on Transifex.com">Top translations: linphone-ios</a><br/>
 <img border="0" src="https://transifex.com/projects/p/linphone-ios/resource/localizablestrings/chart/image_png"/><br/><a target="_blank" href="/"><img border="0" src="https://ds0k0en9abmn1.cloudfront.net/static/charts/images/tx-logo-micro.646b0065fce6.png"/></a>
 
diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m
index b0bad82f1..290159000 100644
--- a/TestsUI/ChatTester.m
+++ b/TestsUI/ChatTester.m
@@ -16,8 +16,6 @@
 - (void)beforeAll {
 	[super beforeAll];
 	[self switchToValidAccountIfNeeded];
-	// turn off logs for chat tests because there are way to much logs in liblinphone in filetransfer and sqlite
-	linphone_core_set_log_level(ORTP_WARNING);
 }
 
 - (void)beforeEach {
@@ -29,7 +27,6 @@
 
 - (void)afterAll {
 	[super afterAll];
-	linphone_core_set_log_level(ORTP_MESSAGE);
 	// at the end of tests, go back to chat rooms to display main bar
 	[self goBackFromChat];
 	ASSERT_EQ([LinphoneManager instance].fileTransferDelegates.count, 0)
@@ -182,6 +179,12 @@
 	int count = 0;
 	LinphoneCore *lc = [LinphoneManager getLc];
 	LinphoneChatRoom *room = linphone_core_get_chat_room_from_uri(lc, [[self me] UTF8String]);
+
+	NSTimeInterval beforeEmpty = [[NSDate date] timeIntervalSince1970];
+	[self startChatWith:[self me]];
+	NSTimeInterval afterEmpty = [[NSDate date] timeIntervalSince1970];
+	[self goBackFromChat];
+
 	// generate lots of messages...
 	for (; count < 50; count++) {
 		LinphoneChatMessage *msg =
@@ -204,8 +207,8 @@
 	[self startChatWith:[self me]];
 	NSTimeInterval after = [[NSDate date] timeIntervalSince1970];
 
-	// conversation loading MUST be less than 1 sec - opening an empty conversation is around 2.15 sec
-	XCTAssertLessThan(after - before, 2.15 + 1.);
+	// conversation loading MUST be less than 1 sec - loading messages only
+	XCTAssertLessThan(after - before, afterEmpty - beforeEmpty + 1.);
 }
 
 - (void)testRemoveAllChats {
@@ -283,7 +286,7 @@
 	[self uploadImageWithQuality:@"Minimum"];
 	UITableView *tv = [self findTableView:@"ChatRoom list"];
 	// wait for ALL uploads to terminate...
-	for (int i = 0; i < 45; i++) {
+	for (int i = 0; i < 90; i++) {
 		[tester waitForTimeInterval:1.f];
 		if ([tv numberOfRowsInSection:0] == 4)
 			break;