Skip to content

Commit fcdc2ae

Browse files
author
Maria Farooq
committed
fixed proper imports
1 parent 9dc4357 commit fcdc2ae

4 files changed

Lines changed: 72 additions & 95 deletions

File tree

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

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,10 @@
3939
import java.net.UnknownHostException;
4040
import java.text.ParseException;
4141
import java.util.Arrays;
42-
import java.util.HashSet;
4342
import java.util.Iterator;
44-
import java.util.LinkedList;
4543
import java.util.List;
46-
import java.util.Queue;
47-
import java.util.Set;
48-
import java.util.concurrent.ConcurrentLinkedQueue;
4944

5045
import javax.sip.Dialog;
51-
import javax.sip.ListeningPoint;
52-
import javax.sip.address.Hop;
5346
import javax.sip.address.SipURI;
5447
import javax.sip.message.Response;
5548

@@ -58,9 +51,6 @@
5851
import org.cafesip.sipunit.SipCall;
5952
import org.cafesip.sipunit.SipPhone;
6053
import org.cafesip.sipunit.SipStack;
61-
import org.jboss.arquillian.container.mobicents.api.annotations.GetDeployableContainer;
62-
import org.jboss.arquillian.container.mss.extension.ContainerManagerTool;
63-
import org.jboss.arquillian.container.mss.extension.SipStackTool;
6454
import org.jboss.arquillian.container.spi.client.container.DeploymentException;
6555
import org.jboss.arquillian.container.test.api.Deployer;
6656
import org.jboss.arquillian.container.test.api.Deployment;
@@ -72,39 +62,27 @@
7262
import org.junit.After;
7363
import org.junit.Before;
7464
import org.junit.BeforeClass;
65+
import org.junit.FixMethodOrder;
7566
import org.junit.Ignore;
7667
import org.junit.Rule;
7768
import org.junit.Test;
78-
import org.junit.FixMethodOrder;
79-
import org.junit.runners.MethodSorters;
69+
import org.junit.experimental.categories.Category;
8070
import org.junit.runner.RunWith;
81-
import org.mobicents.ext.javax.sip.dns.DNSLookupPerformer;
82-
import org.mobicents.ext.javax.sip.dns.DefaultDNSLookupPerformer;
71+
import org.junit.runners.MethodSorters;
8372
import org.restcomm.connect.commons.Version;
73+
import org.restcomm.connect.commons.annotations.SequentialClassTests;
74+
import org.restcomm.connect.commons.annotations.WithInMinsTests;
75+
import org.restcomm.connect.testsuite.SipStackTool;
8476
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
8577
import org.restcomm.connect.testsuite.http.RestcommConferenceParticipantsTool;
8678
import org.restcomm.connect.testsuite.http.RestcommConferenceTool;
8779
import org.restcomm.connect.testsuite.tools.MonitoringServiceTool;
88-
import org.xbill.DNS.DClass;
89-
import org.xbill.DNS.NAPTRRecord;
90-
import org.xbill.DNS.Name;
91-
import org.xbill.DNS.Record;
92-
import org.xbill.DNS.SRVRecord;
93-
import org.xbill.DNS.TextParseException;
9480

9581
import com.github.tomakehurst.wiremock.junit.WireMockRule;
9682
import com.github.tomakehurst.wiremock.verification.LoggedRequest;
9783
import com.google.gson.JsonArray;
9884
import com.google.gson.JsonObject;
9985

