Skip to content

Commit a624317

Browse files
author
Doug Black
committed
add tests for new number types
1 parent c35d66b commit a624317

File tree

3 files changed

+226
-104
lines changed

3 files changed

+226
-104
lines changed

‎src/test/java/com/twilio/sdk/resource/instance/QueueTest.java‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -53,137 +53,137 @@ private void setupMocks() {
5353
* @throws TwilioRestException
5454
*/
5555
@Test
56-
public void testCreation() throws TwilioRestException {
56+
public void testCreation() throws TwilioRestException {
57+
58+
setupMocks();
59+
stub(
60+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
61+
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
62+
.toReturn(resp);
63+
Queue q = new Queue(client, queueSid);
64+
q.setRequestAccountSid(accountSid);
65+
66+
assertTrue(q.getAverageWaitTime() == 1);
67+
assertTrue(q.getCurrentSize() == 2);
68+
assertTrue(q.getMaxSize() == 3);
69+
assertTrue(q.getFriendlyName().equals("friendly"));
70+
assertTrue(q.getSid().equals(queueSid));
5771

58-
setupMocks();
59-
stub(
60-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
61-
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
62-
.toReturn(resp);
63-
Queue q = new Queue(client, queueSid);
64-
q.setRequestAccountSid(accountSid);
65-
66-
assertTrue(q.getAverageWaitTime() == 1);
67-
assertTrue(q.getCurrentSize() == 2);
68-
assertTrue(q.getMaxSize() == 3);
69-
assertTrue(q.getFriendlyName().equals("friendly"));
70-
assertTrue(q.getSid().equals(queueSid));
71-
72-
}
72+
}
7373

7474
/**
7575
* This test creates a {@link Member} object by interacting with a {@link TwilioRestClient}.
7676
*
7777
* @throws TwilioRestException
7878
*/
7979
@Test
80-
public void testDequeueFront() throws TwilioRestException {
81-
82-
setupMocks();
83-
stub(
84-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
85-
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
86-
.toReturn(resp);
87-
88-
TwilioRestResponse memberresp = mock(TwilioRestResponse.class);
89-
HashMap<String, Object> map = new HashMap<String, Object>();
90-
stub(memberresp.toMap()).toReturn(map);
91-
formattedDate = dateFormat.format(new Date());
92-
map.put("call_sid", callSid);
93-
map.put("queue_sid", queueSid);
94-
map.put("position", "1");
95-
map.put("date_enqueued", formattedDate);
96-
map.put("wait_time", "10");
97-
98-
stub(
99-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
100-
+ "/Members/Front.json"), Matchers.eq("POST"), Matchers.any(Map.class)))
101-
.toReturn(memberresp);
102-
103-
Queue q = new Queue(client, queueSid);
104-
q.setRequestAccountSid(accountSid);
105-
String method = "GET";
106-
String url = "http://www.example.com";
107-
Member m = q.dequeueHeadOfQueue(url, method);
108-
109-
assertTrue(m.getPosition().equals("1"));
110-
assertTrue(dateFormat.format(m.getDateEnqueued()).equals(formattedDate));
111-
assertTrue(m.getWaitTime().equals("10"));
112-
}
80+
public void testDequeueFront() throws TwilioRestException {
81+
82+
setupMocks();
83+
stub(
84+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
85+
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
86+
.toReturn(resp);
87+
88+
TwilioRestResponse memberresp = mock(TwilioRestResponse.class);
89+
HashMap<String, Object> map = new HashMap<String, Object>();
90+
stub(memberresp.toMap()).toReturn(map);
91+
formattedDate = dateFormat.format(new Date());
92+
map.put("call_sid", callSid);
93+
map.put("queue_sid", queueSid);
94+
map.put("position", "1");
95+
map.put("date_enqueued", formattedDate);
96+
map.put("wait_time", "10");
97+
98+
stub(
99+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
100+
+ "/Members/Front.json"), Matchers.eq("POST"), Matchers.any(Map.class)))
101+
.toReturn(memberresp);
102+
103+
Queue q = new Queue(client, queueSid);
104+
q.setRequestAccountSid(accountSid);
105+
String method = "GET";
106+
String url = "http://www.example.com";
107+
Member m = q.dequeueHeadOfQueue(url, method);
108+
109+
assertTrue(m.getPosition().equals("1"));
110+
assertTrue(dateFormat.format(m.getDateEnqueued()).equals(formattedDate));
111+
assertTrue(m.getWaitTime().equals("10"));
112+
}
113113

114114
/**
115115
* This test creates a {@link Member} object by interacting with a {@link TwilioRestClient}.
116116
*
117117
* @throws TwilioRestException
118118
*/
119119
@Test
120-
public void testSetFriendly() throws TwilioRestException {
121-
122-
setupMocks();
123-
stub(
124-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
125-
+ ".json"), Matchers.eq("POST"), Matchers.any(Map.class)))
126-
.toReturn(resp);
127-
Queue q = new Queue(client, queueSid);
128-
q.setRequestAccountSid(accountSid);
129-
q.setFriendlyName("new friendly");
130-
assertTrue(q.getFriendlyName().equals("new friendly"));
131-
}
120+
public void testSetFriendly() throws TwilioRestException {
121+
122+
setupMocks();
123+
stub(
124+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
125+
+ ".json"), Matchers.eq("POST"), Matchers.any(Map.class)))
126+
.toReturn(resp);
127+
Queue q = new Queue(client, queueSid);
128+
q.setRequestAccountSid(accountSid);
129+
q.setFriendlyName("new friendly");
130+
assertTrue(q.getFriendlyName().equals("new friendly"));
131+
}
132132

