Skip to content

Commit 0eadb1a

Browse files
author
Chris Wilson
committed
More unit tests to verify issue #57 
1 parent 914f4af commit 0eadb1a

File tree

3 files changed

+291
-6
lines changed

3 files changed

+291
-6
lines changed

‎libs/sparkpost-lib/src/main/java/com/sparkpost/resources/ResourceTransmissions.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@
2222
*/
2323
public class ResourceTransmissions {
2424

25-
public static TransmissionCreateResponse create(IRestConnection conn, Integer numRcptErrors, TransmissionWithRecipientArray trans) throws SparkPostException {
25+
public static TransmissionCreateResponse create(IRestConnection conn, Integer numRcptErrors, TransmissionWithRecipientArray trans)
26+
throws SparkPostException {
2627

27-
return createTransmission(conn, numRcptErrors, trans);
28+
return ResourceTransmissions.createTransmission(conn, numRcptErrors, trans);
2829
}
2930

30-
public static TransmissionCreateResponse create(IRestConnection conn, Integer numRcptErrors, TransmissionWithRecipientList trans) throws SparkPostException {
31+
public static TransmissionCreateResponse create(IRestConnection conn, Integer numRcptErrors, TransmissionWithRecipientList trans)
32+
throws SparkPostException {
3133

32-
return createTransmission(conn, numRcptErrors, trans);
34+
return ResourceTransmissions.createTransmission(conn, numRcptErrors, trans);
3335
}
3436

35-
private static <T extends TransmissionBase> TransmissionCreateResponse createTransmission(IRestConnection conn, Integer numRcptErrors, T trans) throws SparkPostException {
37+
private static <T extends TransmissionBase> TransmissionCreateResponse createTransmission(IRestConnection conn, Integer numRcptErrors, T trans)
38+
throws SparkPostException {
3639

3740
Endpoint ep = new Endpoint("transmissions");
3841
ep.addParam("num_rcpt_errors", numRcptErrors);
@@ -44,7 +47,8 @@ private static <T extends TransmissionBase> TransmissionCreateResponse createTra
4447
}
4548

4649
public static TransmissionRetrieveResults retrieve(IRestConnection conn, String id) throws SparkPostException {
47-
Response response = conn.get("transmissions/" + id);
50+
Endpoint ep = new Endpoint("transmissions/" + id);
51+
Response response = conn.get(ep.toString());
4852

4953
TransmissionRetrieveResults newResult = TransmissionRetrieveResults.decode(response, TransmissionRetrieveResults.class);
5054
return newResult;

‎libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
2+
package com.sparkpost.resources;
3+
4+
import java.lang.reflect.Type;
5+
6+
import org.apache.log4j.Level;
7+
import org.apache.log4j.Logger;
8+
import org.junit.After;
9+
import org.junit.AfterClass;
10+
import org.junit.Assert;
11+
import org.junit.Before;
12+
import org.junit.BeforeClass;
13+
import org.junit.Test;
14+
15+
import com.sparkpost.exception.SparkPostException;
16+
import com.sparkpost.model.TemplateAttributes;
17+
import com.sparkpost.model.TemplateSubstitutionData;
18+
import com.sparkpost.model.responses.Response;
19+
import com.sparkpost.model.responses.TemplateCreateResponse;
20+
import com.sparkpost.model.responses.TemplateListResponse;
21+
import com.sparkpost.model.responses.TemplatePreviewResponse;
22+
import com.sparkpost.model.responses.TemplateRetrieveResponse;
23+
import com.sparkpost.testhelpers.StubRestConnection;
24+
25+
public class ResourceTemplatesTests extends BaseResourceTest {
26+
27+
@BeforeClass
28+
public static void setUpClass() {
29+
Logger.getRootLogger().setLevel(Level.DEBUG);
30+
}
31+
32+
@AfterClass
33+
public static void tearDownClass() {
34+
}
35+
36+
@Before
37+
public void setUp() {
38+
}
39+
40+
@After
41+
public void tearDown() {
42+
}
43+
44+
private static final class StubResponse extends Response {
45+
46+
public static Response decode(Response response, Type typeOfT) {
47+
return new StubResponse();
48+
}
49+
}
50+
51+
private static final class StubTemplateCreateResponse extends TemplateCreateResponse {
52+
53+
public static StubTemplateCreateResponse decode(Response response, Type typeOfT) {
54+
return new StubTemplateCreateResponse();
55+
}
56+
}
57+
58+
private static final class StubTemplateListResponse extends TemplateListResponse {
59+
60+
public static StubTemplateListResponse decode(Response response, Type typeOfT) {
61+
return new StubTemplateListResponse();
62+
}
63+
}
64+
65+
private static final class StubTemplatePreviewResponse extends TemplatePreviewResponse {
66+
67+
public static StubTemplatePreviewResponse decode(Response response, Type typeOfT) {
68+
return new StubTemplatePreviewResponse();
69+
}
70+
}
71+
72+
private static final class StubStubTemplateListResponse extends TemplateRetrieveResponse {
73+
74+
public static TemplateRetrieveResponse decode(Response response, Type typeOfT) {
75+
return new TemplateRetrieveResponse();
76+
}
77+
}
78+
79+
private StubRestConnection buildStubConnection(Response response) {
80+
StubRestConnection conn = new StubRestConnection(response);
81+
return conn;
82+
}
83+
84+
@Test
85+
public void testInsertOrUpdate() throws SparkPostException {
86+
TemplateAttributes tpl = new TemplateAttributes();
87+
88+
StubRestConnection conn = buildStubConnection(new StubTemplateCreateResponse());
89+
Response response = ResourceTemplates.create(conn, tpl);
90+
Assert.assertNotNull(response);
91+
92+
Assert.assertEquals(conn.getPath(), "/templates");
93+
verifyWasPost(conn);
94+
}
95+
96+
@Test
97+
public void testRetrieve() throws SparkPostException {
98+
String id = "id";
99+
Boolean draft = Boolean.TRUE;
100+
101+
StubRestConnection conn = buildStubConnection(new StubStubTemplateListResponse());
102+
Response response = ResourceTemplates.retrieve(conn, id, draft);
103+
Assert.assertNotNull(response);
104+
105+
Assert.assertEquals(conn.getPath(), "/templates/id?draft=true");
106+
verifyWasGet(conn);
107+
}
108+
109+
@Test
110+
public void testListAll() throws SparkPostException {
111+
112+
StubRestConnection conn = buildStubConnection(new StubTemplateListResponse());
113+
Response response = ResourceTemplates.listAll(conn);
114+
Assert.assertNotNull(response);
115+
116+
Assert.assertEquals(conn.getPath(), "/templates/");
117+
verifyWasGet(conn);
118+
}
119+
120+
@Test
121+
public void tesUpdate() throws SparkPostException {
122+
String id = "id";
123+
Boolean updatePublished = Boolean.TRUE;
124+
TemplateAttributes tpl = new TemplateAttributes();
125+
126+
StubRestConnection conn = buildStubConnection(new StubResponse());
127+
Response response = ResourceTemplates.update(conn, id, updatePublished, tpl);
128+
Assert.assertNotNull(response);
129+
130+
Assert.assertEquals(conn.getPath(), "/templates/id?update_published=true");
131+
verifyWasPut(conn);
132+
}
133+
134+
@Test
135+
public void tesPreview() throws SparkPostException {
136+
String id = "id";
137+
Boolean draft = Boolean.TRUE;
138+
TemplateSubstitutionData subst = new TemplateSubstitutionData();
139+
140+
StubRestConnection conn = buildStubConnection(new StubTemplatePreviewResponse());
141+
Response response = ResourceTemplates.preview(conn, id, draft, subst);
142+
Assert.assertNotNull(response);
143+
144+
Assert.assertEquals(conn.getPath(), "/templates/" + id + "/preview?draft=true");
145+
verifyWasPost(conn);
146+
}
147+
148+
@Test
149+
public void tesDelete() throws SparkPostException {
150+
String id = "id";
151+
152+
StubRestConnection conn = buildStubConnection(new StubResponse());
153+
Response response = ResourceTemplates.delete(conn, id);
154+
Assert.assertNotNull(response);
155+
156+
System.out.println(conn.getPath());
157+
Assert.assertEquals(conn.getPath(), "/templates/" + id);
158+
verifyWasDelete(conn);
159+
}
160+
161+
}

‎libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
2+
package com.sparkpost.resources;
3+
4+
import java.lang.reflect.Type;
5+
6+
import org.apache.log4j.Level;
7+
import org.apache.log4j.Logger;
8+
import org.junit.After;
9+
import org.junit.AfterClass;
10+
import org.junit.Assert;
11+
import org.junit.Before;
12+
import org.junit.BeforeClass;
13+
import org.junit.Test;
14+
15+
import com.sparkpost.exception.SparkPostException;
16+
import com.sparkpost.model.TransmissionWithRecipientArray;
17+
import com.sparkpost.model.TransmissionWithRecipientList;
18+
import com.sparkpost.model.responses.Response;
19+
import com.sparkpost.model.responses.TransmissionCreateResponse;
20+
import com.sparkpost.model.responses.TransmissionListResponse;
21+
import com.sparkpost.model.responses.TransmissionRetrieveResults;
22+
import com.sparkpost.testhelpers.StubRestConnection;
23+
24+
public class ResourceTransmissionsTests extends BaseResourceTest {
25+
26+
@BeforeClass
27+
public static void setUpClass() {
28+
Logger.getRootLogger().setLevel(Level.DEBUG);
29+
}
30+
31+
@AfterClass
32+
public static void tearDownClass() {
33+
}
34+
35+
@Before
36+
public void setUp() {
37+
}
38+
39+
@After
40+
public void tearDown() {
41+
}
42+
43+
private static final class StubTransmissionCreateResponse extends TransmissionCreateResponse {
44+
45+
public static StubTransmissionCreateResponse decode(Response response, Type typeOfT) {
46+
return new StubTransmissionCreateResponse();
47+
}
48+
}
49+
50+
private static final class StubTransmissionRetrieveResults extends TransmissionRetrieveResults {
51+
52+
public static StubTransmissionRetrieveResults decode(Response response, Type typeOfT) {
53+
return new StubTransmissionRetrieveResults();
54+
}
55+
}
56+
57+
private static final class StubTransmissionListResponse extends TransmissionListResponse {
58+
59+
public static StubTransmissionListResponse decode(Response response, Type typeOfT) {
60+
return new StubTransmissionListResponse();
61+
}
62+
}
63+
64+
private StubRestConnection buildStubConnection(Response response) {
65+
StubRestConnection conn = new StubRestConnection(response);
66+
return conn;
67+
}
68+
69+
@Test
70+
public void testCreate1() throws SparkPostException {
71+
Integer numRcptErrors = 0;
72+
TransmissionWithRecipientArray trans = new TransmissionWithRecipientArray();
73+
74+
StubRestConnection conn = buildStubConnection(new StubTransmissionCreateResponse());
75+
Response response = ResourceTransmissions.create(conn, numRcptErrors, trans);
76+
Assert.assertNotNull(response);
77+
78+
Assert.assertEquals(conn.getPath(), "/transmissions?num_rcpt_errors=0");
79+
verifyWasPost(conn);
80+
}
81+
82+
@Test
83+
public void testCreate2() throws SparkPostException {
84+
Integer numRcptErrors = 0;
85+
TransmissionWithRecipientList trans = new TransmissionWithRecipientList();
86+
87+
StubRestConnection conn = buildStubConnection(new StubTransmissionCreateResponse());
88+
Response response = ResourceTransmissions.create(conn, numRcptErrors, trans);
89+
Assert.assertNotNull(response);
90+
91+
Assert.assertEquals(conn.getPath(), "/transmissions?num_rcpt_errors=0");
92+
verifyWasPost(conn);
93+
}
94+
95+
@Test
96+
public void testRetrieve() throws SparkPostException {
97+
String id = "id";
98+
99+
StubRestConnection conn = buildStubConnection(new StubTransmissionRetrieveResults());
100+
Response response = ResourceTransmissions.retrieve(conn, id);
101+
Assert.assertNotNull(response);
102+
103+
Assert.assertEquals(conn.getPath(), "/transmissions/" + id);
104+
verifyWasGet(conn);
105+
}
106+
107+
@Test
108+
public void testList() throws SparkPostException {
109+
String campaignId = "campaignId";
110+
String templateId = "templateId";
111+
112+
StubRestConnection conn = buildStubConnection(new StubTransmissionListResponse());
113+
Response response = ResourceTransmissions.list(conn, campaignId, templateId);
114+
Assert.assertNotNull(response);
115+
116+
Assert.assertEquals(conn.getPath(), "/transmissions?campaign_id=campaignId&template_id=templateId");
117+
verifyWasGet(conn);
118+
}
119+
120+
}

0 commit comments

Comments
 (0)