From 7d3e4e557276ffe28442513ecd1599dcc8cd4101 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 3 Sep 2015 16:12:17 +0200 Subject: [PATCH] LinphoneUITester: do not remove chat rooms from tester, it cannot be done properly from there - only ChatTableViewController should do that --- Classes/ChatTableViewController.m | 4 ++-- Classes/KIF | 2 +- TestsUI/ChatTester.m | 6 ------ submodules/linphone | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Classes/ChatTableViewController.m b/Classes/ChatTableViewController.m index ed656c698..d0f5e94c9 100644 --- a/Classes/ChatTableViewController.m +++ b/Classes/ChatTableViewController.m @@ -50,8 +50,8 @@ #pragma mark - ViewController Functions -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; self.tableView.accessibilityIdentifier = @"ChatRoom list"; [self loadData]; } diff --git a/Classes/KIF b/Classes/KIF index 7cf06309a..d99b9a1ab 160000 --- a/Classes/KIF +++ b/Classes/KIF @@ -1 +1 @@ -Subproject commit 7cf06309ad1e5b694f1ae6f2f40c0e8d386f7f06 +Subproject commit d99b9a1ab55a655841492df9d033c1543d175990 diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m index 38005d81a..f1e50ea67 100644 --- a/TestsUI/ChatTester.m +++ b/TestsUI/ChatTester.m @@ -239,12 +239,6 @@ [tester tapViewWithAccessibilityLabel:@"Chat"]; NSTimeInterval after = [[NSDate date] timeIntervalSince1970]; - // delete all rooms from test because it takes time when done by tester - [tester tapViewWithAccessibilityLabel:@"Dialer"]; - for (MSList *it = linphone_core_get_chat_rooms(lc); it != NULL; it = it->next) { - linphone_chat_room_delete_history(it->data); - } - // conversation loading MUST be less than 1 sec XCTAssertLessThan(after - before, 1.); } diff --git a/submodules/linphone b/submodules/linphone index 434907917..08e923a41 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 434907917e933737b31b93853019f3a8c7300675 +Subproject commit 08e923a41c73ce78826c3ef93e9107e89222ce40