From 147309daa17292c7c5bbf86a7e83f03d4000b457 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 24 Jan 2014 17:04:19 +0100 Subject: [PATCH] Improved tests when running on tablet (+ some fixes) --- res/layout/contact.xml | 1 + tests/src/org/linphone/test/CallsVideo.java | 11 +++++++++-- tests/src/org/linphone/test/Chat.java | 3 ++- tests/src/org/linphone/test/Contacts.java | 7 +++++++ tests/src/org/linphone/test/LinphoneTestManager.java | 6 ++---- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/res/layout/contact.xml b/res/layout/contact.xml index f453ac46a..ef731bbd8 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -52,6 +52,7 @@ diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java index 9dcf7b4e8..4c140fdb3 100644 --- a/tests/src/org/linphone/test/CallsVideo.java +++ b/tests/src/org/linphone/test/CallsVideo.java @@ -27,15 +27,22 @@ public class CallsVideo extends SampleTest { @MediumTest @LargeTest public void testAInit() { - LinphoneTestManager.getLc().enableVideo(true, true); // Just in case - //Disable video + //Enable video goToSettings(); selectItemInListOnUIThread(3); solo.clickOnText(aContext.getString(org.linphone.R.string.pref_video_enable_title)); 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.sleep(1000); Assert.assertTrue(LinphoneManager.getLc().isVideoEnabled()); diff --git a/tests/src/org/linphone/test/Chat.java b/tests/src/org/linphone/test/Chat.java index 923990eb7..d3a91ad80 100644 --- a/tests/src/org/linphone/test/Chat.java +++ b/tests/src/org/linphone/test/Chat.java @@ -12,6 +12,7 @@ import org.linphone.mediastream.Log; import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; +import android.widget.EditText; /** * @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.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.sleep(1000); diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java index 2aec197fa..2d7f01158 100644 --- a/tests/src/org/linphone/test/Contacts.java +++ b/tests/src/org/linphone/test/Contacts.java @@ -7,6 +7,9 @@ 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; /** * @author Sylvain Berfini @@ -103,6 +106,10 @@ public class Contacts extends SampleTest { goToContacts(); 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.delete_contact)); diff --git a/tests/src/org/linphone/test/LinphoneTestManager.java b/tests/src/org/linphone/test/LinphoneTestManager.java index e2580f3e2..e843ffa00 100644 --- a/tests/src/org/linphone/test/LinphoneTestManager.java +++ b/tests/src/org/linphone/test/LinphoneTestManager.java @@ -78,8 +78,7 @@ public class LinphoneTestManager implements LinphoneCoreListener { try { LinphoneCoreFactory.instance().setDebugMode(true, "LinphoneTester"); - String basePath = mAContext.getFilesDir().getAbsolutePath(); - final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, basePath + "/.linphonerc" + id, null, null, c); + final LinphoneCore mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, c); if (id == 2) { mLc2 = mLc; } else { @@ -154,8 +153,7 @@ public class LinphoneTestManager implements LinphoneCoreListener { initAccounts(mLc); mLc.setVideoPolicy(true, true); - boolean isVideoEnabled = true; - mLc.enableVideo(isVideoEnabled, isVideoEnabled); + mLc.enableVideo(true, true); mLc.setUseRfc2833ForDtmfs(false); mLc.setUseSipInfoForDtmfs(true);