From be08e5ddd5de87a0cc9beef5f1861189cfce2a50 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI <guitreize@gmail.com>
Date: Mon, 19 Jan 2015 21:44:19 +0100
Subject: [PATCH] Use subclass to dismiss system popups for all tests

---
 KifTests/ChatTester.h              |  4 ++--
 KifTests/ChatTester.m              |  1 +
 KifTests/LinphoneTestCase.h        | 13 +++++++++++++
 KifTests/LinphoneTestCase.m        | 18 ++++++++++++++++++
 KifTests/WizardTester.h            |  4 ++--
 linphone.xcodeproj/project.pbxproj |  6 ++++++
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 KifTests/LinphoneTestCase.h
 create mode 100644 KifTests/LinphoneTestCase.m

diff --git a/KifTests/ChatTester.h b/KifTests/ChatTester.h
index 93ec77140..1f6cd2691 100644
--- a/KifTests/ChatTester.h
+++ b/KifTests/ChatTester.h
@@ -6,8 +6,8 @@
 //
 //
 
-#import <KIF/KIF.h>
+#import "LinphoneTestCase.h"
 
-@interface ChatTester : KIFTestCase
+@interface ChatTester : LinphoneTestCase
 
 @end
diff --git a/KifTests/ChatTester.m b/KifTests/ChatTester.m
index b96ba8c2a..bf83d7b78 100644
--- a/KifTests/ChatTester.m
+++ b/KifTests/ChatTester.m
@@ -13,6 +13,7 @@
 
 
 - (void)beforeAll {
+    [super beforeAll];
     [self switchToValidAccountIfNeeded];
     
     [tester tapViewWithAccessibilityLabel:@"Chat"];
diff --git a/KifTests/LinphoneTestCase.h b/KifTests/LinphoneTestCase.h
new file mode 100644
index 000000000..62b200bb3
--- /dev/null
+++ b/KifTests/LinphoneTestCase.h
@@ -0,0 +1,13 @@
+//
+//  LinphoneTestCase.h
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 19/01/2015.
+//
+//
+
+#import <KIF/KIF.h>
+
+@interface LinphoneTestCase : KIFTestCase
+
+@end
diff --git a/KifTests/LinphoneTestCase.m b/KifTests/LinphoneTestCase.m
new file mode 100644
index 000000000..9e9836b5e
--- /dev/null
+++ b/KifTests/LinphoneTestCase.m
@@ -0,0 +1,18 @@
+//
+//  LinphoneTestCase.m
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 19/01/2015.
+//
+//
+
+#import "LinphoneTestCase.h"
+
+@implementation LinphoneTestCase
+
+- (void)beforeAll{
+    [tester acknowledgeSystemAlert];
+    [super beforeAll];
+}
+
+@end
diff --git a/KifTests/WizardTester.h b/KifTests/WizardTester.h
index 34a3a371b..ee02ad947 100644
--- a/KifTests/WizardTester.h
+++ b/KifTests/WizardTester.h
@@ -6,8 +6,8 @@
 //
 //
 
-#import <KIF/Kif.h>
+#import "LinphoneTestCase.h"
 
-@interface WizardTester : KIFTestCase
+@interface WizardTester : LinphoneTestCase
 
 @end
\ No newline at end of file
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 588d1b4b6..f9c050e73 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -781,6 +781,7 @@
 		F84015C01939FE37006ABAB5 /* test_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = F84015BD1939FE37006ABAB5 /* test_inprogress.png */; };
 		F84015C11939FE37006ABAB5 /* test_passed.png in Resources */ = {isa = PBXBuildFile; fileRef = F84015BE1939FE37006ABAB5 /* test_passed.png */; };
 		F84015C7193B4E34006ABAB5 /* LogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F84015C6193B4E34006ABAB5 /* LogsViewController.m */; };
+		F85554481A6DA2F400A9F915 /* LinphoneTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1792,6 +1793,8 @@
 		F84015BE1939FE37006ABAB5 /* test_passed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_passed.png; path = Resources/test_passed.png; sourceTree = "<group>"; };
 		F84015C5193B4E34006ABAB5 /* LogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogsViewController.h; sourceTree = "<group>"; };
 		F84015C6193B4E34006ABAB5 /* LogsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogsViewController.m; sourceTree = "<group>"; };
+		F85554461A6DA2F400A9F915 /* LinphoneTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneTestCase.h; sourceTree = "<group>"; };
+		F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneTestCase.m; sourceTree = "<group>"; };
 		F8DB48A1936CB14E39F5981D /* Pods-KifTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KifTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KifTests/Pods-KifTests.debug.xcconfig"; sourceTree = "<group>"; };
 		FD979F30169E84670022A8B4 /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = Resources/ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -3022,6 +3025,8 @@
 				F0A1CE071A6B056E001CA2BE /* ChatTester.m */,
 				F0A1CE0A1A6B08FA001CA2BE /* KIFTestCase+LinphoneExtras.h */,
 				F0A1CE0B1A6B08FA001CA2BE /* KIFTestCase+LinphoneExtras.m */,
+				F85554461A6DA2F400A9F915 /* LinphoneTestCase.h */,
+				F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */,
 			);
 			path = KifTests;
 			sourceTree = "<group>";
@@ -3995,6 +4000,7 @@
 			files = (
 				F0A1CE081A6B056E001CA2BE /* ChatTester.m in Sources */,
 				F0A1CE0C1A6B08FA001CA2BE /* KIFTestCase+LinphoneExtras.m in Sources */,
+				F85554481A6DA2F400A9F915 /* LinphoneTestCase.m in Sources */,
 				F0F952121A6AECD300254160 /* WizardTester.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;