From 9d0fd05d1e3d2fc3ee81e9d94b84c8c0165b6f47 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 10 Mar 2016 16:55:55 +0100
Subject: [PATCH] TestsUI: add contact swipe delete and push notification tests

---
 Classes/ContactsListView.m                    |  1 +
 Classes/KIF                                   |  2 +-
 .../Base.lproj/UIContactDetailsCell.xib       |  2 +-
 TestsUI/ContactsTester.m                      | 14 +++++++++
 TestsUI/NotificationTester.h                  | 12 ++++++++
 TestsUI/NotificationTester.m                  | 29 +++++++++++++++++++
 linphone.xcodeproj/project.pbxproj            |  6 ++++
 7 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 TestsUI/NotificationTester.h
 create mode 100644 TestsUI/NotificationTester.m

diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index dbb6c0dcc..65ffef68d 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -105,6 +105,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewDidLoad {
 	[super viewDidLoad];
+	tableController.tableView.accessibilityIdentifier = @"Contacts table";
 	[self changeView:ContactsLinphone];
 	if ([tableController totalNumberOfItems] == 0) {
 		[self changeView:ContactsAll];
diff --git a/Classes/KIF b/Classes/KIF
index 2e2e314a4..9b42150f8 160000
--- a/Classes/KIF
+++ b/Classes/KIF
@@ -1 +1 @@
-Subproject commit 2e2e314a44aa9e3949fd54c75baff376af526493
+Subproject commit 9b42150f800c618f6ef308067eeb8221fddab2b3
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
index 73b2b6628..7ccaeab36 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
@@ -31,7 +31,7 @@
                             <color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <rect key="contentStretch" x="1.3877787807814457e-17" y="0.0" width="1" height="1"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                            <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done"/>
                         </textField>
                         <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="C2f-aP-xjR" userLabel="deleteButton" customClass="UIIconButton">
                             <rect key="frame" x="335" y="7" width="40" height="30"/>
diff --git a/TestsUI/ContactsTester.m b/TestsUI/ContactsTester.m
index b2571ecd6..520bee4a1 100644
--- a/TestsUI/ContactsTester.m
+++ b/TestsUI/ContactsTester.m
@@ -9,6 +9,7 @@
 #import "ContactsTester.h"
 
 #import "ContactDetailsTableView.h"
+#import "UIContactCell.h"
 
 @implementation ContactsTester
 
@@ -135,6 +136,19 @@
 	[tester tapViewWithAccessibilityLabel:@"DELETE" traits:UIAccessibilityTraitButton];
 }
 
+- (void)testDeleteContactWithSwipe {
+	NSString *contactName = [self getUUID];
+	[self createContact:contactName lastName:@"dummy" phoneNumber:@"123" SIPAddress:@"ola"];
+	[tester tapViewWithAccessibilityLabel:@"Back"];
+	NSString *fullName = [contactName stringByAppendingString:@" dummy"];
+
+	[tester swipeViewWithAccessibilityLabel:fullName inDirection:KIFSwipeDirectionLeft];
+	[tester tapViewWithAccessibilityLabel:@"Delete"];
+
+	// we should not find this contact anymore
+	XCTAssert([tester tryFindingViewWithAccessibilityLabel:fullName error:nil] == NO);
+}
+
 - (void)testEditContact {
 	NSString *contactName = [self getUUID];
 	[self createContact:contactName lastName:@"dummy" phoneNumber:nil SIPAddress:nil];
diff --git a/TestsUI/NotificationTester.h b/TestsUI/NotificationTester.h
new file mode 100644
index 000000000..31eaa1af4
--- /dev/null
+++ b/TestsUI/NotificationTester.h
@@ -0,0 +1,12 @@
+//
+//  NotificationTester.h
+//  linphone
+//
+//  Created by Gautier Pelloux-Prayer on 10/03/16.
+//
+//
+#import "LinphoneTestCase.h"
+
+@interface NotificationTester : LinphoneTestCase
+
+@end
diff --git a/TestsUI/NotificationTester.m b/TestsUI/NotificationTester.m
new file mode 100644
index 000000000..981ec2b2c
--- /dev/null
+++ b/TestsUI/NotificationTester.m
@@ -0,0 +1,29 @@
+//
+//  NotificationTester.m
+//  linphone
+//
+//  Created by Gautier Pelloux-Prayer on 10/03/16.
+//
+//
+
+#import "NotificationTester.h"
+
+@implementation NotificationTester
+
+- (void)beforeAll {
+	[super beforeAll];
+	[self switchToValidAccountIfNeeded];
+}
+
+- (void)testCallNotificationInBackground {
+#if !TARGET_OS_SIMULATOR
+	const LinphoneAddress *addr =
+		linphone_proxy_config_get_identity_address(linphone_core_get_default_proxy_config(LC));
+	LinphoneChatMessage *msg = linphone_chat_room_create_message(linphone_core_get_chat_room(LC, addr), "hello my own");
+	linphone_chat_room_send_chat_message(linphone_core_get_chat_room(LC, addr), msg);
+	linphone_core_set_network_reachable(LC, NO);
+	[tester waitForViewWithAccessibilityLabel:@"hello my own"];
+#endif
+}
+
+@end
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 374f6a20e..0a3914e6d 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -584,6 +584,7 @@
 		63B8D6A21BCBF43100C12B09 /* UIChatCreateCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 63B8D6A01BCBF43100C12B09 /* UIChatCreateCell.m */; };
 		63BC49E21BA2CDFC004EC273 /* UICallPausedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 63BC49E11BA2CDFC004EC273 /* UICallPausedCell.m */; };
 		63C441C31BBC23ED0053DC5E /* UIAssistantTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C441C21BBC23ED0053DC5E /* UIAssistantTextField.m */; };
