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

Merge branch 'newUI' of git.linphone.org:linphone-android into newUI

Browse source
This commit is contained in:
Ghislain MARY 2012-09-10 14:43:44 +02:00
commit 2326baebcb
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit b62c4167702f5333686754f55a2da81705e170ba
Subproject commit dd622ab59b545d9a9e970cde920207b86743a310

4
tests/src/org/linphone/test/CallTest.java
View file

@ -1,7 +1,5 @@
package org.linphone.test;
import junit.framework.Assert;
import org.linphone.InCallActivity;
import org.linphone.LinphoneActivity;
import org.linphone.R;
@ -34,9 +32,7 @@ public class CallTest extends
solo.enterText((EditText) solo.getView(R.id.Adress), "cotcot@sip.linphone.org");
solo.clickOnView(solo.getView(R.id.Call));
solo.waitForActivity("InCallActivity", 2000);
solo.assertCurrentActivity("Expected InCall Activity", InCallActivity.class);
Assert.assertTrue(solo.searchText("Simon MORLAT"));
}
@Override

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

@ -73,7 +73,7 @@ public class PushNotificationTest extends
HttpClient httpClient = createHttpClient();
HttpPost httpPost = new HttpPost("https://android.googleapis.com/gcm/send");
httpPost.setHeader("Content-type", "application/x-www-form-urlencoded;charset=UTF-8");
httpPost.setHeader("Authorization", "key=AIzaSyBJAhCVeeqIErwTfYwy-t83_EwvZlCFo9I");
httpPost.setHeader("Authorization", "key=AIzaSyDbCO1_KgFhkig_aaTutxx0jEHIib0i8C0");
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(2);
nameValuePairs.add(new BasicNameValuePair("data.test", "TEST"));
@ -85,6 +85,7 @@ public class PushNotificationTest extends
e.printStackTrace();
}
// Can be true if a previous notification worked and log hasn't been cleared since...
Assert.assertTrue(solo.waitForLogMessage("Push notification received", 3000));
}