Updated belle_sip & liblinphone + more tests for contacts, history and chat

This commit is contained in:
Sylvain Berfini 2013-06-13 16:28:49 +02:00
parent 13ccc6610f
commit 17b07db88d
8 changed files with 201 additions and 7 deletions

@ -1 +1 @@
Subproject commit bf18b75f10bfb50459d916cea614a887bbdc8570
Subproject commit 8b7546d3bebce04c9c67457bfe44805e0b87caee

@ -1 +1 @@
Subproject commit 9e60a96b18b385d9a92193abe372a6314765fda5
Subproject commit 5d3526a77888450e65c67c0ec2ccea6ccae7d5a0

View file

@ -17,6 +17,10 @@
<string name="account_test_calls_pwd">lucifer</string>
<string name="account_test_calls_domain">sip.linphone.org</string>
<string name="contact_name">Cot</string>
<string name="contact_number">+33952636505</string>
<string name="contact_sip">viish@sip.linphone.org</string>
<string name="chat_test_text_sent">Ping!</string>
<string name="chat_test_text_received">Pong!</string>

View file

@ -75,7 +75,6 @@ public class AccountAssistant extends SampleTest {
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
}
@MediumTest
@LargeTest
public void testDLoginWithGenericAccount() {
startWizard();

View file

@ -9,12 +9,10 @@ import org.linphone.core.LinphoneCore.RegistrationState;
import org.linphone.core.LinphoneProxyConfig;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.KeyEvent;
public class AccountManagement extends SampleTest {
@MediumTest
@LargeTest
public void testAEditAccount() {
goToSettings();
@ -39,7 +37,6 @@ public class AccountManagement extends SampleTest {
Assert.assertTrue(proxyConfig.getIdentity(), proxyConfig.getIdentity().contains("new"));
}
@MediumTest
@LargeTest
public void testBDeleteAccount() {
goToSettings();

View file

@ -78,6 +78,33 @@ public class Chat extends SampleTest {
Assert.assertTrue(solo.searchText(iContext.getString(R.string.chat_test_text_received)));
}
@MediumTest
@LargeTest
public void testFDeleteMessage() {
goToChat();
solo.clickOnText(iContext.getString(org.linphone.test.R.string.account_test_calls_login));
solo.clickLongOnText(iContext.getString(R.string.chat_test_text_received));
solo.clickOnText(aContext.getString(org.linphone.R.string.delete));
solo.sleep(1000);
Assert.assertFalse(solo.searchText(iContext.getString(R.string.chat_test_text_received)));
}
@SmallTest
@MediumTest
@LargeTest
public void testGDeleteConversation() {
goToChat();
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnView(solo.getView(org.linphone.R.id.delete));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
solo.sleep(1000);
Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_chat_history)));
}
@SmallTest
@MediumTest
@LargeTest

View file

@ -0,0 +1,118 @@
package org.linphone.test;
import junit.framework.Assert;
import org.linphone.LinphoneActivity;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
public class Contacts extends SampleTest {
@MediumTest
@LargeTest
public void testAAddContactFromHistoryAndDeleteIt() {
goToHistory();
solo.clickOnView(solo.getView(org.linphone.R.id.detail));
solo.clickOnText(aContext.getString(org.linphone.R.string.add_to_contacts));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_add_contact));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.account_test_calls_login) + "@" + iContext.getString(org.linphone.test.R.string.account_test_calls_domain)));
solo.enterText(0, iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));
Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
}
@SmallTest
@MediumTest
@LargeTest
public void testBCreateContactWithPhoneNumber() {
goToContacts();
solo.clickOnText(aContext.getString(org.linphone.R.string.button_add_contact));
solo.enterText(0, iContext.getString(org.linphone.test.R.string.contact_name));
solo.enterText(2, iContext.getString(org.linphone.test.R.string.contact_number));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
}
@MediumTest
@LargeTest
public void testCTestContactFilter1() {
goToContacts();
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_sip_contacts));
Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
}
@MediumTest
@LargeTest
public void testDEditContactAddSipAddressAndRemoveNumber() {
goToContacts();
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnView(solo.getView(org.linphone.R.id.delete));
solo.enterText(3, iContext.getString(org.linphone.test.R.string.contact_sip));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_sip)));
Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_number)));
}
@MediumTest
@LargeTest
public void testETestContactFilter2() {
goToContacts();
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_sip_contacts));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
}
@MediumTest
@LargeTest
public void testFStartChatFromContact() {
goToContacts();
}
@SmallTest
@MediumTest
@LargeTest
public void testGDeleteContact() {
goToContacts();
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));
Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
}
private void goToContacts() {
solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
solo.clickOnView(solo.getView(org.linphone.R.id.contacts));
}
private void goToHistory() {
solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
solo.clickOnView(solo.getView(org.linphone.R.id.history));
}
}

View file

@ -2,7 +2,9 @@ package org.linphone.test;
import junit.framework.Assert;
import org.linphone.InCallActivity;
import org.linphone.LinphoneActivity;
import org.linphone.core.LinphoneCall;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
@ -15,11 +17,58 @@ public class History extends SampleTest {
@LargeTest
public void testACheckForTestCallInHistory() {
goToHistory();
Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.today)));
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.account_test_calls_login)));
}
@MediumTest
@LargeTest
public void testBFilterMissedCalls() {
goToHistory();
solo.clickOnText(aContext.getString(org.linphone.R.string.button_missed_call));
Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_missed_call_history)));
}
public void testCCallBackFromHistory() {
goToHistory();
solo.clickOnText(iContext.getString(org.linphone.test.R.string.account_test_calls_login));
solo.waitForActivity("InCallActivity", 5000);
solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
solo.sleep(2000);
Assert.assertEquals(LinphoneCall.State.StreamsRunning, LinphoneTestManager.getLc().getCalls()[0].getState());
solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
solo.waitForActivity("LinphoneActivity", 5000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
}
@MediumTest
@LargeTest
public void testDDeleteOne() {
goToHistory();
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnView(solo.getView(org.linphone.R.id.delete));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
}
@SmallTest
@MediumTest
@LargeTest
public void testEDeleteAll() {
goToHistory();
solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
solo.clickOnView(solo.getView(org.linphone.R.id.deleteAll));
solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_call_history)));
}
private void goToHistory() {
solo.waitForActivity("LinphoneActivity", 2000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);