Skip to content

Commit ab54ab3

Browse files
jaimecaserojaimecasero
committed
Merge branch 'restcomm1657' of https://github.com/RestComm/Restcomm-Connect into restcomm1657
2 parents 13c9094 + fcdc2ae commit ab54ab3

3 files changed

Lines changed: 62 additions & 50 deletions

File tree

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayCancelTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,22 @@
4848
import org.junit.After;
4949
import org.junit.Before;
5050
import org.junit.BeforeClass;
51+
import org.junit.FixMethodOrder;
5152
import org.junit.Rule;
5253
import org.junit.Test;
53-
import org.junit.FixMethodOrder;
54-
import org.junit.runners.MethodSorters;
54+
import org.junit.experimental.categories.Category;
5555
import org.junit.runner.RunWith;
56+
import org.junit.runners.MethodSorters;
5657
import org.restcomm.connect.commons.Version;
58+
import org.restcomm.connect.commons.annotations.FeatureAltTests;
59+
import org.restcomm.connect.commons.annotations.SequentialClassTests;
60+
import org.restcomm.connect.commons.annotations.UnstableTests;
61+
import org.restcomm.connect.testsuite.SipStackTool;
5762
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
5863
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
5964

6065
import com.github.tomakehurst.wiremock.junit.WireMockRule;
6166
import com.google.gson.JsonObject;
62-
import org.junit.experimental.categories.Category;
63-
import org.restcomm.connect.commons.annotations.FeatureAltTests;
64-
import org.restcomm.connect.commons.annotations.SequentialClassTests;
65-
import org.restcomm.connect.commons.annotations.UnstableTests;
6667

