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 2014-08-20 15:20:13 +02:00
parent 2d32567158
commit d483965f36
5 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/src/org/linphone/test/AccountManagement.java
View file

@ -10,8 +10,6 @@ import org.linphone.core.LinphoneCore.RegistrationState;
import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneProxyConfig;
import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.LargeTest;
import android.view.KeyEvent;
/** /**
* @author Sylvain Berfini * @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(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.clickOnText(aContext.getString(org.linphone.R.string.pref_username));
solo.enterText(0, "new"); solo.enterText(0, "new");
//Hack to validate the dialog
solo.sendKey(KeyEvent.KEYCODE_ENTER); solo.clickOnView(solo.getView(android.R.id.button1));
solo.sendKey(KeyEvent.KEYCODE_TAB);
solo.sendKey(KeyEvent.KEYCODE_ENTER);
//End of hack
solo.goBack(); solo.goBack();
solo.goBack(); solo.goBack();
solo.waitForFragmentByTag(FragmentsAvailable.DIALER.toString(), 2000); solo.waitForFragmentByTag(FragmentsAvailable.DIALER.toString(), 2000);
solo.sleep(2000); //Wait for registration to be done
LinphoneProxyConfig[] proxyConfigs = LinphoneManager.getLc().getProxyConfigList(); LinphoneProxyConfig[] proxyConfigs = LinphoneManager.getLc().getProxyConfigList();
LinphoneProxyConfig proxyConfig = proxyConfigs[0];
waitForRegistration(proxyConfig);
Assert.assertEquals(proxyConfigs.length, 2); Assert.assertEquals(proxyConfigs.length, 2);
LinphoneProxyConfig proxyConfig = proxyConfigs[1]; proxyConfig = proxyConfigs[1];
Assert.assertEquals(RegistrationState.RegistrationOk, proxyConfig.getState()); Assert.assertEquals(RegistrationState.RegistrationOk, proxyConfig.getState());
Assert.assertTrue(proxyConfig.getIdentity(), proxyConfig.getIdentity().contains("new")); Assert.assertTrue(proxyConfig.getIdentity(), proxyConfig.getIdentity().contains("new"));
} }
@ -45,7 +41,7 @@ public class AccountManagement extends SampleTest {
public void testBDeleteAccount() { public void testBDeleteAccount() {
goToSettings(); goToSettings();
solo.clickOnText(iContext.getString(R.string.account_generic_login) + "new"); 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.clickLongOnText(aContext.getString(org.linphone.R.string.pref_delete_account));
solo.goBack(); solo.goBack();
@ -59,7 +55,7 @@ public class AccountManagement extends SampleTest {
public void testCDisableAccount() { public void testCDisableAccount() {
goToSettings(); goToSettings();
solo.clickOnText(iContext.getString(R.string.account_linphone_login)); 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.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account));
solo.goBack(); solo.goBack();
@ -72,7 +68,7 @@ public class AccountManagement extends SampleTest {
public void testDEnableAccount() { public void testDEnableAccount() {
goToSettings(); goToSettings();
solo.clickOnText(iContext.getString(R.string.account_linphone_login)); 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.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account));
solo.goBack(); solo.goBack();

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

@ -245,8 +245,8 @@ public class CallsAudio extends SampleTest {
assertCallIsCorrectlyRunning(); assertCallIsCorrectlyRunning();
solo.clickOnView(solo.getView(org.linphone.R.id.pause)); solo.clickOnView(solo.getView(org.linphone.R.id.pause));
LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState();
solo.sleep(1000); solo.sleep(1000);
LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState();
Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state); Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state);
solo.clickOnView(solo.getView(org.linphone.R.id.pause)); solo.clickOnView(solo.getView(org.linphone.R.id.pause));

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

@ -35,7 +35,7 @@ public class CallsVideo extends SampleTest {
solo.sleep(500); solo.sleep(500);
// enable auto accept and auto share video // 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.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_initiate_call_with_video_title));
solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_automatically_accept_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(); assertCallIsCorrectlyRunning();
solo.clickOnView(solo.getView(org.linphone.R.id.pause)); solo.clickOnView(solo.getView(org.linphone.R.id.pause));
LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState();
solo.sleep(1000); solo.sleep(1000);
LinphoneCall.State state = LinphoneManager.getLc().getCalls()[0].getState();
Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state); Assert.assertTrue(LinphoneCall.State.Paused == state || LinphoneCall.State.Pausing == state);
solo.clickOnView(solo.getView(org.linphone.R.id.pause)); 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()); Assert.assertTrue(solo.getView(org.linphone.R.id.video).isEnabled());
solo.clickOnView(solo.getView(org.linphone.R.id.video)); 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.clickOnView(solo.getView(org.linphone.R.id.hangUp));
solo.waitForActivity("LinphoneActivity", 5000); solo.waitForActivity("LinphoneActivity", 5000);

1
tests/src/org/linphone/test/Contacts.java
View file

@ -8,7 +8,6 @@ import org.linphone.LinphoneActivity;
import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import android.util.DisplayMetrics;
import android.view.View; import android.view.View;
import android.widget.ScrollView; import android.widget.ScrollView;

12
tests/src/org/linphone/test/SampleTest.java
View file

@ -3,11 +3,14 @@ package org.linphone.test;
import org.linphone.LinphoneLauncherActivity; import org.linphone.LinphoneLauncherActivity;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneProxyConfig;
import org.linphone.core.LinphoneCore.RegistrationState;
import android.content.Context; import android.content.Context;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
import android.widget.ListView; import android.widget.ListView;
import com.robotium.solo.Condition;
import com.robotium.solo.Solo; import com.robotium.solo.Solo;
/** /**
@ -49,4 +52,13 @@ public abstract class SampleTest extends ActivityInstrumentationTestCase2<Linpho
} }
}); });
} }
protected void waitForRegistration(final LinphoneProxyConfig lpc) {
solo.waitForCondition(new Condition() {
@Override
public boolean isSatisfied() {
return RegistrationState.RegistrationOk == lpc.getState();
}
},30000);
}
} }