100-
import gov.nist.javax.sip.stack.HopImpl;
101-
import org.junit.experimental.categories.Category;
102-
103-
import static org.mockito.Mockito.mock;
104-
import static org.mockito.Mockito.when;
105-
import org.restcomm.connect.commons.annotations.SequentialClassTests;
106-
import org.restcomm.connect.commons.annotations.WithInMinsTests;
107-
10886
/**
10987
* Test for Dial Action attribute for organization
11088
*
@@ -132,9 +110,6 @@ public class DialActionOrganizationTest {
132110
@ArquillianResource
133111
URL deploymentUrl;
134112

135-
@GetDeployableContainer
136-
private ContainerManagerTool containerManager;
137-
138113
@Rule
139114
public WireMockRule wireMockRule = new WireMockRule(8090); // No-args constructor defaults to port 8080
140115

@@ -250,7 +225,7 @@ public void before() throws Exception {
250225

251226
}
252227

253-
private void mockDNSLookup(String host, String transport) throws TextParseException {
228+
/*private void mockDNSLookup(String host, String transport) throws TextParseException {
254229
DNSLookupPerformer dnsLookupPerformer = mock(DefaultDNSLookupPerformer.class);
255230
//mocking the DNS Lookups to match our test cases
256231
containerManager.getSipStandardService().getSipApplicationDispatcher().getDNSServerLocator().setDnsLookupPerformer(dnsLookupPerformer);
@@ -290,11 +265,11 @@ private void mockDNSLookup(String host, String transport) throws TextParseExcept
290265
mockedSRVTLSRecords.add(new SRVRecord(new Name("_sips._" + ListeningPoint.TCP.toLowerCase() + "." + host + "."), DClass.IN, 1000L, 0, 0, 5081, name));
291266
// mockedSRVTLSRecords.add(new SRVRecord(new Name("_sips._" + ListeningPoint.TLS.toLowerCase() + "." + host + "."), DClass.IN, 1000L, 1, 0, 5081, name));
292267
when(dnsLookupPerformer.performSRVLookup("_sips._" + ListeningPoint.TLS.toLowerCase() + "." + host)).thenReturn(mockedSRVTLSRecords);
293-
}
268+
}*/
294269

