diff --git a/submodules/externals/exosip b/submodules/externals/exosip index b62c41677..dd622ab59 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit b62c4167702f5333686754f55a2da81705e170ba +Subproject commit dd622ab59b545d9a9e970cde920207b86743a310 diff --git a/submodules/linphone b/submodules/linphone index 62ce92ff6..2c7cc3a26 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 62ce92ff69c6920bbd71c4b4276fd5b4a843b3d2 +Subproject commit 2c7cc3a261764fa65a31d177cba6c31b7ae249fd diff --git a/tests/src/org/linphone/test/CallTest.java b/tests/src/org/linphone/test/CallTest.java index 955dcecf9..7309a6d3c 100644 --- a/tests/src/org/linphone/test/CallTest.java +++ b/tests/src/org/linphone/test/CallTest.java @@ -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 diff --git a/tests/src/org/linphone/test/PushNotificationTest.java b/tests/src/org/linphone/test/PushNotificationTest.java index 6e13d6d0b..62c4d63fc 100644 --- a/tests/src/org/linphone/test/PushNotificationTest.java +++ b/tests/src/org/linphone/test/PushNotificationTest.java @@ -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 nameValuePairs = new ArrayList(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)); }