From 045d0d5e1b5a44cae1900df75eaed9076b23a71a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Mon, 1 Oct 2012 17:05:50 +0200
Subject: [PATCH] Outgoing calls (audio/video) with every codec tests added

---
 res/raw/linphonerc                            |   1 +
 ...Test.java => AudioAndVideoCodecsTest.java} | 107 +++++++++++++++---
 tests/src/org/linphone/test/HistoryTest.java  |   4 +
 .../org/linphone/test/OutgoingCallTest.java   |  44 -------
 4 files changed, 99 insertions(+), 57 deletions(-)
 rename tests/src/org/linphone/test/{AudioCodecsTest.java => AudioAndVideoCodecsTest.java} (70%)
 delete mode 100644 tests/src/org/linphone/test/OutgoingCallTest.java

diff --git a/res/raw/linphonerc b/res/raw/linphonerc
index a02bb8111..beea5e513 100644
--- a/res/raw/linphonerc
+++ b/res/raw/linphonerc
@@ -21,6 +21,7 @@ auto_net_state_mon=0
 keepalive_period=30000
 auto_answer_replacing_calls=1
 media_encryption_mandatory=0
+ping_with_options=0
 
 [rtp]
 audio_rtp_port=7076
diff --git a/tests/src/org/linphone/test/AudioCodecsTest.java b/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
similarity index 70%
rename from tests/src/org/linphone/test/AudioCodecsTest.java
rename to tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
index 9f926d107..f23a103f4 100644
--- a/tests/src/org/linphone/test/AudioCodecsTest.java
+++ b/tests/src/org/linphone/test/AudioAndVideoCodecsTest.java
@@ -15,12 +15,12 @@ import android.widget.ListView;
 
 import com.jayway.android.robotium.solo.Solo;
 
-public class AudioCodecsTest extends ActivityInstrumentationTestCase2<LinphoneActivity> {
-
+public class AudioAndVideoCodecsTest extends ActivityInstrumentationTestCase2<LinphoneActivity> {
+	private static final String sipAdressToCall = "miaou@sip.linphone.org";
 	private Solo solo;
 	
 	@SuppressWarnings("deprecation")
-	public AudioCodecsTest() {
+	public AudioAndVideoCodecsTest() {
 		super("org.linphone", LinphoneActivity.class);
 	}
 	
@@ -53,6 +53,19 @@ public class AudioCodecsTest extends ActivityInstrumentationTestCase2<LinphoneAc
 		solo.sleep(500);
 	}
 	
+	private void goToVideoCodecsSettings() {
+		Context context = getActivity();
+		
+		solo.waitForActivity("LinphoneActivity", 2000);
+		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
+		solo.clickOnView(solo.getView(R.id.settings));
+
+		solo.sleep(500);
+		selectItemInListOnUIThread(14);
+		solo.clickOnText(context.getString(R.string.pref_video_codecs_title), 2); //Hack: since pref_codecs = pref_video_codecs_title, we have to select the 2nd button
+		solo.sleep(500);
+	}
+	
 	private void disableAllEnabledAudioCodecs() {
 		Context context = getActivity();
 		
@@ -110,10 +123,32 @@ public class AudioCodecsTest extends ActivityInstrumentationTestCase2<LinphoneAc
 		}
 	}
 	
+	private void disableAllEnabledVideoCodecs() {
+		Context context = getActivity();
+		
+		goToVideoCodecsSettings();
+		
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_vp8_key), false)) {
+			solo.clickOnText(context.getString(R.string.pref_video_codec_vp8_title));
+			solo.sleep(500);
+		}
+		
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_h264_key), false)) {
+			solo.clickOnText(context.getString(R.string.pref_video_codec_h264_title));
+			solo.sleep(500);
+		}
+		
+		if (prefs.getBoolean(context.getString(R.string.pref_video_codec_mpeg4_key), false)) {
+			solo.clickOnText(context.getString(R.string.pref_video_codec_mpeg4_title));
+			solo.sleep(500);
+		}
+	}
+	
 	private void goToDialerAndOutgoingCall(String codecTextToAssert) {
 		solo.clickOnView(solo.getView(R.id.dialer));
 		solo.clickOnView(solo.getView(R.id.Adress));
-		solo.enterText((EditText) solo.getView(R.id.Adress), "cotcot@sip.linphone.org");
+		solo.enterText((EditText) solo.getView(R.id.Adress), sipAdressToCall);
 		solo.clickOnView(solo.getView(R.id.Call));
 		
 		solo.waitForActivity("InCallActivity", 2000);
@@ -215,15 +250,6 @@ public class AudioCodecsTest extends ActivityInstrumentationTestCase2<LinphoneAc
 		goToDialerAndOutgoingCall("iLBC");
 	}
 	
