Skip to content

Updated sipunit to 2.0.3 and mss-arquillian to 1.0.2 #2740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Updated sipunit to 2.0.3 and mss-arquillian to 1.0.2 #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d130cbf
Upgraded SipUnit version to 2.0.3
gvagenas Dec 29, 2017
8548730
Updated mss-arquillian to 1.0.2
gvagenas Dec 29, 2017
7570978
Removed unstable category from TestDialVerb* test classes in order to…
gvagenas Dec 29, 2017
095ba85
1) Changed version of wiremock to 1.56 (latest build with Java7),
gvagenas Dec 29, 2017
822e65b
Revert "1) Changed version of wiremock to 1.56 (latest build with Jav…
gvagenas Dec 30, 2017
76361ea
Fixes for testsuite
gvagenas Dec 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions restcomm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<scala-lang.version>2.10.1</scala-lang.version>
<akka.version>2.1.2</akka.version>
<guava.version>14.0.1</guava.version>
Expand Down Expand Up @@ -116,10 +116,10 @@
<hsqldb.version>2.3.2</hsqldb.version>
<sip-ri.version>1.2.293</sip-ri.version>
<arquillian.version>1.0.3.Final</arquillian.version>
<mss.arquillian.version>1.0.1</mss.arquillian.version>
<mss.arquillian.version>1.0.2</mss.arquillian.version>
<mss.shrinkwrap.version>1.0.2</mss.shrinkwrap.version>
<shrinkwrap.resolver.version>2.0.0-alpha-4</shrinkwrap.resolver.version>
<sipunit.version>2.0.1</sipunit.version>
<sipunit.version>2.0.3</sipunit.version>
<!--tomcat.version>6.0.35</tomcat.version -->
<tomcat7.version>7.0.64</tomcat7.version>
<mobicents.checkstyle.version>1.0.0.FINAL</mobicents.checkstyle.version>
Expand Down Expand Up @@ -538,7 +538,7 @@
<artifactId>smpp-extensions</artifactId>
<version>${smpp-extensions.version}</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -666,7 +666,7 @@
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -781,7 +781,7 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion restcomm/restcomm.testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@
every forked JVM/test class-->
<arquillian_http_port>${surefire.forkNumber}509</arquillian_http_port>
<arquillian_sip_port>${surefire.forkNumber}508</arquillian_sip_port>
</systemPropertyVariables>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down
54 changes: 26 additions & 28 deletions ...tcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions ...stsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartThree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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"))
Expand Down
9 changes: 2 additions & 7 deletions ...testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -253,7 +252,6 @@ public synchronized void testDialClientAliceToBigDID() throws InterruptedExcepti
"\t\t\t<Sms to=\"bob\" from=\"+12223334499\">Hello World!</Sms>\n" +
"</Response>";
@Test
@Category(UnstableTests.class)
public synchronized void testDialClientAliceWithRecord() throws InterruptedException, ParseException {
stubFor(get(urlPathEqualTo("/1111"))
.willReturn(aResponse()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -507,7 +504,7 @@ public synchronized void testDialConferenceWithDialActionNoRcml() throws Interru
"<Sms to=\"bob\" from=\"+12223334499\">Hello World!</Sms></Response>";
private String dialConferenceNoDialActionRcml = "<Response><Dial><Conference>test</Conference></Dial></Response>";
@Test
@Category({UnstableTests.class, FeatureAltTests.class})
@Category(FeatureAltTests.class)
public synchronized void testDialConferenceNoDialAction_SendSms() throws InterruptedException, ParseException {
stubFor(get(urlPathEqualTo("/1111"))
.willReturn(aResponse()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -1537,7 +1533,6 @@ public synchronized void testDialNumberRejectBusyRcml() throws InterruptedExcept

private String hangupActionRcml = "<Response><Hangup /></Response>";

@Category(UnstableTests.class)
@Test // (customised from testDialClientAliceWithRecordAndStatusCallbackForApp)
public synchronized void testDialClientAliceWithActionAndStatusCallbackForApp() throws InterruptedException, ParseException {
stubFor(get(urlPathEqualTo("/1111"))
Expand Down