Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tests

Browse source
This commit is contained in:
Margaux Clerc 2016-02-15 13:57:23 +01:00
parent 56a82f7165
commit 45b365ecb1
12 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/layout/dialog.xml
View file

@ -31,7 +31,7 @@
android:padding="10dp"/> android:padding="10dp"/>
<Button <Button
android:id="@+id/delete" android:id="@+id/delete_button"
android:text="@string/delete" android:text="@string/delete"
android:background="@drawable/resizable_confirm_delete_button" android:background="@drawable/resizable_confirm_delete_button"
style="@style/font15" style="@style/font15"

2
src/org/linphone/ChatFragment.java
View file

@ -664,7 +664,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
} }
if (id == R.id.delete) { if (id == R.id.delete) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete); Button delete = (Button) dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {

2
src/org/linphone/ChatListFragment.java
View file

@ -267,7 +267,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
if (id == R.id.delete) { if (id == R.id.delete) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete); Button delete = (Button) dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {

2
src/org/linphone/ContactDetailsFragment.java
View file

@ -239,7 +239,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
} }
if (id == R.id.deleteContact) { if (id == R.id.deleteContact) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete); Button delete = (Button) dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {

2
src/org/linphone/ContactsListFragment.java
View file

@ -213,7 +213,7 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
if (id == R.id.delete) { if (id == R.id.delete) {
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete); Button delete = (Button) dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {

2
src/org/linphone/HistoryListFragment.java
View file

@ -236,7 +236,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
} }
final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
Button delete = (Button) dialog.findViewById(R.id.delete); Button delete = (Button) dialog.findViewById(R.id.delete_button);
Button cancel = (Button) dialog.findViewById(R.id.cancel); Button cancel = (Button) dialog.findViewById(R.id.cancel);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {

4
tests/src/org/linphone/test/AccountAssistant.java
View file

@ -66,7 +66,7 @@ public class AccountAssistant extends SampleTest {
Assert.assertEquals(aContext.getString(org.linphone.R.string.pref_transport_tls_key), transport); Assert.assertEquals(aContext.getString(org.linphone.R.string.pref_transport_tls_key), transport);
String proxy = prefs.getAccountProxy(0); String proxy = prefs.getAccountProxy(0);
Assert.assertEquals("<sip:" + aContext.getString(org.linphone.R.string.default_domain) + ":5223;transport=tls>", proxy); Assert.assertEquals("<sip:" + aContext.getString(org.linphone.R.string.default_domain) + ";transport=tls>", proxy);
String display_name = prefs.getAccountDisplayName(0); String display_name = prefs.getAccountDisplayName(0);
Assert.assertEquals(iContext.getString(R.string.account_linphone_display_name), display_name); Assert.assertEquals(iContext.getString(R.string.account_linphone_display_name), display_name);
@ -174,6 +174,6 @@ public class AccountAssistant extends SampleTest {
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button)); solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
solo.clickOnText("Assistant"); solo.clickOnText(aContext.getString(org.linphone.R.string.menu_assistant));
} }
} }

2
tests/src/org/linphone/test/CallsAudio.java
View file

@ -383,7 +383,7 @@ public class CallsAudio extends SampleTest {
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button)); solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
solo.clickOnText("Settings"); solo.clickOnText(aContext.getString(org.linphone.R.string.menu_settings));
} }
private void goToAudioCodecsSettings() { private void goToAudioCodecsSettings() {

6
tests/src/org/linphone/test/CallsVideo.java
View file

@ -348,7 +348,7 @@ public class CallsVideo extends SampleTest {
solo.waitForActivity("LinphoneActivity", 2000); solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button)); solo.clickOnView(solo.getView(org.linphone.R.id.side_menu_button));
solo.clickOnText("Settings"); solo.clickOnText(aContext.getString(org.linphone.R.string.menu_settings));
} }
private void goToAudioCodecsSettings() { private void goToAudioCodecsSettings() {
@ -360,8 +360,8 @@ public class CallsVideo extends SampleTest {
} }
private void goToVideoCodecsSettings() { private void goToVideoCodecsSettings() {
goToSettings(); //goToSettings();
selectItemInListOnUIThread(6); selectItemInListOnUIThread(6);
if (solo.searchText(aContext.getString(org.linphone.R.string.pref_video_title), 2)) // Needed in case pref_video_enable_title contains pref_video if (solo.searchText(aContext.getString(org.linphone.R.string.pref_video_title), 2)) // Needed in case pref_video_enable_title contains pref_video
solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_title), 2); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_title), 2);

2
tests/src/org/linphone/test/Chat.java
View file

@ -51,7 +51,7 @@ public class Chat extends SampleTest {
goToChat(); goToChat();
solo.clickOnView(solo.getView(org.linphone.R.id.new_discussion)); solo.clickOnView(solo.getView(org.linphone.R.id.new_discussion));
solo.enterText((AutoCompleteTextView)solo.getView(org.linphone.R.id.search_contact_field), "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain)); solo.enterText((EditText)solo.getView(org.linphone.R.id.search_contact_field), "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain));
solo.enterText((EditText)solo.getView(org.linphone.R.id.message), iContext.getString(R.string.chat_test_text_sent)); solo.enterText((EditText)solo.getView(org.linphone.R.id.message), iContext.getString(R.string.chat_test_text_sent));
solo.clickOnView(solo.getView(org.linphone.R.id.send_message)); solo.clickOnView(solo.getView(org.linphone.R.id.send_message));

2
tests/src/org/linphone/test/ConferenceAndMultiCall.java
View file

@ -278,7 +278,7 @@ public class ConferenceAndMultiCall extends SampleTest {
} }
private void assertCallIsCorrectlyRunning(int lcId) { private void assertCallIsCorrectlyRunning(int lcId) {
solo.waitForActivity("InCallActivity", 5000); solo.waitForActivity("CallActivity", 5000);
solo.assertCurrentActivity("Expected InCall Activity", CallActivity.class); solo.assertCurrentActivity("Expected InCall Activity", CallActivity.class);
solo.sleep(2000); solo.sleep(2000);

6
tests/src/org/linphone/test/History.java
View file

@ -59,7 +59,8 @@ public class History extends SampleTest {
solo.clickOnView(solo.getView(org.linphone.R.id.edit)); solo.clickOnView(solo.getView(org.linphone.R.id.edit));
solo.sleep(500); solo.sleep(500);
solo.clickOnView(solo.getView(org.linphone.R.id.delete)); solo.clickOnView(solo.getView(org.linphone.R.id.delete));
solo.clickOnView(solo.getView(org.linphone.R.id.delete)); solo.sleep(500);
solo.clickOnView(solo.getView(org.linphone.R.id.delete_button));
} }
@SmallTest @SmallTest
@ -71,7 +72,8 @@ public class History extends SampleTest {
solo.clickOnView(solo.getView(org.linphone.R.id.edit)); solo.clickOnView(solo.getView(org.linphone.R.id.edit));
solo.clickOnView(solo.getView(org.linphone.R.id.select_all)); solo.clickOnView(solo.getView(org.linphone.R.id.select_all));
solo.clickOnView(solo.getView(org.linphone.R.id.delete)); solo.clickOnView(solo.getView(org.linphone.R.id.delete));
solo.clickOnView(solo.getView(org.linphone.R.id.delete)); solo.sleep(500);
solo.clickOnView(solo.getView(org.linphone.R.id.delete_button));
Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_call_history))); Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_call_history)));
} }