-	public void testKOutgoingAudioCallSpeex16() {
-		Context context = getActivity();
-		disableAllEnabledAudioCodecs();
-		solo.clickOnText(context.getString(R.string.pref_codec_speex16));
-		solo.goBack();
-		
-		goToDialerAndOutgoingCall("speex");
-	}
-	
 	public void testJOutgoingAudioCallSpeex8() {
 		Context context = getActivity();
 		disableAllEnabledAudioCodecs();
@@ -233,8 +259,63 @@ public class AudioCodecsTest extends ActivityInstrumentationTestCase2<LinphoneAc
 		goToDialerAndOutgoingCall("speex");
 	}
 	
+	public void testKOutgoingAudioCallSpeex16() {
+		Context context = getActivity();
+		disableAllEnabledAudioCodecs();
+		solo.clickOnText(context.getString(R.string.pref_codec_speex16));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("speex");
+	}
+	
+	public void testLEnableVideo() {
+		Context context = getActivity();
+		
+		solo.waitForActivity("LinphoneActivity", 2000);
+		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
+		solo.clickOnView(solo.getView(R.id.settings));
+
+		solo.sleep(500);
+		selectItemInListOnUIThread(4);
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+		if (!prefs.getBoolean(context.getString(R.string.pref_video_enable_key), true)) {
+			solo.clickOnText(context.getString(R.string.pref_video_enable_title));
+			solo.sleep(500);
+		}
+	}
+	
+	public void testMOutgoingVideoCallVP8() {
+		Context context = getActivity();
+		disableAllEnabledVideoCodecs();
+		solo.clickOnText(context.getString(R.string.pref_video_codec_vp8_title));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("VP8");
+	}
+	
+	public void testNOutgoingVideoCallH264() {
+		Context context = getActivity();
+		disableAllEnabledVideoCodecs();
+		solo.clickOnText(context.getString(R.string.pref_video_codec_h264_title));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("H264");
+	}
+	
+	public void testOOutgoingVideoCallMPG4() {
+		Context context = getActivity();
+		disableAllEnabledVideoCodecs();
+		solo.clickOnText(context.getString(R.string.pref_video_codec_mpeg4_title));
+		solo.goBack();
+		
+		goToDialerAndOutgoingCall("MP4V-ES");
+	}
+	
 	@Override
 	public void tearDown() throws Exception {
+		if (solo.getCurrentActivity().getClass() == InCallActivity.class) {
+			solo.clickOnView(solo.getView(R.id.hangUp));
+		}
         solo.finishOpenedActivities();
 	}
 }
diff --git a/tests/src/org/linphone/test/HistoryTest.java b/tests/src/org/linphone/test/HistoryTest.java
index bb19b42df..58c0e6675 100644
--- a/tests/src/org/linphone/test/HistoryTest.java
+++ b/tests/src/org/linphone/test/HistoryTest.java
@@ -4,6 +4,7 @@ import junit.framework.Assert;
 
 import org.linphone.InCallActivity;
 import org.linphone.LinphoneActivity;
+import org.linphone.LinphoneManager;
 import org.linphone.R;
 
 import android.content.Context;
@@ -36,6 +37,9 @@ public class HistoryTest extends ActivityInstrumentationTestCase2<LinphoneActivi
 	  protected void setUp() throws Exception {
 	    super.setUp();
 		solo = new Solo(getInstrumentation(), getActivity());
+		
+		//Depending on previous tests, history may not be empty
+		LinphoneManager.getLc().clearCallLogs();
 	}
 	
 	public void testADisplayEmptyHistory() {
diff --git a/tests/src/org/linphone/test/OutgoingCallTest.java b/tests/src/org/linphone/test/OutgoingCallTest.java
deleted file mode 100644
index 224fe7c7a..000000000
--- a/tests/src/org/linphone/test/OutgoingCallTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.linphone.test;
-
-import org.linphone.InCallActivity;
-import org.linphone.LinphoneActivity;
-import org.linphone.R;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.EditText;
-
-import com.jayway.android.robotium.solo.Solo;
-
-public class OutgoingCallTest extends
-		ActivityInstrumentationTestCase2<LinphoneActivity> {
-
-	private Solo solo;
-	
-	@SuppressWarnings("deprecation")
-	public OutgoingCallTest() {
-		super("org.linphone", LinphoneActivity.class);
-	}
-
-	@Override
-	  protected void setUp() throws Exception {
-	    super.setUp();
-		solo = new Solo(getInstrumentation(), getActivity());
-	}
-	
-	public void testOutgoingCallToCotcot() {
-		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
-		
-		solo.clickOnView(solo.getView(R.id.Adress));
-		solo.enterText((EditText) solo.getView(R.id.Adress), "cotcot@sip.linphone.org");
-		solo.clickOnView(solo.getView(R.id.Call));
-		
-		solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
-	}
-	
-	@Override
-	public void tearDown() throws Exception {
-		solo.clickOnView(solo.getView(R.id.hangUp));
-		solo.waitForActivity("LinphoneActivity", 2000);
-        solo.finishOpenedActivities();
-	}
-}