diff --git a/tests/src/org/linphone/test/AccountManagement.java b/tests/src/org/linphone/test/AccountManagement.java index 84fc0a1b0..d6a1198e2 100644 --- a/tests/src/org/linphone/test/AccountManagement.java +++ b/tests/src/org/linphone/test/AccountManagement.java @@ -10,8 +10,6 @@ import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneProxyConfig; import android.test.suitebuilder.annotation.LargeTest; -import android.view.KeyEvent; - /** * @author Sylvain Berfini */ @@ -23,20 +21,18 @@ public class AccountManagement extends SampleTest { solo.clickOnText(iContext.getString(R.string.account_generic_login) + "@" + iContext.getString(R.string.account_generic_domain)); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_username)); solo.enterText(0, "new"); - //Hack to validate the dialog - solo.sendKey(KeyEvent.KEYCODE_ENTER); - solo.sendKey(KeyEvent.KEYCODE_TAB); - solo.sendKey(KeyEvent.KEYCODE_ENTER); - //End of hack + + solo.clickOnView(solo.getView(android.R.id.button1)); solo.goBack(); solo.goBack(); solo.waitForFragmentByTag(FragmentsAvailable.DIALER.toString(), 2000); - solo.sleep(2000); //Wait for registration to be done LinphoneProxyConfig[] proxyConfigs = LinphoneManager.getLc().getProxyConfigList(); + LinphoneProxyConfig proxyConfig = proxyConfigs[0]; + waitForRegistration(proxyConfig); Assert.assertEquals(proxyConfigs.length, 2); - LinphoneProxyConfig proxyConfig = proxyConfigs[1]; + proxyConfig = proxyConfigs[1]; Assert.assertEquals(RegistrationState.RegistrationOk, proxyConfig.getState()); Assert.assertTrue(proxyConfig.getIdentity(), proxyConfig.getIdentity().contains("new")); } @@ -45,7 +41,7 @@ public class AccountManagement extends SampleTest { public void testBDeleteAccount() { goToSettings(); solo.clickOnText(iContext.getString(R.string.account_generic_login) + "new"); - selectItemInListOnUIThread(8); + selectItemInListOnUIThread(16); solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_delete_account)); solo.goBack(); @@ -59,7 +55,7 @@ public class AccountManagement extends SampleTest { public void testCDisableAccount() { goToSettings(); solo.clickOnText(iContext.getString(R.string.account_linphone_login)); - selectItemInListOnUIThread(6); + selectItemInListOnUIThread(14); solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account)); solo.goBack(); @@ -72,7 +68,7 @@ public class AccountManagement extends SampleTest { public void testDEnableAccount() { goToSettings(); solo.clickOnText(iContext.getString(R.string.account_linphone_login)); - selectItemInListOnUIThread(6); + selectItemInListOnUIThread(14); solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account)); solo.goBack(); diff --git a/tests/src/org/linphone/test/CallsAudio.java b/tests/src/org/linphone/test/CallsAudio.java index bd8994d2b..cac6579d7 100644 --- a/tests/src/org/linphone/test/CallsAudio.java +++ b/tests/src/org/linphone/test/CallsAudio.java @@ -245,9 +245,9 @@ public class CallsAudio extends SampleTest { assertCallIsCorrectlyRunning(); solo.clickOnView(solo.getView(org.linphone.R.id.pause)); - LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState(); solo.sleep(1000); - + LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState(); + Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state); solo.clickOnView(solo.getView(org.linphone.R.id.pause)); solo.sleep(1000); diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java index 37450e611..85e8d636e 100644 --- a/tests/src/org/linphone/test/CallsVideo.java +++ b/tests/src/org/linphone/test/CallsVideo.java @@ -35,7 +35,7 @@ public class CallsVideo extends SampleTest { solo.sleep(500); // enable auto accept and auto share video - solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video), 2); + solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video)); solo.sleep(500); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_initiate_call_with_video_title)); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_automatically_accept_video_title)); @@ -261,8 +261,9 @@ public class CallsVideo extends SampleTest { assertCallIsCorrectlyRunning(); solo.clickOnView(solo.getView(org.linphone.R.id.pause)); - LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState(); solo.sleep(1000); + LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState(); + Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state); solo.clickOnView(solo.getView(org.linphone.R.id.pause)); @@ -311,7 +312,8 @@ public class CallsVideo extends SampleTest { Assert.assertTrue(solo.getView(org.linphone.R.id.video).isEnabled()); solo.clickOnView(solo.getView(org.linphone.R.id.video)); - Assert.assertFalse(LinphoneManager.getLc().getCurrentCall().cameraEnabled()); + solo.sleep(1000); + Assert.assertFalse(LinphoneManager.getLc().getCurrentCall().getCurrentParamsCopy().getVideoEnabled()); solo.clickOnView(solo.getView(org.linphone.R.id.hangUp)); solo.waitForActivity("LinphoneActivity", 5000); diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java index a57c2b056..13a9ea336 100644 --- a/tests/src/org/linphone/test/Contacts.java +++ b/tests/src/org/linphone/test/Contacts.java @@ -8,7 +8,6 @@ import org.linphone.LinphoneActivity; import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; -import android.util.DisplayMetrics; import android.view.View; import android.widget.ScrollView; diff --git a/tests/src/org/linphone/test/SampleTest.java b/tests/src/org/linphone/test/SampleTest.java index 558488a44..308a03c4f 100644 --- a/tests/src/org/linphone/test/SampleTest.java +++ b/tests/src/org/linphone/test/SampleTest.java @@ -3,11 +3,14 @@ package org.linphone.test; import org.linphone.LinphoneLauncherActivity; import org.linphone.LinphoneManager; import org.linphone.core.LinphoneCore; +import org.linphone.core.LinphoneProxyConfig; +import org.linphone.core.LinphoneCore.RegistrationState; import android.content.Context; import android.test.ActivityInstrumentationTestCase2; import android.widget.ListView; +import com.robotium.solo.Condition; import com.robotium.solo.Solo; /** @@ -49,4 +52,13 @@ public abstract class SampleTest extends ActivityInstrumentationTestCase2