6768
/**
6869
* Test for clients with or without VoiceURL (Bitbucket issue 115). Clients without VoiceURL can dial anything.

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.sql.SQLException;
1111
import java.text.ParseException;
1212
import java.util.ArrayList;
13+
import java.util.Arrays;
1314
import java.util.HashMap;
1415
import java.util.List;
1516
import java.util.Map;
@@ -48,12 +49,19 @@
4849
import org.junit.After;
4950
import org.junit.Before;
5051
import org.junit.BeforeClass;
52+
import org.junit.FixMethodOrder;
5153
import org.junit.Rule;
5254
import org.junit.Test;
53-
import org.junit.FixMethodOrder;
54-
import org.junit.runners.MethodSorters;
55+
import org.junit.experimental.categories.Category;
5556
import org.junit.runner.RunWith;
57+
import org.junit.runners.MethodSorters;
5658
import org.restcomm.connect.commons.Version;
59+
import org.restcomm.connect.commons.annotations.FeatureAltTests;
60+
import org.restcomm.connect.commons.annotations.ParallelClassTests;
61+
import org.restcomm.connect.commons.annotations.UnstableTests;
62+
import org.restcomm.connect.testsuite.NetworkPortAssigner;
63+
import org.restcomm.connect.testsuite.SipStackTool;
64+
import org.restcomm.connect.testsuite.WebArchiveUtil;
5765
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
5866
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
5967
import org.restcomm.connect.testsuite.tools.MonitoringServiceTool;

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,45 @@
11
package org.restcomm.connect.testsuite.telephony;
22

3-
import com.github.tomakehurst.wiremock.junit.WireMockRule;
4-
import com.google.gson.JsonObject;
3+
import static org.cafesip.sipunit.SipAssert.assertLastOperationSuccess;
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertFalse;
6+
import static org.junit.Assert.assertNotNull;
7+
import static org.junit.Assert.assertTrue;
8+
import static org.junit.Assert.fail;
9+
10+
import java.net.URL;
11+
import java.sql.SQLException;
12+
import java.text.ParseException;
13+
import java.util.ArrayList;
14+
import java.util.Arrays;
15+
import java.util.HashMap;
16+
import java.util.List;
17+
import java.util.Map;
18+
import java.util.concurrent.ExecutorService;
19+
import java.util.concurrent.Executors;
20+
21+
import javax.sip.Dialog;
22+
import javax.sip.InvalidArgumentException;
23+
import javax.sip.RequestEvent;
24+
import javax.sip.SipException;
25+
import javax.sip.address.Address;
26+
import javax.sip.address.SipURI;
27+
import javax.sip.address.URI;
28+
import javax.sip.header.CSeqHeader;
29+
import javax.sip.header.CallIdHeader;
30+
import javax.sip.header.ContactHeader;
31+
import javax.sip.header.FromHeader;
32+
import javax.sip.header.Header;
33+
import javax.sip.header.MaxForwardsHeader;
34+
import javax.sip.header.ProxyAuthenticateHeader;
35+
import javax.sip.header.RouteHeader;
36+
import javax.sip.header.ToHeader;
37+
import javax.sip.header.UserAgentHeader;
38+
import javax.sip.header.ViaHeader;
39+
import javax.sip.header.WWWAuthenticateHeader;
40+
import javax.sip.message.Request;
41+
import javax.sip.message.Response;
42+
543
import org.apache.log4j.Logger;
644
import org.cafesip.sipunit.Credential;
745
import org.cafesip.sipunit.SipCall;
@@ -18,60 +56,25 @@
1856
import org.junit.After;
1957
import org.junit.Before;
2058
import org.junit.BeforeClass;
59+
import org.junit.FixMethodOrder;
2160
import org.junit.Rule;
2261
import org.junit.Test;
23-
import org.junit.FixMethodOrder;
24-
import org.junit.runners.MethodSorters;
2562
import org.junit.experimental.categories.Category;
2663
import org.junit.runner.RunWith;
64+
import org.junit.runners.MethodSorters;
2765
import org.restcomm.connect.commons.Version;
2866
import org.restcomm.connect.commons.annotations.FeatureAltTests;
2967
import org.restcomm.connect.commons.annotations.ParallelClassTests;
3068
import org.restcomm.connect.commons.annotations.UnstableTests;
3169
import org.restcomm.connect.testsuite.NetworkPortAssigner;
70+
import org.restcomm.connect.testsuite.SipStackTool;
3271
import org.restcomm.connect.testsuite.WebArchiveUtil;
3372
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
3473
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
3574
import org.restcomm.connect.testsuite.tools.MonitoringServiceTool;
3675

37-
import javax.sip.Dialog;
38-
import javax.sip.InvalidArgumentException;
39-
import javax.sip.RequestEvent;
40-
import javax.sip.SipException;
41-
import javax.sip.address.Address;
42-
import javax.sip.address.SipURI;
43-
import javax.sip.address.URI;
44-
import javax.sip.header.CSeqHeader;
45-
import javax.sip.header.CallIdHeader;
46-
import javax.sip.header.ContactHeader;
47-
import javax.sip.header.FromHeader;
48-
import javax.sip.header.Header;
49-
import javax.sip.header.MaxForwardsHeader;
50-
import javax.sip.header.ProxyAuthenticateHeader;
51-
import javax.sip.header.RouteHeader;
52-
import javax.sip.header.ToHeader;
53-
import javax.sip.header.UserAgentHeader;
54-
import javax.sip.header.ViaHeader;
55-
import javax.sip.header.WWWAuthenticateHeader;
56-
import javax.sip.message.Request;
57-
import javax.sip.message.Response;
58-
import java.net.URL;
59-
import java.sql.SQLException;
60-
import java.text.ParseException;
61-
import java.util.ArrayList;
62-
import java.util.Arrays;
63-
import java.util.HashMap;
64-
import java.util.List;
65-
import java.util.Map;
66-
import java.util.concurrent.ExecutorService;
67-
import java.util.concurrent.Executors;
68-
69-
import static org.cafesip.sipunit.SipAssert.assertLastOperationSuccess;
70-
import static org.junit.Assert.assertEquals;
71-
import static org.junit.Assert.assertFalse;
72-
import static org.junit.Assert.assertNotNull;
73-
import static org.junit.Assert.assertTrue;
74-
import static org.junit.Assert.fail;
76+
import com.github.tomakehurst.wiremock.junit.WireMockRule;
77+
import com.google.gson.JsonObject;
7578

7679
/**
7780
* Test for clients with or without VoiceURL (Bitbucket issue 115). Clients without VoiceURL can dial anything.

0 commit comments

Comments
 (0)