+		63CAACDB1C91D10200216F8D /* NotificationTester.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CAACD51C91D0D100216F8D /* NotificationTester.m */; };
 		63CD4B4F1A5AAC8C00B84282 /* DTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */; };
 		63CDC45E1C3BDE370085F529 /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4531C3BDE370085F529 /* msg.caf */; };
 		63CDC45F1C3BDE370085F529 /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4541C3BDE370085F529 /* ringback.wav */; };
@@ -1503,6 +1504,8 @@
 		63BC49E11BA2CDFC004EC273 /* UICallPausedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallPausedCell.m; sourceTree = "<group>"; };
 		63C441C11BBC23ED0053DC5E /* UIAssistantTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIAssistantTextField.h; sourceTree = "<group>"; };
 		63C441C21BBC23ED0053DC5E /* UIAssistantTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIAssistantTextField.m; sourceTree = "<group>"; };
+		63CAACD41C91D0D100216F8D /* NotificationTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationTester.h; sourceTree = "<group>"; };
+		63CAACD51C91D0D100216F8D /* NotificationTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationTester.m; sourceTree = "<group>"; };
 		63CD4B4D1A5AAC8C00B84282 /* DTAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTAlertView.h; sourceTree = "<group>"; };
 		63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTAlertView.m; sourceTree = "<group>"; };
 		63CDC4531C3BDE370085F529 /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = msg.caf; sourceTree = "<group>"; };
@@ -2236,6 +2239,8 @@
 				630589E41B4E810900EFAE36 /* LinphoneTestCase.m */,
 				630589E51B4E810900EFAE36 /* AssistantTester.h */,
 				630589E61B4E810900EFAE36 /* AssistantTester.m */,
+				63CAACD41C91D0D100216F8D /* NotificationTester.h */,
+				63CAACD51C91D0D100216F8D /* NotificationTester.m */,
 			);
 			path = TestsUI;
 			sourceTree = "<group>";
@@ -3866,6 +3871,7 @@
 				630589EB1B4E810900EFAE36 /* AssistantTester.m in Sources */,
 				630589E71B4E810900EFAE36 /* ChatTester.m in Sources */,
 				630589E81B4E810900EFAE36 /* ContactsTester.m in Sources */,
+				63CAACDB1C91D10200216F8D /* NotificationTester.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};