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

Improved tests when running on tablet (+ some fixes)

Browse source
This commit is contained in:
Sylvain Berfini 2014-01-24 17:04:19 +01:00
parent 230cb1fcd1
commit 147309daa1
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/layout/contact.xml
View file

@ -52,6 +52,7 @@
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
android:id="@+id/controlsScrollView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">

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

@ -27,15 +27,22 @@ public class CallsVideo extends SampleTest {
@MediumTest @MediumTest
@LargeTest @LargeTest
public void testAInit() { public void testAInit() {
LinphoneTestManager.getLc().enableVideo(true, true); // Just in case
//Disable video //Enable video
goToSettings(); goToSettings();
selectItemInListOnUIThread(3); selectItemInListOnUIThread(3);
solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title)); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title));
solo.sleep(500); solo.sleep(500);
// enable auto accept and auto share video
solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video), 2);
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));
solo.sleep(500);
solo.goBack();
solo.goBack(); solo.goBack();
solo.sleep(1000); solo.sleep(1000);
Assert.assertTrue(LinphoneManager.getLc().isVideoEnabled()); Assert.assertTrue(LinphoneManager.getLc().isVideoEnabled());

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

@ -12,6 +12,7 @@ import org.linphone.mediastream.Log;
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.widget.EditText;
/** /**
* @author Sylvain Berfini * @author Sylvain Berfini
@ -48,7 +49,7 @@ public class Chat extends SampleTest {
solo.enterText(0, "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain)); solo.enterText(0, "sip:" + iContext.getString(R.string.account_test_calls_login) + "@" + iContext.getString(R.string.account_test_calls_domain));
solo.clickOnView(solo.getView(org.linphone.R.id.newDiscussion)); solo.clickOnView(solo.getView(org.linphone.R.id.newDiscussion));
solo.enterText(0, 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.sendMessage)); solo.clickOnView(solo.getView(org.linphone.R.id.sendMessage));
solo.sleep(1000); solo.sleep(1000);

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

@ -7,6 +7,9 @@ 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.widget.ScrollView;
/** /**
* @author Sylvain Berfini * @author Sylvain Berfini
@ -103,6 +106,10 @@ public class Contacts extends SampleTest {
goToContacts(); goToContacts();
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name)); solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
//Scroll down a bit on some small screens to see the delete button
((ScrollView)solo.getView(aContext.getString(org.linphone.R.id.controlsScrollView))).fullScroll(View.FOCUS_DOWN);
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit)); solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact)); solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));

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

@ -78,8 +78,7 @@ public class LinphoneTestManager implements LinphoneCoreListener {
try { try {
LinphoneCoreFactory.instance().setDebugMode(true, "LinphoneTester"); LinphoneCoreFactory.instance().setDebugMode(true, "LinphoneTester");
String basePath = mAContext.getFilesDir().getAbsolutePath(); final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, c);
final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, basePath + "/.linphonerc" + id, null, null, c);
if (id == 2) { if (id == 2) {
mLc2 = mLc; mLc2 = mLc;
} else { } else {
@ -154,8 +153,7 @@ public class LinphoneTestManager implements LinphoneCoreListener {
initAccounts(mLc); initAccounts(mLc);
mLc.setVideoPolicy(true, true); mLc.setVideoPolicy(true, true);
boolean isVideoEnabled = true; mLc.enableVideo(true, true);
mLc.enableVideo(isVideoEnabled, isVideoEnabled);
mLc.setUseRfc2833ForDtmfs(false); mLc.setUseRfc2833ForDtmfs(false);
mLc.setUseSipInfoForDtmfs(true); mLc.setUseSipInfoForDtmfs(true);