295270
@Ignore
296271
@Test
297-
public void testDialSipNumberSameAndDifferentOrganization() throws ParseException, InterruptedException, DeploymentException, TextParseException{
272+
public void testDialSipNumberSameAndDifferentOrganization() throws ParseException, InterruptedException, DeploymentException {
298273
stubFor(get(urlPathEqualTo("/1111"))
299274
.willReturn(aResponse()
300275
.withStatus(200)
@@ -310,7 +285,7 @@ public void testDialSipNumberSameAndDifferentOrganization() throws ParseExceptio
310285
//Reload Context
311286
//containerManagercontainerManager.reloadContext();
312287

313-
mockDNSLookup(HOST_ORG2, TRANSPORT);
288+
//mockDNSLookup(HOST_ORG2, TRANSPORT);
314289

315290
//bob@org3 will dial a sip number X@org3
316291
SipURI uri = bobSipStackOrg3.getAddressFactory().createSipURI(null, "127.0.0.1:5080");

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.cafesip.sipunit.SipPhone;
3838
import org.cafesip.sipunit.SipStack;
3939
import org.cafesip.sipunit.SipTransaction;
40-
import org.jboss.arquillian.container.mss.extension.SipStackTool;
4140
import org.jboss.arquillian.container.test.api.Deployer;
4241
import org.jboss.arquillian.container.test.api.Deployment;
4342
import org.jboss.arquillian.junit.Arquillian;
@@ -48,21 +47,22 @@
4847
import org.junit.After;
4948
import org.junit.Before;
5049
import org.junit.BeforeClass;
50+
import org.junit.FixMethodOrder;
5151
import org.junit.Rule;
5252
import org.junit.Test;
53-
import org.junit.FixMethodOrder;
54-
import org.junit.runners.MethodSorters;
53+
import org.junit.experimental.categories.Category;
5554
import org.junit.runner.RunWith;
55+
import org.junit.runners.MethodSorters;
5656
import org.restcomm.connect.commons.Version;
57+
import org.restcomm.connect.commons.annotations.FeatureAltTests;
58+
import org.restcomm.connect.commons.annotations.SequentialClassTests;
59+
import org.restcomm.connect.commons.annotations.UnstableTests;
60+
import org.restcomm.connect.testsuite.SipStackTool;
5761
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
5862
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
5963

6064
import com.github.tomakehurst.wiremock.junit.WireMockRule;
6165
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;
6666

6767
/**
6868
* 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 & 10 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;
@@ -40,7 +41,6 @@
4041
import org.cafesip.sipunit.SipRequest;
4142
import org.cafesip.sipunit.SipStack;
4243
import org.cafesip.sipunit.SipTransaction;
43-
import org.jboss.arquillian.container.mss.extension.SipStackTool;
4444
import org.jboss.arquillian.container.test.api.Deployer;
4545
import org.jboss.arquillian.container.test.api.Deployment;
4646
import org.jboss.arquillian.junit.Arquillian;
@@ -49,25 +49,25 @@
4949
import org.junit.After;
5050
import org.junit.Before;
5151
import org.junit.BeforeClass;
52+
import org.junit.FixMethodOrder;
5253
import org.junit.Rule;
5354
import org.junit.Test;
54-
import org.junit.FixMethodOrder;
55-
import org.junit.runners.MethodSorters;
55+
import org.junit.experimental.categories.Category;
5656
import org.junit.runner.RunWith;
57+
import org.junit.runners.MethodSorters;
5758
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;
5865
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
5966
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
6067
import org.restcomm.connect.testsuite.tools.MonitoringServiceTool;
6168

6269
import com.github.tomakehurst.wiremock.junit.WireMockRule;
6370
import com.google.gson.JsonObject;
64-
import java.util.Arrays;
65-
import org.junit.experimental.categories.Category;
66-
import org.restcomm.connect.commons.annotations.FeatureAltTests;
67-
import org.restcomm.connect.commons.annotations.ParallelClassTests;
68-
import org.restcomm.connect.testsuite.NetworkPortAssigner;
69-
import org.restcomm.connect.commons.annotations.UnstableTests;
70-
import org.restcomm.connect.testsuite.WebArchiveUtil;
7171

7272
/**
7373
* Test for clients with or without VoiceURL (Bitbucket issue 115). Clients

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

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,52 @@
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;
846
import org.cafesip.sipunit.SipPhone;
947
import org.cafesip.sipunit.SipRequest;
1048
import org.cafesip.sipunit.SipStack;
1149
import org.cafesip.sipunit.SipTransaction;
12-
import org.jboss.arquillian.container.mss.extension.SipStackTool;
1350
import org.jboss.arquillian.container.test.api.Deployer;
1451
import org.jboss.arquillian.container.test.api.Deployment;
1552
import org.jboss.arquillian.junit.Arquillian;
@@ -18,60 +55,25 @@
1855
import org.junit.After;
1956
import org.junit.Before;
2057
import org.junit.BeforeClass;
58+
import org.junit.FixMethodOrder;
2159
import org.junit.Rule;
2260
import org.junit.Test;
23-
import org.junit.FixMethodOrder;
24-
import org.junit.runners.MethodSorters;
2561
import org.junit.experimental.categories.Category;
2662
import org.junit.runner.RunWith;
63+
import org.junit.runners.MethodSorters;
2764
import org.restcomm.connect.commons.Version;
2865
import org.restcomm.connect.commons.annotations.FeatureAltTests;
2966
import org.restcomm.connect.commons.annotations.ParallelClassTests;
3067
import org.restcomm.connect.commons.annotations.UnstableTests;
3168
import org.restcomm.connect.testsuite.NetworkPortAssigner;
69+
import org.restcomm.connect.testsuite.SipStackTool;
3270
import org.restcomm.connect.testsuite.WebArchiveUtil;
3371
import org.restcomm.connect.testsuite.http.RestcommCallsTool;
3472
import org.restcomm.connect.testsuite.telephony.security.DigestServerAuthenticationMethod;
3573
import org.restcomm.connect.testsuite.tools.MonitoringServiceTool;
3674

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;
75+
import com.github.tomakehurst.wiremock.junit.WireMockRule;
76+
import com.google.gson.JsonObject;
7577

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

0 commit comments

Comments
 (0)