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

Using xml defined default stun server + improved tests for accounts & wizard

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-28 16:25:01 +02:00
parent 3b4ed458f2
commit f51927445d
2 changed files with 71 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/setup/SetupActivity.java
View file

@ -196,7 +196,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
if (isMainAccountLinphoneDotOrg) { if (isMainAccountLinphoneDotOrg) {
writePreference(R.string.pref_proxy_key, domain + ":5223"); writePreference(R.string.pref_proxy_key, domain + ":5223");
writePreference(R.string.pref_enable_outbound_proxy_key, true); writePreference(R.string.pref_enable_outbound_proxy_key, true);
writePreference(R.string.pref_stun_server_key, "stun.linphone.org"); writePreference(R.string.pref_stun_server_key, getString(R.string.default_stun));
writePreference(R.string.pref_ice_enable_key, true); writePreference(R.string.pref_ice_enable_key, true);
writePreference(R.string.pref_push_notification_key, true); writePreference(R.string.pref_push_notification_key, true);

104
tests/src/org/linphone/test/AccountsTest.java
View file

@ -26,6 +26,16 @@ public class AccountsTest extends
public AccountsTest() { public AccountsTest() {
super("org.linphone", LinphoneActivity.class); super("org.linphone", LinphoneActivity.class);
} }
private void selectItemInListOnUIThread(final int item) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
ListView list = (ListView) solo.getView(android.R.id.list);
list.setSelection(item);
}
});
}
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
@ -33,9 +43,9 @@ public class AccountsTest extends
solo = new Solo(getInstrumentation(), getActivity()); solo = new Solo(getInstrumentation(), getActivity());
} }
public void testAConfigureExternalSIPAccount() { public void testAConfigureExistingLinphoneAccount() {
Context context = getActivity(); Context context = getActivity();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
int nbAccountsBefore = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0); int nbAccountsBefore = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
@ -43,6 +53,52 @@ public class AccountsTest extends
solo.assertCurrentActivity("Expected Setup Activity", SetupActivity.class); solo.assertCurrentActivity("Expected Setup Activity", SetupActivity.class);
Log.testSuccess("Wizard launching at first startup"); Log.testSuccess("Wizard launching at first startup");
solo.clickOnView(solo.getView(R.id.setup_next));
solo.clickOnText(context.getString(R.string.setup_login_linphone));
solo.enterText((EditText) solo.getView(R.id.setup_username), "wizard15");
solo.enterText((EditText) solo.getView(R.id.setup_password), "wizard15");
solo.clickOnText(context.getString(R.string.setup_apply));
solo.waitForActivity("LinphoneActivity", 2000);
Assert.assertTrue(solo.searchText("wizard15@sip.linphone.org"));
int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
Assert.assertEquals(nbAccountsBefore + 1, nbAccountsAfter);
Log.testSuccess("Configure existing sip.linphone.org account");
String stunServer = prefs.getString(context.getString(R.string.pref_stun_server_key), "");
Assert.assertEquals(stunServer, context.getString(R.string.default_stun));
Log.testSuccess("Default stun server is configured");
boolean tls = prefs.getBoolean(context.getString(R.string.pref_transport_tls_key), false);
Assert.assertEquals(tls, true);
Log.testSuccess("TLS is set by default");
String proxy = prefs.getString(context.getString(R.string.pref_proxy_key), "");
Assert.assertEquals(proxy, context.getString(R.string.default_domain) + ":5223");
boolean outboundproxy = prefs.getBoolean(context.getString(R.string.pref_enable_outbound_proxy_key), false);
Assert.assertEquals(outboundproxy, true);
Log.testSuccess("Outbound proxy is configured");
boolean ice = prefs.getBoolean(context.getString(R.string.pref_ice_enable_key), false);
Assert.assertEquals(ice, true);
Log.testSuccess("ICE is enabled");
}
public void testBConfigureExternalSIPAccount() {
Context context = getActivity();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
int nbAccountsBefore = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
Log.testSuccess("Wizard not launching at startup if account is configured");
solo.clickOnView(solo.getView(R.id.settings));
solo.clickOnText(context.getString(R.string.setup_title));
solo.assertCurrentActivity("Expected Setup Activity", SetupActivity.class);
solo.clickOnView(solo.getView(R.id.setup_next)); solo.clickOnView(solo.getView(R.id.setup_next));
solo.clickOnText(context.getString(R.string.setup_login_generic)); solo.clickOnText(context.getString(R.string.setup_login_generic));
solo.enterText((EditText) solo.getView(R.id.setup_username), "junit"); solo.enterText((EditText) solo.getView(R.id.setup_username), "junit");
@ -56,34 +112,20 @@ public class AccountsTest extends
int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0); int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
Assert.assertEquals(nbAccountsBefore + 1, nbAccountsAfter); Assert.assertEquals(nbAccountsBefore + 1, nbAccountsAfter);
Log.testSuccess("Configure existing generic account"); Log.testSuccess("Configure existing generic account");
}
public void testBConfigureExistingLinphoneAccount() {
Context context = getActivity();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
int nbAccountsBefore = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
solo.waitForActivity("LinphoneActivity", 2000); solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
Log.testSuccess("Wizard not launching at startup if account is configured");
solo.clickOnView(solo.getView(R.id.settings)); solo.clickOnView(solo.getView(R.id.settings));
solo.clickOnText(context.getString(R.string.setup_title)); Assert.assertTrue(solo.searchText("junit@test.linphone.org"));
solo.assertCurrentActivity("Expected Setup Activity", SetupActivity.class); solo.clickOnText("junit@test.linphone.org");
solo.clickOnView(solo.getView(R.id.setup_next)); solo.sleep(500);
solo.clickOnText(context.getString(R.string.setup_login_linphone)); selectItemInListOnUIThread(6);
solo.enterText((EditText) solo.getView(R.id.setup_username), "wizard15"); solo.clickOnText(context.getString(R.string.pref_default_account));
solo.enterText((EditText) solo.getView(R.id.setup_password), "wizard15"); int defaultAccount = prefs.getInt(context.getString(R.string.pref_default_account_key), 0);
solo.clickOnText(context.getString(R.string.setup_apply)); solo.sleep(1000);
Assert.assertEquals(1, defaultAccount);
solo.waitForActivity("LinphoneActivity", 2000); Log.testSuccess("Select another account as default");
Assert.assertTrue(solo.searchText("wizard15@sip.linphone.org"));
int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
Assert.assertEquals(nbAccountsBefore + 1, nbAccountsAfter);
Log.testSuccess("Configure existing sip.linphone.org account");
} }
public void testCDeleteConfiguredAccount() { public void testCDeleteConfiguredAccount() {
@ -99,14 +141,8 @@ public class AccountsTest extends
Assert.assertTrue(solo.searchText("wizard15@sip.linphone.org")); Assert.assertTrue(solo.searchText("wizard15@sip.linphone.org"));
solo.clickOnText("wizard15@sip.linphone.org"); solo.clickOnText("wizard15@sip.linphone.org");
solo.sleep(500);
getActivity().runOnUiThread(new Runnable() { selectItemInListOnUIThread(7);
@Override
public void run() {
ListView list = (ListView) solo.getView(android.R.id.list);
list.setSelection(7);
}
});
solo.clickOnText(context.getString(R.string.pref_delete_account)); solo.clickOnText(context.getString(R.string.pref_delete_account));
int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0); int nbAccountsAfter = prefs.getInt(getActivity().getString(R.string.pref_extra_accounts), 0);
@ -171,7 +207,7 @@ public class AccountsTest extends
solo.enterText((EditText) solo.getView(R.id.setup_username), "wizard42"); solo.enterText((EditText) solo.getView(R.id.setup_username), "wizard42");
solo.enterText((EditText) solo.getView(R.id.setup_password), "wizard42"); solo.enterText((EditText) solo.getView(R.id.setup_password), "wizard42");
solo.enterText((EditText) solo.getView(R.id.setup_password_confirm), "wizard42"); solo.enterText((EditText) solo.getView(R.id.setup_password_confirm), "wizard42");
solo.enterText((EditText) solo.getView(R.id.setup_email), "wizard15@linphone.org"); solo.enterText((EditText) solo.getView(R.id.setup_email), "wizard42@linphone.org");
solo.sleep(sleepingTime); solo.sleep(sleepingTime);
Assert.assertEquals(error.getText(), ""); Assert.assertEquals(error.getText(), "");
Assert.assertTrue(createAccount.isEnabled()); Assert.assertTrue(createAccount.isEnabled());