133133
/**
134134
* This test creates a {@link Member} object by interacting with a {@link TwilioRestClient}.
135135
*
136136
* @throws TwilioRestException
137137
*/
138138
@Test
139-
public void testSetMaxSize() throws TwilioRestException {
140-
141-
setupMocks();
142-
stub(
143-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
144-
+ ".json"), Matchers.eq("POST"), Matchers.any(Map.class)))
145-
.toReturn(resp);
146-
Queue q = new Queue(client, queueSid);
147-
q.setRequestAccountSid(accountSid);
148-
q.setMaxSize(99);
149-
assertTrue(q.getMaxSize() == 99);
150-
}
139+
public void testSetMaxSize() throws TwilioRestException {
140+
141+
setupMocks();
142+
stub(
143+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
144+
+ ".json"), Matchers.eq("POST"), Matchers.any(Map.class)))
145+
.toReturn(resp);
146+
Queue q = new Queue(client, queueSid);
147+
q.setRequestAccountSid(accountSid);
148+
q.setMaxSize(99);
149+
assertTrue(q.getMaxSize() == 99);
150+
}
151151

152152
/**
153153
* This test creates a {@link Member} object by interacting with a {@link TwilioRestClient}.
154154
*
155155
* @throws TwilioRestException
156156
*/
157157
@Test
158-
public void testGetMembers() throws TwilioRestException {
159-
160-
setupMocks();
161-
stub(
162-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
163-
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
164-
.toReturn(resp);
165-
166-
TwilioRestResponse membersresp = mock(TwilioRestResponse.class);
167-
HashMap<String, Object> map = new HashMap<String, Object>();
168-
stub(membersresp.toMap()).toReturn(map);
169-
stub(membersresp.getParser()).toReturn(new JsonResponseParser());
170-
171-
172-
formattedDate = dateFormat.format(new Date());
173-
map.put("next_page_uri", "http://next.page.uri/");
174-
map.put("start", "1");
175-
map.put("end", "1");
176-
map.put("total", "1");
177-
map.put("page", "1");
178-
map.put("num_pages", "1");
179-
stub(
180-
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
181-
+ "/Members.json"), Matchers.eq("GET"), Matchers.any(Map.class)))
182-
.toReturn(membersresp);
183-
Queue q = new Queue(client, queueSid);
184-
q.setRequestAccountSid(accountSid);
185-
MemberList m = q.getMembers();
186-
Iterator<Member> memiter = m.iterator();
187-
assertTrue(memiter.hasNext());
188-
}
158+
public void testGetMembers() throws TwilioRestException {
159+
160+
setupMocks();
161+
stub(
162+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
163+
+ ".json"), Matchers.eq("GET"), Matchers.any(Map.class)))
164+
.toReturn(resp);
165+
166+
TwilioRestResponse membersresp = mock(TwilioRestResponse.class);
167+
HashMap<String, Object> map = new HashMap<String, Object>();
168+
stub(membersresp.toMap()).toReturn(map);
169+
stub(membersresp.getParser()).toReturn(new JsonResponseParser());
170+
171+
172+
formattedDate = dateFormat.format(new Date());
173+
map.put("next_page_uri", "http://next.page.uri/");
174+
map.put("start", "1");
175+
map.put("end", "1");
176+
map.put("total", "1");
177+
map.put("page", "1");
178+
map.put("num_pages", "1");
179+
stub(
180+
client.safeRequest(Matchers.eq("/2010-04-01/Accounts/" + accountSid + "/Queues/" + queueSid
181+
+ "/Members.json"), Matchers.eq("GET"), Matchers.any(Map.class)))
182+
.toReturn(membersresp);
183+
Queue q = new Queue(client, queueSid);
184+
q.setRequestAccountSid(accountSid);
185+
MemberList m = q.getMembers();
186+
Iterator<Member> memiter = m.iterator();
187+
assertTrue(memiter.hasNext());
188+
}
189189
}

