From d130cbf98294a79a13aba90d299da5c0445e58fc Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Fri, 29 Dec 2017 13:05:54 +0200 Subject: [PATCH 1/6] Upgraded SipUnit version to 2.0.3 This resolve #RESTCOMM-1487 --- restcomm/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/restcomm/pom.xml b/restcomm/pom.xml index ba929e98f7..09ead10cb0 100644 --- a/restcomm/pom.xml +++ b/restcomm/pom.xml @@ -81,7 +81,7 @@ UTF-8 - + 2.10.1 2.1.2 14.0.1 @@ -119,7 +119,7 @@ 1.0.1 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 @@ - + From 85487304d7f1d3eeb3a787a47071de8287d316ce Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Fri, 29 Dec 2017 13:43:13 +0200 Subject: [PATCH 2/6] Updated mss-arquillian to 1.0.2 This refer to #RESTCOMM-1487 --- restcomm/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/restcomm/pom.xml b/restcomm/pom.xml index 09ead10cb0..ded8fa04c9 100644 --- a/restcomm/pom.xml +++ b/restcomm/pom.xml @@ -116,7 +116,7 @@ 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.3 From 75709788318869483597bdced91a6aeebb49e9b8 Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Fri, 29 Dec 2017 13:46:04 +0200 Subject: [PATCH 3/6] Removed unstable category from TestDialVerb* test classes in order to see results This refer to #RESTCOMM-1487 --- .../testsuite/telephony/TestDialVerbPartThree.java | 6 ++---- .../connect/testsuite/telephony/TestDialVerbPartTwo.java | 9 ++------- 2 files changed, 4 insertions(+), 11 deletions(-) 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")) From 095ba851508f77b1f636fabde98160e671b873e1 Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Fri, 29 Dec 2017 16:36:58 +0200 Subject: [PATCH 4/6] 1) Changed version of wiremock to 1.56 (latest build with Java7), 2) Added wireMockRule.resetScenarios(); wireMockRule.resetMappings(); in the after() method of test classes 3) Removed Unstable test from the excluded tests This refer to #RESTCOMM-1501 --- Jenkinsfile | 2 +- restcomm/restcomm.testsuite/pom.xml | 4 ++-- .../http/GeolocationEndpointTest.java | 2 ++ .../LiveCallModificationAnswerDelayTest.java | 22 ++++++++++--------- .../LiveCallModificationMuteUnMuteTest.java | 16 ++++++++------ .../http/LiveCallModificationTest.java | 2 ++ .../CallLifecycleAnswerDelayTest.java | 2 ++ .../telephony/CallLifecycleTest.java | 2 ++ .../telephony/CallLifecycleTestLive.java | 2 ++ .../telephony/CallRegexSingleTest.java | 2 ++ .../testsuite/telephony/CallRegexTest.java | 2 ++ ...lientsDialAnswerDelayRingingErrorTest.java | 2 ++ .../telephony/ClientsDialAnswerDelayTest.java | 2 ++ .../testsuite/telephony/ClientsDialTest.java | 2 ++ .../telephony/DialActionAnswerDelayTest.java | 4 +++- .../telephony/DialActionOrganizationTest.java | 4 +++- .../testsuite/telephony/DialActionTest.java | 2 ++ .../DialConferenceTerminationTest.java | 2 ++ .../telephony/DialConferenceTest.java | 2 ++ .../DialForkAnswerDelayCancelTest.java | 2 ++ .../telephony/DialForkAnswerDelayTest.java | 2 ++ .../testsuite/telephony/DialForkTest.java | 2 ++ .../DialPureSipNumbersFromPstnTest.java | 3 +-- .../DialRecordingAnswerDelayTest.java | 2 ++ .../DialRecordingS3UploadAnswerDelayTest.java | 2 ++ ...DialRecordingS3UploadNoneSecurityTest.java | 2 ++ .../DialRecordingS3UploadSecureTest.java | 2 ++ .../telephony/DialRecordingTest.java | 3 ++- .../telephony/DialStatusCallbackTest.java | 2 ++ .../ImsClientsDialAnswerDelayCancelTest.java | 2 ++ .../ImsClientsDialAnswerDelayTest.java | 2 ++ .../telephony/ImsClientsDialTest.java | 2 ++ .../testsuite/telephony/ReferTest.java | 2 ++ .../RestcommActingAsProxyAnswerDelayTest.java | 2 ++ .../telephony/RestcommActingAsProxyTest.java | 2 ++ .../SequentialDialingAnswerDelayTest.java | 2 ++ .../telephony/SequentialDialingTest.java | 2 ++ .../telephony/TestDialVerbPartOne.java | 2 ++ .../TestDialVerbPartOneAnswerDelay.java | 2 ++ .../telephony/TestDialVerbPartThree.java | 2 ++ .../TestDialVerbPartThreeAnswerDelay.java | 2 ++ .../telephony/TestDialVerbPartTwo.java | 3 +-- .../TestDialVerbPartTwoAnswerDelay.java | 2 ++ .../testsuite/telephony/TestGatherVerb.java | 2 ++ .../telephony/TestMgcpOperations.java | 2 ++ 45 files changed, 106 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f88ffc4e81..b9a4546e43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,7 +65,7 @@ node("cxs-ups-testsuites_large") { runTestsuite("org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") } else { //exclude alt and exp to make it lighter - runTestsuite("org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests or org.restcomm.connect.commons.annotations.FeatureAltTests or org.restcomm.connect.commons.annotations.FeatureExpTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") + runTestsuite("org.restcomm.connect.commons.annotations.BrokenTests or org.restcomm.connect.commons.annotations.FeatureAltTests or org.restcomm.connect.commons.annotations.FeatureExpTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") } } diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml index f0a9494c46..eb28b35f5f 100644 --- a/restcomm/restcomm.testsuite/pom.xml +++ b/restcomm/restcomm.testsuite/pom.xml @@ -289,7 +289,7 @@ com.github.tomakehurst wiremock - 1.57 + 1.56 standalone @@ -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/http/GeolocationEndpointTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java index 11f595465d..224f07fb84 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java @@ -92,6 +92,8 @@ public class GeolocationEndpointTest { @After public void after() throws InterruptedException { wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(1000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java index 4a8a58705c..10edb81621 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java @@ -130,6 +130,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -698,7 +700,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_dial_branches() throws assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); assertTrue(georgeCall.waitForIncomingCall(30 * 1000)); @@ -739,12 +741,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_dial_branches() throws JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); @@ -793,7 +795,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_initial_call() throws E assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); // assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); @@ -837,12 +839,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_initial_call() throws E JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); @@ -899,7 +901,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); // assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); @@ -937,7 +939,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.REQUEST_TERMINATED, bobCall.getLastReceivedResponse().getStatusCode()); - + //Wait to cancel the other branches Thread.sleep(3000); @@ -945,12 +947,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java index c58f58872e..cff60c474b 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java @@ -119,6 +119,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -188,21 +190,21 @@ public void muteUnmuteInProgressConferenceParticipant() throws Exception { JsonArray callsArray = partObject.getAsJsonArray("calls"); int size = callsArray.size(); assertEquals(2, size); - + logger.info("callsArray: "+callsArray); - + //any call sid String firstCallSid = callsArray.get(0).getAsJsonObject().get("sid").getAsString(); - //Going to mute : + //Going to mute : JsonObject muteResponse = RestcommConferenceParticipantsTool.getInstance().modifyCall(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid, true); - assertNotNull(muteResponse); + assertNotNull(muteResponse); JsonObject modifiedParticipant = RestcommConferenceParticipantsTool.getInstance().getParticipant(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid); assertNotNull(modifiedParticipant); Boolean muted = modifiedParticipant.get("muted").getAsBoolean(); assertTrue(muted); - - //Going to unmute : + + //Going to unmute : JsonObject unmuteResponse = RestcommConferenceParticipantsTool.getInstance().modifyCall(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid, false); assertNotNull(muteResponse); modifiedParticipant = RestcommConferenceParticipantsTool.getInstance().getParticipant(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid); @@ -210,7 +212,7 @@ public void muteUnmuteInProgressConferenceParticipant() throws Exception { muted = modifiedParticipant.get("muted").getAsBoolean(); assertTrue(!muted); } - + @Deployment(name = "LiveCallModificationTest", managed = true, testable = false) public static WebArchive createWebArchiveNoGw() { logger.info("Packaging Test App"); diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java index 93e1afdc3e..a82b3526a4 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java @@ -135,6 +135,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java index 1f71dcad59..a74b93989c 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java @@ -212,6 +212,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java index c6cf91b824..4dffe04210 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java @@ -235,6 +235,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java index c15fb86a04..8ce7b19d40 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java @@ -136,6 +136,8 @@ public void after() throws Exception { } Thread.sleep(2000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java index fa63cf8215..c8c6387d31 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java @@ -225,6 +225,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } 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..e8166590e3 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 @@ -228,6 +228,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java index 4e038ed78f..76d4cc0a07 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java @@ -328,6 +328,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java index b5eca58bef..836e1eb48e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java @@ -366,6 +366,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java index 5a15483e3a..d80b3733d7 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java @@ -386,6 +386,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java index 1a5f16c877..a8faf22903 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java @@ -218,6 +218,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -1261,4 +1263,4 @@ public static WebArchive createWebArchiveNoGw() { "restcomm.script_dialActionTest",resources, replacements); } -} \ No newline at end of file +} diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java index 05de4e0f59..f0fda95ac6 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java @@ -758,7 +758,7 @@ public void testClientsCallEachOtherSameOrganization() throws ParseException, In logger.info("&&&&& LiveCallsArraySize: "+liveCallsArraySize); assertEquals(0, liveCalls); assertEquals(0,liveCallsArraySize); - + } @@ -1050,6 +1050,8 @@ public void after() throws Exception { Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java index 9c67202608..1402a5f893 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java @@ -212,6 +212,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java index df488efe2f..a3ad98aca5 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java @@ -128,6 +128,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java index c296653f55..d4e8231b93 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java @@ -152,6 +152,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java index 7b35d79058..00da32cfac 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java @@ -153,6 +153,8 @@ public void after() throws Exception { Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java index cb774aa106..f0e35b002f 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java @@ -196,6 +196,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java index 2ef438dda0..a865de6796 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java @@ -228,6 +228,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java index d26b484b32..3af2c751c0 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java @@ -111,9 +111,8 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); - /* these will only work in Java8, but seems unccesary wireMockRule.resetMappings(); - wireMockRule.resetScenarios();*/ + wireMockRule.resetScenarios(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java index 00aec2d201..31940aec65 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java @@ -177,6 +177,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java index 216fb11bd6..8ee23b4053 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java @@ -160,6 +160,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java index e2ae61242d..ad98fab3a5 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java @@ -165,6 +165,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java index b735d969ad..0ed9d8621e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java @@ -161,6 +161,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java index 8b03ad3bcf..0dcb5666fe 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java @@ -190,7 +190,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - //do not use this as it requires Java8 wireMockRule.resetMappings(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java index 8e02fc9a96..12be22950e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java @@ -212,6 +212,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java index c3a6a95fba..aeb9813352 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java @@ -176,6 +176,8 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java index 19cc0ee9c9..3f05063102 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java @@ -201,6 +201,8 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java index fd8efe5f62..78e45c7373 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java @@ -244,6 +244,8 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java index ef912e00f7..8bbcde7aec 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java @@ -168,6 +168,8 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java index 13bda1828e..4e603d7ea2 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java @@ -182,6 +182,8 @@ public void after() throws Exception { // } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java index 45b973a63b..a25db8a74e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java @@ -183,6 +183,8 @@ public void after() throws Exception { // } Thread.sleep(1000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java index cbe081d8ac..e745e28059 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java @@ -145,6 +145,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java index d1754b88d7..d4e4284d04 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java @@ -146,6 +146,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java index 206663d2ae..a4cf702922 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java @@ -203,6 +203,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java index 49195475a1..fae74b91f6 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java @@ -200,6 +200,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } 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 c7d55c5d85..2d934c50c9 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 @@ -162,6 +162,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java index a119c0df2e..ee339d8619 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java @@ -156,6 +156,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } 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 e80e6ebebb..e865a6496c 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 @@ -186,9 +186,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - /* these will only work in Java8, but seems unccesary + wireMockRule.resetScenarios(); wireMockRule.resetMappings(); - wireMockRule.resetScenarios();*/ Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java index 4c19c07f8b..871e7fec37 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java @@ -180,6 +180,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java index f55cc44861..b95d0a6389 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java @@ -140,6 +140,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java index 12e1ddb5a9..72032b4cec 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java @@ -145,6 +145,8 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); + wireMockRule.resetScenarios(); + wireMockRule.resetMappings(); Thread.sleep(2000); } From 822e65b3d79241c5087752f2c733513fa384015a Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Sat, 30 Dec 2017 08:26:24 +0200 Subject: [PATCH 5/6] Revert "1) Changed version of wiremock to 1.56 (latest build with Java7), 2) Added wireMockRule.resetScenarios(); wireMockRule.resetMappings(); in the after() method of test classes 3) Removed Unstable test from the excluded tests This refer to #RESTCOMM-1501" This reverts commit 095ba85 --- Jenkinsfile | 2 +- restcomm/restcomm.testsuite/pom.xml | 4 ++-- .../http/GeolocationEndpointTest.java | 2 -- .../LiveCallModificationAnswerDelayTest.java | 22 +++++++++---------- .../LiveCallModificationMuteUnMuteTest.java | 16 ++++++-------- .../http/LiveCallModificationTest.java | 2 -- .../CallLifecycleAnswerDelayTest.java | 2 -- .../telephony/CallLifecycleTest.java | 2 -- .../telephony/CallLifecycleTestLive.java | 2 -- .../telephony/CallRegexSingleTest.java | 2 -- .../testsuite/telephony/CallRegexTest.java | 2 -- ...lientsDialAnswerDelayRingingErrorTest.java | 2 -- .../telephony/ClientsDialAnswerDelayTest.java | 2 -- .../testsuite/telephony/ClientsDialTest.java | 2 -- .../telephony/DialActionAnswerDelayTest.java | 4 +--- .../telephony/DialActionOrganizationTest.java | 4 +--- .../testsuite/telephony/DialActionTest.java | 2 -- .../DialConferenceTerminationTest.java | 2 -- .../telephony/DialConferenceTest.java | 2 -- .../DialForkAnswerDelayCancelTest.java | 2 -- .../telephony/DialForkAnswerDelayTest.java | 2 -- .../testsuite/telephony/DialForkTest.java | 2 -- .../DialPureSipNumbersFromPstnTest.java | 3 ++- .../DialRecordingAnswerDelayTest.java | 2 -- .../DialRecordingS3UploadAnswerDelayTest.java | 2 -- ...DialRecordingS3UploadNoneSecurityTest.java | 2 -- .../DialRecordingS3UploadSecureTest.java | 2 -- .../telephony/DialRecordingTest.java | 3 +-- .../telephony/DialStatusCallbackTest.java | 2 -- .../ImsClientsDialAnswerDelayCancelTest.java | 2 -- .../ImsClientsDialAnswerDelayTest.java | 2 -- .../telephony/ImsClientsDialTest.java | 2 -- .../testsuite/telephony/ReferTest.java | 2 -- .../RestcommActingAsProxyAnswerDelayTest.java | 2 -- .../telephony/RestcommActingAsProxyTest.java | 2 -- .../SequentialDialingAnswerDelayTest.java | 2 -- .../telephony/SequentialDialingTest.java | 2 -- .../telephony/TestDialVerbPartOne.java | 2 -- .../TestDialVerbPartOneAnswerDelay.java | 2 -- .../telephony/TestDialVerbPartThree.java | 2 -- .../TestDialVerbPartThreeAnswerDelay.java | 2 -- .../telephony/TestDialVerbPartTwo.java | 3 ++- .../TestDialVerbPartTwoAnswerDelay.java | 2 -- .../testsuite/telephony/TestGatherVerb.java | 2 -- .../telephony/TestMgcpOperations.java | 2 -- 45 files changed, 27 insertions(+), 106 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b9a4546e43..f88ffc4e81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,7 +65,7 @@ node("cxs-ups-testsuites_large") { runTestsuite("org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") } else { //exclude alt and exp to make it lighter - runTestsuite("org.restcomm.connect.commons.annotations.BrokenTests or org.restcomm.connect.commons.annotations.FeatureAltTests or org.restcomm.connect.commons.annotations.FeatureExpTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") + runTestsuite("org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests or org.restcomm.connect.commons.annotations.FeatureAltTests or org.restcomm.connect.commons.annotations.FeatureExpTests", "org.restcomm.connect.commons.annotations.ParallelClassTests", "16" , "parallel-testing") } } diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml index eb28b35f5f..f0a9494c46 100644 --- a/restcomm/restcomm.testsuite/pom.xml +++ b/restcomm/restcomm.testsuite/pom.xml @@ -289,7 +289,7 @@ com.github.tomakehurst wiremock - 1.56 + 1.57 standalone @@ -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/http/GeolocationEndpointTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java index 224f07fb84..11f595465d 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/GeolocationEndpointTest.java @@ -92,8 +92,6 @@ public class GeolocationEndpointTest { @After public void after() throws InterruptedException { wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(1000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java index 10edb81621..4a8a58705c 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationAnswerDelayTest.java @@ -130,8 +130,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -700,7 +698,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_dial_branches() throws assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); assertTrue(georgeCall.waitForIncomingCall(30 * 1000)); @@ -741,12 +739,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_dial_branches() throws JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); @@ -795,7 +793,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_initial_call() throws E assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); // assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); @@ -839,12 +837,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_initial_call() throws E JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); @@ -901,7 +899,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.RINGING, bobCall.getLastReceivedResponse().getStatusCode()); } - + String bobCallSid = bobCall.getLastReceivedResponse().getMessage().getHeader("X-RestComm-CallSid").toString().split(":")[1].trim(); // assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); @@ -939,7 +937,7 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000)); assertEquals(Response.REQUEST_TERMINATED, bobCall.getLastReceivedResponse().getStatusCode()); - + //Wait to cancel the other branches Thread.sleep(3000); @@ -947,12 +945,12 @@ public void testTerminateDialForkCallWhileRinging_LCM_to_move_initial_call_to_ha JsonObject jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+aliceCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, georgeCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+georgeCallSid+" : "+jsonObj.get("status").getAsString()); assertTrue(jsonObj.get("status").getAsString().equalsIgnoreCase("canceled")); - + cdr = RestcommCallsTool.getInstance().getCall(deploymentUrl.toString(), adminAccountSid, adminAuthToken, bobCallSid); jsonObj = cdr.getAsJsonObject(); logger.info("Status for call: "+bobCallSid+" : "+jsonObj.get("status").getAsString()); diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java index cff60c474b..c58f58872e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationMuteUnMuteTest.java @@ -119,8 +119,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -190,21 +188,21 @@ public void muteUnmuteInProgressConferenceParticipant() throws Exception { JsonArray callsArray = partObject.getAsJsonArray("calls"); int size = callsArray.size(); assertEquals(2, size); - + logger.info("callsArray: "+callsArray); - + //any call sid String firstCallSid = callsArray.get(0).getAsJsonObject().get("sid").getAsString(); - //Going to mute : + //Going to mute : JsonObject muteResponse = RestcommConferenceParticipantsTool.getInstance().modifyCall(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid, true); - assertNotNull(muteResponse); + assertNotNull(muteResponse); JsonObject modifiedParticipant = RestcommConferenceParticipantsTool.getInstance().getParticipant(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid); assertNotNull(modifiedParticipant); Boolean muted = modifiedParticipant.get("muted").getAsBoolean(); assertTrue(muted); - - //Going to unmute : + + //Going to unmute : JsonObject unmuteResponse = RestcommConferenceParticipantsTool.getInstance().modifyCall(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid, false); assertNotNull(muteResponse); modifiedParticipant = RestcommConferenceParticipantsTool.getInstance().getParticipant(deploymentUrl.toString(), adminAccountSid, conferenceSid, adminAuthToken, firstCallSid); @@ -212,7 +210,7 @@ public void muteUnmuteInProgressConferenceParticipant() throws Exception { muted = modifiedParticipant.get("muted").getAsBoolean(); assertTrue(!muted); } - + @Deployment(name = "LiveCallModificationTest", managed = true, testable = false) public static WebArchive createWebArchiveNoGw() { logger.info("Packaging Test App"); diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java index a82b3526a4..93e1afdc3e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java @@ -135,8 +135,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java index a74b93989c..1f71dcad59 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java @@ -212,8 +212,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java index 4dffe04210..c6cf91b824 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java @@ -235,8 +235,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java index 8ce7b19d40..c15fb86a04 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java @@ -136,8 +136,6 @@ public void after() throws Exception { } Thread.sleep(2000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java index c8c6387d31..fa63cf8215 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java @@ -225,8 +225,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } 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 e8166590e3..1cadc92ea9 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 @@ -228,8 +228,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java index 76d4cc0a07..4e038ed78f 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayRingingErrorTest.java @@ -328,8 +328,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java index 836e1eb48e..b5eca58bef 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialAnswerDelayTest.java @@ -366,8 +366,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java index d80b3733d7..5a15483e3a 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java @@ -386,8 +386,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java index a8faf22903..1a5f16c877 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionAnswerDelayTest.java @@ -218,8 +218,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } @@ -1263,4 +1261,4 @@ public static WebArchive createWebArchiveNoGw() { "restcomm.script_dialActionTest",resources, replacements); } -} +} \ No newline at end of file diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java index f0fda95ac6..05de4e0f59 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionOrganizationTest.java @@ -758,7 +758,7 @@ public void testClientsCallEachOtherSameOrganization() throws ParseException, In logger.info("&&&&& LiveCallsArraySize: "+liveCallsArraySize); assertEquals(0, liveCalls); assertEquals(0,liveCallsArraySize); - + } @@ -1050,8 +1050,6 @@ public void after() throws Exception { Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java index 1402a5f893..9c67202608 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialActionTest.java @@ -212,8 +212,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java index a3ad98aca5..df488efe2f 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTerminationTest.java @@ -128,8 +128,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java index d4e8231b93..c296653f55 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java @@ -152,8 +152,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java index 00da32cfac..7b35d79058 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayCancelTest.java @@ -153,8 +153,6 @@ public void after() throws Exception { Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java index f0e35b002f..cb774aa106 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java @@ -196,8 +196,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java index a865de6796..2ef438dda0 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java @@ -228,8 +228,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java index 3af2c751c0..d26b484b32 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialPureSipNumbersFromPstnTest.java @@ -111,8 +111,9 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); + /* these will only work in Java8, but seems unccesary wireMockRule.resetMappings(); - wireMockRule.resetScenarios(); + wireMockRule.resetScenarios();*/ Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java index 31940aec65..00aec2d201 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingAnswerDelayTest.java @@ -177,8 +177,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java index 8ee23b4053..216fb11bd6 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadAnswerDelayTest.java @@ -160,8 +160,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java index ad98fab3a5..e2ae61242d 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadNoneSecurityTest.java @@ -165,8 +165,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java index 0ed9d8621e..b735d969ad 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadSecureTest.java @@ -161,8 +161,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java index 0dcb5666fe..8b03ad3bcf 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingTest.java @@ -190,8 +190,7 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); + //do not use this as it requires Java8 wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java index 12be22950e..8e02fc9a96 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java @@ -212,8 +212,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java index aeb9813352..c3a6a95fba 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java @@ -176,8 +176,6 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java index 3f05063102..19cc0ee9c9 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java @@ -201,8 +201,6 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java index 78e45c7373..fd8efe5f62 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java @@ -244,8 +244,6 @@ public void after() throws Exception { Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(3000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java index 8bbcde7aec..ef912e00f7 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java @@ -168,8 +168,6 @@ public void after() throws Exception { } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java index 4e603d7ea2..13bda1828e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java @@ -182,8 +182,6 @@ public void after() throws Exception { // } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java index a25db8a74e..45b973a63b 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java @@ -183,8 +183,6 @@ public void after() throws Exception { // } Thread.sleep(1000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(4000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java index e745e28059..cbe081d8ac 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingAnswerDelayTest.java @@ -145,8 +145,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java index d4e4284d04..d1754b88d7 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/SequentialDialingTest.java @@ -146,8 +146,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java index a4cf702922..206663d2ae 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOne.java @@ -203,8 +203,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java index fae74b91f6..49195475a1 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartOneAnswerDelay.java @@ -200,8 +200,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } 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 2d934c50c9..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 @@ -162,8 +162,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java index ee339d8619..a119c0df2e 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThreeAnswerDelay.java @@ -156,8 +156,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } 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 e865a6496c..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 @@ -186,8 +186,9 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); + /* these will only work in Java8, but seems unccesary wireMockRule.resetMappings(); + wireMockRule.resetScenarios();*/ Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java index 871e7fec37..4c19c07f8b 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwoAnswerDelay.java @@ -180,8 +180,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java index b95d0a6389..f55cc44861 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestGatherVerb.java @@ -140,8 +140,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } diff --git a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java index 72032b4cec..12e1ddb5a9 100644 --- a/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java +++ b/restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestMgcpOperations.java @@ -145,8 +145,6 @@ public void after() throws Exception { } Thread.sleep(3000); wireMockRule.resetRequests(); - wireMockRule.resetScenarios(); - wireMockRule.resetMappings(); Thread.sleep(2000); } From 76361eae20f143a7120f508ce354e62630014abd Mon Sep 17 00:00:00 2001 From: George Vagenas Date: Sat, 30 Dec 2017 08:37:16 +0200 Subject: [PATCH 6/6] Fixes for testsuite --- restcomm/restcomm.testsuite/pom.xml | 2 +- .../testsuite/telephony/CallRegexTest.java | 54 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) 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