diff --git a/restcomm/pom.xml b/restcomm/pom.xml index ba929e98f7..ded8fa04c9 100644 --- a/restcomm/pom.xml +++ b/restcomm/pom.xml @@ -81,7 +81,7 @@ UTF-8 - + 2.10.1 2.1.2 14.0.1 @@ -116,10 +116,10 @@ 2.3.2 1.2.293 1.0.3.Final - 1.0.1 + 1.0.2 1.0.2 2.0.0-alpha-4 - 2.0.1 + 2.0.3 7.0.64 1.0.0.FINAL @@ -538,7 +538,7 @@ smpp-extensions ${smpp-extensions.version} - + org.mockito mockito-core @@ -666,7 +666,7 @@ commons-lang ${commons-lang.version} - + org.mockito mockito-core @@ -781,7 +781,7 @@ - + diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml index f0a9494c46..b98f4bf468 100644 --- a/restcomm/restcomm.testsuite/pom.xml +++ b/restcomm/restcomm.testsuite/pom.xml @@ -505,7 +505,7 @@ every forked JVM/test class--> ${surefire.forkNumber}509 ${surefire.forkNumber}508 - + diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java index 1cadc92ea9..43aa83715c 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java @@ -19,31 +19,9 @@ */ package org.restcomm.connect.testsuite.telephony; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.findAll; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; -import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; -import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; -import static org.cafesip.sipunit.SipAssert.assertLastOperationSuccess; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.MalformedURLException; -import java.net.URL; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.sip.DialogState; -import javax.sip.address.SipURI; -import javax.sip.message.Response; - +import com.github.tomakehurst.wiremock.junit.WireMockRule; +import com.github.tomakehurst.wiremock.verification.LoggedRequest; +import com.google.gson.JsonObject; import org.apache.log4j.Logger; import org.cafesip.sipunit.SipCall; import org.cafesip.sipunit.SipPhone; @@ -70,9 +48,29 @@ import org.restcomm.connect.testsuite.http.RestcommCallsTool; import org.restcomm.connect.testsuite.tools.MonitoringServiceTool; -import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.github.tomakehurst.wiremock.verification.LoggedRequest; -import com.google.gson.JsonObject; +import javax.sip.DialogState; +import javax.sip.address.SipURI; +import javax.sip.message.Response; +import java.net.MalformedURLException; +import java.net.URL; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.findAll; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; +import static org.cafesip.sipunit.SipAssert.assertLastOperationSuccess; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Test for Regex for IncomingPhoneNumbers diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThree.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThree.java index ff902abc75..c7d55c5d85 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThree.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThree.java @@ -46,7 +46,6 @@ import org.restcomm.connect.commons.annotations.ParallelClassTests; import org.restcomm.connect.commons.annotations.WithInMinsTests; import org.restcomm.connect.testsuite.NetworkPortAssigner; -import org.restcomm.connect.commons.annotations.UnstableTests; import org.restcomm.connect.testsuite.WebArchiveUtil; /** @@ -169,7 +168,7 @@ public void after() throws Exception { //Non regression test for https://github.com/Mobicents/RestComm/issues/612 @Test - @Category({UnstableTests.class, FeatureAltTests.class}) + @Category({FeatureAltTests.class}) public synchronized void testRecord_ExecuteRCML_ReturnedFromActionURL() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) @@ -231,7 +230,7 @@ public synchronized void testRecord_ExecuteRCML_ReturnedFromActionURL() throws I //Non regression test for https://github.com/Mobicents/RestComm/issues/612 @Test - @Category({UnstableTests.class, FeatureAltTests.class}) + @Category({FeatureAltTests.class}) public synchronized void testRecord_ExecuteRCML_ReturnedFromActionURLWithNullFinishOnKey() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) @@ -339,7 +338,6 @@ public synchronized void testDialWithCustomHeaders() throws InterruptedException } @Test - @Category(UnstableTests.class) // Non regression test for https://bitbucket.org/telestax/telscale-restcomm/issue/132/implement-twilio-sip-out public synchronized void testDialSip() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java index a5aedc1a78..e80e6ebebb 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java @@ -57,7 +57,6 @@ import org.restcomm.connect.commons.annotations.ParallelClassTests; import org.restcomm.connect.commons.annotations.WithInMinsTests; import org.restcomm.connect.testsuite.NetworkPortAssigner; -import org.restcomm.connect.commons.annotations.UnstableTests; import org.restcomm.connect.testsuite.WebArchiveUtil; /** @@ -253,7 +252,6 @@ public synchronized void testDialClientAliceToBigDID() throws InterruptedExcepti "\t\t\tHello World!\n" + ""; @Test - @Category(UnstableTests.class) public synchronized void testDialClientAliceWithRecord() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) .willReturn(aResponse() @@ -325,7 +323,6 @@ public synchronized void testDialClientAliceWithRecord() throws InterruptedExcep } @Test - @Category(UnstableTests.class) public synchronized void testDialClientAliceWithRecord2() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) .willReturn(aResponse() @@ -507,7 +504,7 @@ public synchronized void testDialConferenceWithDialActionNoRcml() throws Interru "Hello World!"; private String dialConferenceNoDialActionRcml = "test"; @Test - @Category({UnstableTests.class, FeatureAltTests.class}) + @Category(FeatureAltTests.class) public synchronized void testDialConferenceNoDialAction_SendSms() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) .willReturn(aResponse() @@ -706,7 +703,7 @@ public synchronized void testDialClientAliceWithRecordAndStatusCallbackForApp() } @Test //Test case for issue 320 - @Category({UnstableTests.class,FeatureAltTests.class}) + @Category({FeatureAltTests.class}) public synchronized void testDialClientAliceWithRecordAndStatusCallbackForAppForThreeCalls() throws InterruptedException, ParseException, MalformedURLException { stubFor(get(urlPathEqualTo("/1111")) .willReturn(aResponse() @@ -1002,7 +999,6 @@ public synchronized void testRecordWithActionAndStatusCallbackForAppWithDisconne } @Test - @Category(UnstableTests.class) //Test case for github issue 859 public synchronized void testRecordWithActionAndStatusCallbackForAppWithBobSendsFinishKey() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111")) @@ -1537,7 +1533,6 @@ public synchronized void testDialNumberRejectBusyRcml() throws InterruptedExcept private String hangupActionRcml = ""; - @Category(UnstableTests.class) @Test // (customised from testDialClientAliceWithRecordAndStatusCallbackForApp) public synchronized void testDialClientAliceWithActionAndStatusCallbackForApp() throws InterruptedException, ParseException { stubFor(get(urlPathEqualTo("/1111"))