From cf996bb3fcfbeee1cac54e4a958568d83da7a5b5 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 3 Nov 2015 12:00:37 +0100 Subject: [PATCH] UITester: fix automatic tests (in progress) --- Classes/AssistantView.m | 33 ++--- Classes/Base.lproj/AssistantView.xib | 2 +- ...tSubviews.xib => AssistantViewScreens.xib} | 66 +++++----- .../Base.lproj/ChatConversationCreateView.xib | 6 +- Classes/Base.lproj/ChatConversationView.xib | 8 +- Classes/Base.lproj/ChatsListView.xib | 8 +- Classes/Base.lproj/ContactDetailsView.xib | 2 +- Classes/Base.lproj/ContactsListView.xib | 6 +- Classes/Base.lproj/HistoryDetailsView.xib | 8 +- Classes/Base.lproj/HistoryListView.xib | 6 +- Classes/ChatConversationCreateTableView.m | 22 +++- Classes/HistoryDetailsTableView.m | 5 +- Classes/HistoryListTableView.m | 4 +- .../LinphoneUI/Base.lproj/StatusBarView.xib | 2 + Classes/LinphoneUI/Base.lproj/UIChatCell.xib | 7 +- Classes/LinphoneUI/UIChatBubblePhotoCell.xib | 22 ++-- Classes/LinphoneUI/UIChatBubbleTextCell.h | 1 + Classes/LinphoneUI/UIChatBubbleTextCell.m | 7 +- Classes/LinphoneUI/UIChatBubbleTextCell.xib | 23 ++-- Classes/LinphoneUI/UIChatCell.m | 6 +- .../UICheckBoxTableViewController.m | 21 +++- Classes/LinphoneUI/UIContactDetailsCell.m | 4 + Classes/LinphoneUI/UIContactDetailsCell.xib | 2 + Classes/SideMenuTableView.m | 26 ++-- Classes/SideMenuView.m | 1 + Classes/Utils/Utils.h | 9 +- Classes/Utils/Utils.m | 41 ++++++- ...s.strings => AssistantViewScreens.strings} | Bin ...s.strings => AssistantViewScreens.strings} | Bin ...s.strings => AssistantViewScreens.strings} | Bin .../AppIcon.appiconset/linphone_icon_120.png | Bin 6529 -> 5155 bytes .../AppIcon.appiconset/linphone_icon_152.png | Bin 8787 -> 6561 bytes .../AppIcon.appiconset/linphone_icon_57.png | Bin 2673 -> 2383 bytes .../linphone_icon_57@2x.png | Bin 6138 -> 4893 bytes .../AppIcon.appiconset/linphone_icon_72.png | Bin 3554 -> 3019 bytes .../linphone_icon_72@2x.png | Bin 8220 -> 6202 bytes .../AppIcon.appiconset/linphone_icon_76.png | Bin 3749 -> 3246 bytes Resources/images/back_disabled.png | Bin 569 -> 569 bytes Resources/images/back_disabled@2x.png | Bin 949 -> 949 bytes Resources/images/backspace_disabled.png | Bin 707 -> 707 bytes Resources/images/backspace_disabled@2x.png | Bin 1302 -> 1302 bytes Resources/images/call_add_disabled.png | Bin 1211 -> 1211 bytes Resources/images/call_add_disabled@2x.png | Bin 2482 -> 2482 bytes Resources/images/call_alt_back_disabled.png | Bin 1498 -> 1498 bytes .../images/call_alt_back_disabled@2x.png | Bin 3110 -> 3110 bytes Resources/images/call_alt_start_disabled.png | Bin 1095 -> 1095 bytes .../images/call_alt_start_disabled@2x.png | Bin 2154 -> 2154 bytes .../images/call_audio_start_disabled.png | Bin 1104 -> 1104 bytes .../images/call_audio_start_disabled@2x.png | Bin 2233 -> 2233 bytes Resources/images/call_back_disabled.png | Bin 1185 -> 1185 bytes Resources/images/call_back_disabled@2x.png | Bin 2302 -> 2302 bytes Resources/images/call_hangup_disabled.png | Bin 840 -> 840 bytes Resources/images/call_hangup_disabled@2x.png | Bin 1470 -> 1470 bytes Resources/images/call_transfer_disabled.png | Bin 1248 -> 1248 bytes .../images/call_transfer_disabled@2x.png | Bin 2546 -> 2546 bytes .../images/call_video_start_disabled.png | Bin 1009 -> 1009 bytes .../images/call_video_start_disabled@2x.png | Bin 2037 -> 2037 bytes Resources/images/camera_disabled.png | Bin 541 -> 541 bytes Resources/images/camera_disabled@2x.png | Bin 832 -> 832 bytes Resources/images/cancel_edit_disabled.png | Bin 851 -> 851 bytes Resources/images/cancel_edit_disabled@2x.png | Bin 1602 -> 1602 bytes Resources/images/chat_add_disabled.png | Bin 1044 -> 1044 bytes Resources/images/chat_add_disabled@2x.png | Bin 2093 -> 2093 bytes Resources/images/chat_attachment_disabled.png | Bin 992 -> 992 bytes .../images/chat_attachment_disabled@2x.png | Bin 1920 -> 1920 bytes Resources/images/chat_message_delivered.png | Bin 312 -> 0 bytes .../images/chat_message_delivered@2x.png | Bin 618 -> 0 bytes Resources/images/chat_send_disabled.png | Bin 1132 -> 1132 bytes Resources/images/chat_send_disabled@2x.png | Bin 2138 -> 2138 bytes Resources/images/color_A.png | Bin 277 -> 277 bytes Resources/images/color_B.png | Bin 260 -> 260 bytes Resources/images/color_C.png | Bin 260 -> 260 bytes Resources/images/color_D.png | Bin 262 -> 262 bytes Resources/images/color_E.png | Bin 262 -> 262 bytes Resources/images/color_F.png | Bin 262 -> 262 bytes Resources/images/color_G.png | Bin 262 -> 262 bytes Resources/images/color_H.png | Bin 260 -> 260 bytes Resources/images/color_I.png | Bin 277 -> 277 bytes Resources/images/color_L.png | Bin 277 -> 277 bytes Resources/images/color_M.png | Bin 277 -> 277 bytes Resources/images/contact_add_disabled.png | Bin 1040 -> 1040 bytes Resources/images/contact_add_disabled@2x.png | Bin 2039 -> 2039 bytes Resources/images/contacts_all_disabled.png | Bin 944 -> 944 bytes Resources/images/contacts_all_disabled@2x.png | Bin 1913 -> 1913 bytes Resources/images/contacts_sip_disabled.png | Bin 1191 -> 1191 bytes Resources/images/contacts_sip_disabled@2x.png | Bin 2500 -> 2500 bytes Resources/images/delete_disabled.png | Bin 633 -> 633 bytes Resources/images/delete_disabled@2x.png | Bin 1088 -> 1088 bytes Resources/images/dialer_back_disabled.png | Bin 1181 -> 1181 bytes Resources/images/dialer_back_disabled@2x.png | Bin 2581 -> 2581 bytes Resources/images/edit_disabled.png | Bin 820 -> 820 bytes Resources/images/edit_disabled@2x.png | Bin 1505 -> 1505 bytes Resources/images/edit_list_disabled.png | Bin 838 -> 838 bytes Resources/images/edit_list_disabled@2x.png | Bin 1579 -> 1579 bytes Resources/images/footer_chat_disabled.png | Bin 737 -> 737 bytes Resources/images/footer_chat_disabled@2x.png | Bin 1351 -> 1351 bytes Resources/images/footer_contacts_disabled.png | Bin 728 -> 728 bytes .../images/footer_contacts_disabled@2x.png | Bin 1327 -> 1327 bytes Resources/images/footer_dialer_disabled.png | Bin 946 -> 946 bytes .../images/footer_dialer_disabled@2x.png | Bin 2083 -> 2083 bytes Resources/images/footer_history_disabled.png | Bin 717 -> 717 bytes .../images/footer_history_disabled@2x.png | Bin 1335 -> 1335 bytes Resources/images/history_all_disabled.png | Bin 1269 -> 1269 bytes Resources/images/history_all_disabled@2x.png | Bin 2694 -> 2694 bytes Resources/images/history_missed_disabled.png | Bin 1156 -> 1156 bytes .../images/history_missed_disabled@2x.png | Bin 2201 -> 2201 bytes Resources/images/micro_disabled.png | Bin 1025 -> 1025 bytes Resources/images/micro_disabled@2x.png | Bin 1943 -> 1943 bytes Resources/images/numpad_over_background.png | Bin 290 -> 290 bytes .../images/options_add_call_disabled.png | Bin 1126 -> 1126 bytes .../images/options_add_call_disabled@2x.png | Bin 2264 -> 2264 bytes Resources/images/options_disabled.png | Bin 939 -> 939 bytes Resources/images/options_disabled@2x.png | Bin 1880 -> 1880 bytes .../options_start_conference_disabled.png | Bin 1201 -> 1201 bytes .../options_start_conference_disabled@2x.png | Bin 2514 -> 2514 bytes .../images/options_transfer_call_disabled.png | Bin 1130 -> 1130 bytes .../options_transfer_call_disabled@2x.png | Bin 2322 -> 2322 bytes Resources/images/route_bluetooth_disabled.png | Bin 697 -> 697 bytes .../images/route_bluetooth_disabled@2x.png | Bin 1286 -> 1286 bytes Resources/images/route_earpiece_disabled.png | Bin 801 -> 801 bytes .../images/route_earpiece_disabled@2x.png | Bin 1526 -> 1526 bytes Resources/images/route_speaker_disabled.png | Bin 684 -> 684 bytes .../images/route_speaker_disabled@2x.png | Bin 1161 -> 1161 bytes Resources/images/routes_disabled.png | Bin 951 -> 951 bytes Resources/images/routes_disabled@2x.png | Bin 1766 -> 1766 bytes Resources/images/select_all_disabled.png | Bin 619 -> 619 bytes Resources/images/select_all_disabled@2x.png | Bin 983 -> 983 bytes Resources/images/speaker_disabled.png | Bin 684 -> 684 bytes Resources/images/speaker_disabled@2x.png | Bin 1161 -> 1161 bytes Resources/images/valid_disabled.png | Bin 625 -> 625 bytes Resources/images/valid_disabled@2x.png | Bin 1085 -> 1085 bytes Resources/linphonerc-factory | 2 +- Resources/linphonerc-factory~ipad | 22 ---- TestsUI/AssistantTester.m | 45 +++---- TestsUI/ChatTester.m | 115 +++++++++--------- TestsUI/LinphoneTestCase.m | 14 ++- iTunesArtwork | Bin 41100 -> 17927 bytes linphone.xcodeproj/project.pbxproj | 30 ++--- 138 files changed, 314 insertions(+), 262 deletions(-) rename Classes/Base.lproj/{AssistantSubviews.xib => AssistantViewScreens.xib} (99%) rename Classes/ar.lproj/{AssistantSubviews.strings => AssistantViewScreens.strings} (100%) rename Classes/fr.lproj/{AssistantSubviews.strings => AssistantViewScreens.strings} (100%) rename Classes/ru.lproj/{AssistantSubviews.strings => AssistantViewScreens.strings} (100%) delete mode 100644 Resources/images/chat_message_delivered.png delete mode 100644 Resources/images/chat_message_delivered@2x.png delete mode 100644 Resources/linphonerc-factory~ipad diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 25ce0695a..c07309e91 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -49,7 +49,7 @@ typedef enum _ViewElement { - (id)init { self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle mainBundle]]; if (self != nil) { - [[NSBundle mainBundle] loadNibNamed:@"AssistantSubviews" owner:self options:nil]; + [[NSBundle mainBundle] loadNibNamed:@"AssistantViewScreens" owner:self options:nil]; historyViews = [[NSMutableArray alloc] init]; currentView = nil; } @@ -91,6 +91,7 @@ static UICompositeViewDescription *compositeDescription = nil; name:kLinphoneConfiguringStateUpdate object:nil]; new_config = NULL; + [self resetTextFields]; [self changeView:_welcomeView back:FALSE animation:FALSE]; } @@ -211,7 +212,11 @@ static UICompositeViewDescription *compositeDescription = nil; LinphoneManager *lm = [LinphoneManager instance]; if (new_config != NULL && proxy != new_config) { + const LinphoneAuthInfo *auth = linphone_proxy_config_find_auth_info(new_config); linphone_core_remove_proxy_config(lc, new_config); + if (auth) { + linphone_core_remove_auth_info(lc, auth); + } } new_config = proxy; @@ -455,7 +460,7 @@ static UICompositeViewDescription *compositeDescription = nil; forProxy:(LinphoneProxyConfig *)proxy message:(NSString *)message { // in assistant we only care about ourself - if (proxy != linphone_core_get_default_proxy_config([LinphoneManager getLc])) { + if (proxy != new_config) { return; } @@ -529,9 +534,11 @@ static UICompositeViewDescription *compositeDescription = nil; void assistant_existence_tested(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; - if (status == LinphoneAccountCreatorOk) { + if (status == LinphoneAccountCreatorFailed) { [[thiz findTextField:ViewElement_Username] showError:NSLocalizedString(@"This name is already taken.", nil)]; [thiz findButton:ViewElement_NextButton].enabled = NO; + } else { + [thiz changeView:thiz.createAccountActivationView back:FALSE animation:TRUE]; } } @@ -539,18 +546,15 @@ void assistant_create_account(LinphoneAccountCreator *creator, LinphoneAccountCr AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorOk) { - NSString *username = [thiz findTextField:ViewElement_Username].text; - NSString *password = [thiz findTextField:ViewElement_Password].text; - [thiz changeView:thiz.createAccountActivationView back:FALSE animation:TRUE]; - [thiz findTextField:ViewElement_Username].text = username; - [thiz findTextField:ViewElement_Password].text = password; + thiz.waitView.hidden = NO; + linphone_account_creator_test_validation(thiz->account_creator); } else { - UIAlertView *errorView = - [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Account creation issue", nil) - message:NSLocalizedString(@"Can't create the account. Please try again.", nil) - delegate:nil - cancelButtonTitle:NSLocalizedString(@"Continue", nil) - otherButtonTitles:nil, nil]; + UIAlertView *errorView = [[UIAlertView alloc] + initWithTitle:NSLocalizedString(@"Account validation issue", nil) + message:NSLocalizedString(@"Your account could not be created, please try again later.", nil) + delegate:nil + cancelButtonTitle:NSLocalizedString(@"Continue", nil) + otherButtonTitles:nil, nil]; [errorView show]; } } @@ -596,6 +600,7 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun [atf textField:atf shouldChangeCharactersInRange:range replacementString:string]; if (atf.tag == ViewElement_Username && currentView == _createAccountView) { textField.text = [textField.text stringByReplacingCharactersInRange:range withString:string.lowercaseString]; + [self shouldEnableNextButton]; return NO; } [self shouldEnableNextButton]; diff --git a/Classes/Base.lproj/AssistantView.xib b/Classes/Base.lproj/AssistantView.xib index bf56c42db..e870f256c 100644 --- a/Classes/Base.lproj/AssistantView.xib +++ b/Classes/Base.lproj/AssistantView.xib @@ -36,7 +36,7 @@ - + diff --git a/Classes/Base.lproj/AssistantSubviews.xib b/Classes/Base.lproj/AssistantViewScreens.xib similarity index 99% rename from Classes/Base.lproj/AssistantSubviews.xib rename to Classes/Base.lproj/AssistantViewScreens.xib index d62e30100..6d142da95 100644 --- a/Classes/Base.lproj/AssistantSubviews.xib +++ b/Classes/Base.lproj/AssistantViewScreens.xib @@ -49,7 +49,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,29 +78,11 @@ - + @@ -233,7 +233,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -472,7 +472,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -597,11 +597,11 @@ - + - + @@ -676,7 +676,7 @@ - + @@ -697,7 +697,7 @@ - + @@ -709,7 +709,7 @@ - + diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib index 44d8a1ff2..83aa63385 100644 --- a/Classes/Base.lproj/ChatConversationCreateView.xib +++ b/Classes/Base.lproj/ChatConversationCreateView.xib @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib index 8bf5985ed..03ab99171 100644 --- a/Classes/Base.lproj/ChatConversationView.xib +++ b/Classes/Base.lproj/ChatConversationView.xib @@ -131,14 +131,14 @@ - + - + - + @@ -233,7 +233,7 @@ - + diff --git a/Classes/Base.lproj/ChatsListView.xib b/Classes/Base.lproj/ChatsListView.xib index 80291a1c8..16aa31d65 100644 --- a/Classes/Base.lproj/ChatsListView.xib +++ b/Classes/Base.lproj/ChatsListView.xib @@ -35,14 +35,14 @@ - + - + - + @@ -112,7 +112,7 @@ - + diff --git a/Classes/Base.lproj/ContactDetailsView.xib b/Classes/Base.lproj/ContactDetailsView.xib index 5e146ae4e..513c57641 100644 --- a/Classes/Base.lproj/ContactDetailsView.xib +++ b/Classes/Base.lproj/ContactDetailsView.xib @@ -112,7 +112,7 @@ - + diff --git a/Classes/Base.lproj/ContactsListView.xib b/Classes/Base.lproj/ContactsListView.xib index 8ff83ca98..47e71fe13 100644 --- a/Classes/Base.lproj/ContactsListView.xib +++ b/Classes/Base.lproj/ContactsListView.xib @@ -137,14 +137,14 @@ - + - + - + diff --git a/Classes/Base.lproj/HistoryDetailsView.xib b/Classes/Base.lproj/HistoryDetailsView.xib index 9982442fc..7919b67e6 100644 --- a/Classes/Base.lproj/HistoryDetailsView.xib +++ b/Classes/Base.lproj/HistoryDetailsView.xib @@ -35,7 +35,7 @@