‎src/test/java/com/twilio/sdk/resource/list/AvailablePhoneNumbersTest.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.twilio.sdk.resource.list;
2+
3+
import static org.junit.Assert.assertTrue;
4+
import static org.mockito.Mockito.mock;
5+
import static org.mockito.Mockito.stub;
6+
7+
import org.junit.Test;
8+
import org.mockito.Matchers;
9+
10+
import com.twilio.sdk.TwilioRestClient;
11+
import com.twilio.sdk.TwilioRestException;
12+
import com.twilio.sdk.TwilioRestResponse;
13+
import com.twilio.sdk.resource.list.AvailablePhoneNumberList;
14+
15+
public class AvailablePhoneNumbersTest {
16+
17+
final String accountSid = "AC12345678901234567890123456789012";
18+
19+
TwilioRestClient client = mock(TwilioRestClient.class);
20+
TwilioRestResponse resp = mock(TwilioRestResponse.class);
21+
22+
@Test
23+
public void testGetLocal() throws TwilioRestException {
24+
25+
AvailablePhoneNumberList numbers = new AvailablePhoneNumberList(client, "US", AvailablePhoneNumberList.TYPE_LOCAL);
26+
numbers.setRequestAccountSid(accountSid);
27+
28+
String location = numbers.getResourceLocation();
29+
String expectedLocal = "/2010-04-01/Accounts/" + accountSid + "/AvailablePhoneNumbers/US/Local.json";
30+
31+
assertTrue(numbers.getResourceLocation().equals(expectedLocal));
32+
33+
}
34+
35+
@Test
36+
public void testGetMobile() throws TwilioRestException {
37+
38+
AvailablePhoneNumberList numbers = new AvailablePhoneNumberList(client, "US", AvailablePhoneNumberList.TYPE_MOBILE);
39+
numbers.setRequestAccountSid(accountSid);
40+
41+
String location = numbers.getResourceLocation();
42+
String expectedMobile = "/2010-04-01/Accounts/" + accountSid + "/AvailablePhoneNumbers/US/Mobile.json";
43+
44+
assertTrue(numbers.getResourceLocation().equals(expectedMobile));
45+
46+
}
47+
48+
@Test
49+
public void testGetTollFree() throws TwilioRestException {
50+
51+
AvailablePhoneNumberList numbers = new AvailablePhoneNumberList(client, "US", AvailablePhoneNumberList.TYPE_TOLLFREE);
52+
numbers.setRequestAccountSid(accountSid);
53+
54+
String location = numbers.getResourceLocation();
55+
String expectedTollFree = "/2010-04-01/Accounts/" + accountSid + "/AvailablePhoneNumbers/US/TollFree.json";
56+
57+
assertTrue(numbers.getResourceLocation().equals(expectedTollFree));
58+
59+
}
60+
61+
}

‎src/test/java/com/twilio/sdk/resource/list/IncomingPhoneNumbersTest.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.twilio.sdk.resource.list;
2+
3+
import static org.junit.Assert.assertTrue;
4+
import static org.mockito.Mockito.mock;
5+
import static org.mockito.Mockito.stub;
6+
7+
import org.junit.Test;
8+
import org.mockito.Matchers;
9+
10+
import com.twilio.sdk.TwilioRestClient;
11+
import com.twilio.sdk.TwilioRestException;
12+
import com.twilio.sdk.TwilioRestResponse;
13+
import com.twilio.sdk.resource.list.IncomingPhoneNumberList;
14+
15+
public class IncomingPhoneNumbersTest {
16+
17+
final String accountSid = "AC12345678901234567890123456789012";
18+
19+
TwilioRestClient client = mock(TwilioRestClient.class);
20+
TwilioRestResponse resp = mock(TwilioRestResponse.class);
21+
22+
@Test
23+
public void testGetLocal() throws TwilioRestException {
24+
25+
IncomingPhoneNumberList numbers = new IncomingPhoneNumberList(client, IncomingPhoneNumberList.TYPE_LOCAL);
26+
numbers.setRequestAccountSid(accountSid);
27+
28+
String location = numbers.getResourceLocation();
29+
String expectedLocal = "/2010-04-01/Accounts/" + accountSid + "/IncomingPhoneNumbers/Local.json";
30+
31+
assertTrue(numbers.getResourceLocation().equals(expectedLocal));
32+
33+
}
34+
35+
@Test
36+
public void testGetMobile() throws TwilioRestException {
37+
38+
IncomingPhoneNumberList numbers = new IncomingPhoneNumberList(client, IncomingPhoneNumberList.TYPE_MOBILE);
39+
numbers.setRequestAccountSid(accountSid);
40+
41+
String location = numbers.getResourceLocation();
42+
String expectedMobile = "/2010-04-01/Accounts/" + accountSid + "/IncomingPhoneNumbers/Mobile.json";
43+
44+
assertTrue(numbers.getResourceLocation().equals(expectedMobile));
45+
46+
}
47+
48+
@Test
49+
public void testGetTollFree() throws TwilioRestException {
50+
51+
IncomingPhoneNumberList numbers = new IncomingPhoneNumberList(client, IncomingPhoneNumberList.TYPE_TOLLFREE);
52+
numbers.setRequestAccountSid(accountSid);
53+
54+
String location = numbers.getResourceLocation();
55+
String expectedTollFree = "/2010-04-01/Accounts/" + accountSid + "/IncomingPhoneNumbers/TollFree.json";
56+
57+
assertTrue(numbers.getResourceLocation().equals(expectedTollFree));
58+
59+
}
60+
61+
}

0 commit comments

Comments
 (0)