Skip to content

Commit 9a6d849

Browse files
smithszsmithsz
committed
Share IAM_API_KEY constant between IAM mocks
1 parent aaf3749 commit 9a6d849

File tree

4 files changed

+52
-49
lines changed

4 files changed

+52
-49
lines changed

‎cloudant-client/src/test/java/com/cloudant/tests/HttpIamTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static com.cloudant.tests.HttpTest.takeN;
1818
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE;
1919
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE_2;
20+
import static com.cloudant.tests.util.MockWebServerResources.IAM_API_KEY;
2021
import static com.cloudant.tests.util.MockWebServerResources.IAM_TOKEN;
2122
import static com.cloudant.tests.util.MockWebServerResources.IAM_TOKEN_2;
2223
import static com.cloudant.tests.util.MockWebServerResources.OK_IAM_COOKIE;
@@ -61,7 +62,6 @@ public class HttpIamTest {
6162
public MockWebServerExtension mockIamServerExt = new MockWebServerExtension();
6263

6364
final static String hello = "{\"hello\":\"world\"}\r\n";
64-
final static String iamApiKey = "iam";
6565
final static String iamTokenEndpoint = "/identity/token";
6666

6767
public MockWebServer mockWebServer;
@@ -108,7 +108,7 @@ public void iamTokenAndCookieSuccessful() throws Exception {
108108
mockIamServer.enqueue(new MockResponse().setResponseCode(200).setBody(IAM_TOKEN));
109109

110110
CloudantClient c = CloudantClientHelper.newMockWebServerClientBuilder(mockWebServer)
111-
.iamApiKey(iamApiKey)
111+
.iamApiKey(IAM_API_KEY)
112112
.build();
113113

114114
String response = c.executeRequest(Http.GET(c.getBaseUri())).responseAsString();
@@ -140,7 +140,7 @@ public void iamTokenAndCookieSuccessful() throws Exception {
140140
"/identity/token");
141141
assertThat("The request body should contain the IAM API key",
142142
recordedIamRequests[0].getBody().readString(Charset.forName("UTF-8")),
143-
containsString("apikey=" + iamApiKey));
143+
containsString("apikey=" + IAM_API_KEY));
144144
}
145145

146146
/**
@@ -164,7 +164,7 @@ public void iamApiKeyPreferredToUsernamePassword() throws Exception {
164164
CloudantClient c = CloudantClientHelper.newMockWebServerClientBuilder(mockWebServer)
165165
.username("username")
166166
.password("password")
167-
.iamApiKey(iamApiKey)
167+
.iamApiKey(IAM_API_KEY)
168168
.build();
169169

170170
String response = c.executeRequest(Http.GET(c.getBaseUri())).responseAsString();
@@ -196,7 +196,7 @@ public void iamApiKeyPreferredToUsernamePassword() throws Exception {
196196
"/identity/token");
197197
assertThat("The request body should contain the IAM API key",
198198
recordedIamRequests[0].getBody().readString(Charset.forName("UTF-8")),
199-
containsString("apikey=" + iamApiKey));
199+
containsString("apikey=" + IAM_API_KEY));
200200
}
201201

202202
/**
@@ -231,7 +231,7 @@ public void iamTokenAndCookieWithExpirySuccessful() throws Exception {
231231
mockIamServer.enqueue(new MockResponse().setResponseCode(200).setBody(IAM_TOKEN_2));
232232

233233
CloudantClient c = CloudantClientHelper.newMockWebServerClientBuilder(mockWebServer)
234-
.iamApiKey(iamApiKey)
234+
.iamApiKey(IAM_API_KEY)
235235
.build();
236236

237237
String response = c.executeRequest(Http.GET(c.getBaseUri())).responseAsString();
@@ -292,7 +292,7 @@ public void iamTokenAndCookieWithExpirySuccessful() throws Exception {
292292
"/identity/token");
293293
assertThat("The request body should contain the IAM API key",
294294
recordedIamRequests[0].getBody().readString(Charset.forName("UTF-8")),
295-
containsString("apikey=" + iamApiKey));
295+
containsString("apikey=" + IAM_API_KEY));
296296
// second time, refresh because the cloudant session cookie has expired
297297
assertEquals(iamTokenEndpoint,
298298
recordedIamRequests[1].getPath(), "The request should have been for " +
@@ -328,7 +328,7 @@ public void iamRenewalFailureOnIamToken() throws Exception {
328328
mockIamServer.enqueue(new MockResponse().setResponseCode(500));
329329

330330
CloudantClient c = CloudantClientHelper.newMockWebServerClientBuilder(mockWebServer)
331-
.iamApiKey(iamApiKey)
331+
.iamApiKey(IAM_API_KEY)
332332
.build();
333333

334334
String response = c.executeRequest(Http.GET(c.getBaseUri())).responseAsString();
@@ -381,7 +381,7 @@ public void iamRenewalFailureOnIamToken() throws Exception {
381381
"/identity/token");
382382
assertThat("The request body should contain the IAM API key",
383383
recordedIamRequests[0].getBody().readString(Charset.forName("UTF-8")),
384-
containsString("apikey=" + iamApiKey));
384+
containsString("apikey=" + IAM_API_KEY));
385385
// second time, refresh (but gets 500) because the cloudant session cookie has expired
386386
assertEquals(iamTokenEndpoint,
387387
recordedIamRequests[1].getPath(), "The request should have been for " +
@@ -418,7 +418,7 @@ public void iamRenewalFailureOnSessionCookie() throws Exception {
418418
mockIamServer.enqueue(new MockResponse().setResponseCode(200).setBody(IAM_TOKEN_2));
419419

420420
CloudantClient c = CloudantClientHelper.newMockWebServerClientBuilder(mockWebServer)
421-
.iamApiKey(iamApiKey)
421+
.iamApiKey(IAM_API_KEY)
422422
.build();
423423

424424
String response = c.executeRequest(Http.GET(c.getBaseUri())).responseAsString();
@@ -477,7 +477,7 @@ public void iamRenewalFailureOnSessionCookie() throws Exception {
477477
"/identity/token");
478478
assertThat("The request body should contain the IAM API key",
479479
recordedIamRequests[0].getBody().readString(Charset.forName("UTF-8")),
480-
containsString("apikey=" + iamApiKey));
480+
containsString("apikey=" + IAM_API_KEY));
481481
// second time, refresh because the cloudant session cookie has expired
482482
assertEquals(iamTokenEndpoint,
483483
recordedIamRequests[1].getPath(), "The request should have been for " +

‎cloudant-client/src/test/java/com/cloudant/tests/ReplicationMockTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package com.cloudant.tests;
1616

1717
import static com.cloudant.tests.HttpTest.takeN;
18-
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE;
19-
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE_2;
18+
import static com.cloudant.tests.util.MockWebServerResources.IAM_API_KEY;
19+
import static com.cloudant.tests.util.MockWebServerResources.IAM_API_KEY_2;
2020
import static com.cloudant.tests.util.MockWebServerResources.JSON_OK;
2121
import static org.hamcrest.CoreMatchers.containsString;
2222
import static org.hamcrest.MatcherAssert.assertThat;
@@ -75,7 +75,7 @@ public void createAndTriggerReplicationWithSourceIamAuth() throws Exception {
7575

7676
c.replication()
7777
.source(sourceDbUrl)
78-
.sourceIamApiKey(EXPECTED_OK_COOKIE)
78+
.sourceIamApiKey(IAM_API_KEY)
7979
.target(targetDbUrl)
8080
.trigger();
8181

@@ -86,7 +86,7 @@ public void createAndTriggerReplicationWithSourceIamAuth() throws Exception {
8686
String body = requests[0].getBody().readUtf8();
8787

8888
assertThat("The replication document should contain the source IAM API key",
89-
body, containsString(authJson + EXPECTED_OK_COOKIE));
89+
body, containsString(authJson + IAM_API_KEY));
9090

9191
assertThat("The replication document should contain the correct target",
9292
body, containsString("\"target\":\"" + targetDbUrl + "\""));
@@ -102,7 +102,7 @@ public void createAndTriggerReplicationWithTargetIamAuth() throws Exception {
102102
c.replication()
103103
.source(sourceDbUrl)
104104
.target(targetDbUrl)
105-
.targetIamApiKey(EXPECTED_OK_COOKIE_2)
105+
.targetIamApiKey(IAM_API_KEY)
106106
.trigger();
107107

108108
RecordedRequest[] requests = takeN(server, 1);
@@ -115,7 +115,7 @@ public void createAndTriggerReplicationWithTargetIamAuth() throws Exception {
115115
body, containsString("\"source\":\"" + sourceDbUrl + "\""));
116116

117117
assertThat("The replication document should contain the correct target",
118-
body, containsString(authJson + EXPECTED_OK_COOKIE_2));
118+
body, containsString(authJson + IAM_API_KEY));
119119
}
120120

121121
@Test
@@ -127,9 +127,9 @@ public void createAndTriggerReplicationWithSourceAndTargetIamAuth() throws Excep
127127

128128
c.replication()
129129
.source(sourceDbUrl)
130-
.sourceIamApiKey(EXPECTED_OK_COOKIE)
130+
.sourceIamApiKey(IAM_API_KEY)
131131
.target(targetDbUrl)
132-
.targetIamApiKey(EXPECTED_OK_COOKIE_2)
132+
.targetIamApiKey(IAM_API_KEY_2)
133133
.trigger();
134134

135135
RecordedRequest[] requests = takeN(server, 1);
@@ -139,9 +139,9 @@ public void createAndTriggerReplicationWithSourceAndTargetIamAuth() throws Excep
139139
String body = requests[0].getBody().readUtf8();
140140

141141
assertThat("The replication document should contain the source IAM API key",
142-
body, containsString(authJson + EXPECTED_OK_COOKIE));
142+
body, containsString(authJson + IAM_API_KEY));
143143

144144
assertThat("The replication document should contain the target IAM API key",
145-
body, containsString(authJson + EXPECTED_OK_COOKIE_2));
145+
body, containsString(authJson + IAM_API_KEY_2));
146146
}
147147
}

‎cloudant-client/src/test/java/com/cloudant/tests/ReplicatorMockTest.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package com.cloudant.tests;
1616

1717
import static com.cloudant.tests.HttpTest.takeN;
18-
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE;
19-
import static com.cloudant.tests.util.MockWebServerResources.EXPECTED_OK_COOKIE_2;
18+
import static com.cloudant.tests.util.MockWebServerResources.IAM_API_KEY;
19+
import static com.cloudant.tests.util.MockWebServerResources.IAM_API_KEY_2;
2020
import static com.cloudant.tests.util.MockWebServerResources.JSON_OK;
2121
import static org.hamcrest.CoreMatchers.containsString;
2222
import static org.hamcrest.MatcherAssert.assertThat;
@@ -52,17 +52,17 @@ public void createReplicationDocumentReconfigureSource() throws Exception {
5252
rep.setSource(sourceDbUrl);
5353
assertEquals(rep.getSource(), sourceDbUrl);
5454

55-
rep.setSourceIamApiKey(EXPECTED_OK_COOKIE);
55+
rep.setSourceIamApiKey(IAM_API_KEY);
5656
assertEquals(rep.getSource(), sourceDbUrl);
57-
assertEquals(rep.getSourceIamApiKey(), EXPECTED_OK_COOKIE);
57+
assertEquals(rep.getSourceIamApiKey(), IAM_API_KEY);
5858

5959
// reconfigure source
6060

6161
rep.setSource(targetDbUrl);
6262
assertEquals(rep.getSource(), targetDbUrl);
6363

64-
rep.setSourceIamApiKey(EXPECTED_OK_COOKIE_2);
65-
assertEquals(rep.getSourceIamApiKey(), EXPECTED_OK_COOKIE_2);
64+
rep.setSourceIamApiKey(IAM_API_KEY_2);
65+
assertEquals(rep.getSourceIamApiKey(), IAM_API_KEY_2);
6666
}
6767

6868
@Test
@@ -72,34 +72,34 @@ public void createReplicationDocumentReconfigureTarget() throws Exception {
7272
rep.setTarget(targetDbUrl);
7373
assertEquals(rep.getTarget(), targetDbUrl);
7474

75-
rep.setTargetIamApiKey(EXPECTED_OK_COOKIE);
75+
rep.setTargetIamApiKey(IAM_API_KEY);
7676
assertEquals(rep.getTarget(), targetDbUrl);
77-
assertEquals(rep.getTargetIamApiKey(), EXPECTED_OK_COOKIE);
77+
assertEquals(rep.getTargetIamApiKey(), IAM_API_KEY);
7878

7979
// reconfigure target
8080

8181
rep.setTarget(sourceDbUrl);
8282
assertEquals(rep.getTarget(), sourceDbUrl);
8383

84-
rep.setTargetIamApiKey(EXPECTED_OK_COOKIE_2);
85-
assertEquals(rep.getTargetIamApiKey(), EXPECTED_OK_COOKIE_2);
84+
rep.setTargetIamApiKey(IAM_API_KEY_2);
85+
assertEquals(rep.getTargetIamApiKey(), IAM_API_KEY_2);
8686
}
8787

8888
@Test
8989
public void createReplicationReconfigureSourceSetIamApiKeyFirst() throws Exception {
9090
ReplicatorDocument rep = new ReplicatorDocument();
9191

92-
rep.setSourceIamApiKey(EXPECTED_OK_COOKIE);
93-
assertEquals(rep.getSourceIamApiKey(), EXPECTED_OK_COOKIE);
92+
rep.setSourceIamApiKey(IAM_API_KEY);
93+
assertEquals(rep.getSourceIamApiKey(), IAM_API_KEY);
9494

9595
rep.setSource(sourceDbUrl);
9696
assertEquals(rep.getSource(), sourceDbUrl);
97-
assertEquals(rep.getSourceIamApiKey(), EXPECTED_OK_COOKIE);
97+
assertEquals(rep.getSourceIamApiKey(), IAM_API_KEY);
9898

9999
// reconfigure source
100100

101-
rep.setSourceIamApiKey(EXPECTED_OK_COOKIE_2);
102-
assertEquals(rep.getSourceIamApiKey(), EXPECTED_OK_COOKIE_2);
101+
rep.setSourceIamApiKey(IAM_API_KEY_2);
102+
assertEquals(rep.getSourceIamApiKey(), IAM_API_KEY_2);
103103

104104
rep.setSource(targetDbUrl);
105105
assertEquals(rep.getSource(), targetDbUrl);
@@ -109,20 +109,20 @@ public void createReplicationReconfigureSourceSetIamApiKeyFirst() throws Excepti
109109
public void createReplicationReconfigureTargetSetIamApiKeyFirst() throws Exception {
110110
ReplicatorDocument rep = new ReplicatorDocument();
111111

112-
rep.setTargetIamApiKey(EXPECTED_OK_COOKIE);
113-
assertEquals(rep.getTargetIamApiKey(), EXPECTED_OK_COOKIE);
112+
rep.setTargetIamApiKey(IAM_API_KEY);
113+
assertEquals(rep.getTargetIamApiKey(), IAM_API_KEY);
114114

115115
rep.setTarget(targetDbUrl);
116116
assertEquals(rep.getTarget(), targetDbUrl);
117-
assertEquals(rep.getTargetIamApiKey(), EXPECTED_OK_COOKIE);
117+
assertEquals(rep.getTargetIamApiKey(), IAM_API_KEY);
118118

119119
// reconfigure target
120120

121121
rep.setTarget(sourceDbUrl);
122122
assertEquals(rep.getTarget(), sourceDbUrl);
123123

124-
rep.setTargetIamApiKey(EXPECTED_OK_COOKIE_2);
125-
assertEquals(rep.getTargetIamApiKey(), EXPECTED_OK_COOKIE_2);
124+
rep.setTargetIamApiKey(IAM_API_KEY_2);
125+
assertEquals(rep.getTargetIamApiKey(), IAM_API_KEY_2);
126126
}
127127

128128
@Test
@@ -161,7 +161,7 @@ public void createAndSaveReplicatorDocumentWithSourceIamAuth() throws Exception
161161
c.replicator()
162162
.replicatorDocId(replicatorDocId)
163163
.source(sourceDbUrl)
164-
.sourceIamApiKey(EXPECTED_OK_COOKIE)
164+
.sourceIamApiKey(IAM_API_KEY)
165165
.target(targetDbUrl)
166166
.save();
167167

@@ -172,7 +172,7 @@ public void createAndSaveReplicatorDocumentWithSourceIamAuth() throws Exception
172172
String body = requests[0].getBody().readUtf8();
173173

174174
assertThat("The replication document should contain the source IAM API key",
175-
body, containsString(authJson + EXPECTED_OK_COOKIE));
175+
body, containsString(authJson + IAM_API_KEY));
176176

177177
assertThat("The replication document should contain the correct target",
178178
body, containsString("\"target\":\"" + targetDbUrl + "\""));
@@ -189,7 +189,7 @@ public void createAndSaveReplicatorDocumentWithTargetIamAuth() throws Exception
189189
.replicatorDocId(replicatorDocId)
190190
.source(sourceDbUrl)
191191
.target(targetDbUrl)
192-
.targetIamApiKey(EXPECTED_OK_COOKIE_2)
192+
.targetIamApiKey(IAM_API_KEY_2)
193193
.save();
194194

195195
RecordedRequest[] requests = takeN(server, 1);
@@ -202,7 +202,7 @@ public void createAndSaveReplicatorDocumentWithTargetIamAuth() throws Exception
202202
body, containsString("\"source\":\"" + sourceDbUrl + "\""));
203203

204204
assertThat("The replication document should contain the correct target",
205-
body, containsString(authJson + EXPECTED_OK_COOKIE_2));
205+
body, containsString(authJson + IAM_API_KEY_2));
206206
}
207207

208208
@Test
@@ -215,9 +215,9 @@ public void createAndSaveReplicatorDocumentWithSourceAndTargetIamAuth() throws E
215215
c.replicator()
216216
.replicatorDocId(replicatorDocId)
217217
.source(sourceDbUrl)
218-
.sourceIamApiKey(EXPECTED_OK_COOKIE)
218+
.sourceIamApiKey(IAM_API_KEY)
219219
.target(targetDbUrl)
220-
.targetIamApiKey(EXPECTED_OK_COOKIE_2)
220+
.targetIamApiKey(IAM_API_KEY_2)
221221
.save();
222222

223223
RecordedRequest[] requests = takeN(server, 1);
@@ -227,9 +227,9 @@ public void createAndSaveReplicatorDocumentWithSourceAndTargetIamAuth() throws E
227227
String body = requests[0].getBody().readUtf8();
228228

229229
assertThat("The replication document should contain the source IAM API key",
230-
body, containsString(authJson + EXPECTED_OK_COOKIE));
230+
body, containsString(authJson + IAM_API_KEY));
231231

232232
assertThat("The replication document should contain the target IAM API key",
233-
body, containsString(authJson + EXPECTED_OK_COOKIE_2));
233+
body, containsString(authJson + IAM_API_KEY_2));
234234
}
235235
}

‎cloudant-client/src/test/java/com/cloudant/tests/util/MockWebServerResources.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public class MockWebServerResources {
3838
public static final long TIMEOUT = 10l;
3939
public static final TimeUnit TIMEOUT_UNIT = TimeUnit.SECONDS;
4040

41+
public static String IAM_API_KEY = "UQ6ckeialceOOeK03wsUseVx9WLoZ5o7quexi-hOsQ4X";
42+
public static String IAM_API_KEY_2 = "YI9dejocvxsBBfH28yDWsoQx9VEyQ9i5cvdek-qCyU1V";
43+
4144
public static final String EXPECTED_OK_COOKIE =
4245
"a2ltc3RlYmVsOjUxMzRBQTUzOtiY2_IDUIdsTJEVNEjObAbyhrgz";
4346
public static final String EXPECTED_OK_COOKIE_2 =

0 commit comments

Comments
 (0)