Skip to content

Commit 74a4cf6

Browse files
mderkamderka
committed
Rephrased doc and improved IT.
1 parent 0f3dc9a commit 74a4cf6

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

‎gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,9 @@ public ChangeRequest reload(Dns.ChangeRequestOption... options) {
172172
}
173173

174174
/**
175-
* Returns {@code true} if the change request has been completed. The function makes an API call
176-
* to Google Cloud DNS in order to request the status update only if the status of the change
177-
* request is {@link Status#PENDING}. If the status is already {@link Status#DONE}, the method
178-
* returns {@code true} without an API call.
175+
* Returns {@code true} if the change request has been completed. If the status is not {@link
176+
* Status#DONE} already, the method makes an API call to Google Cloud DNS to update the change
177+
* request first.
179178
*
180179
* @throws DnsException upon failure of the API call or if the associated zone was not found
181180
*/

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ private static void assertEqChangesIgnoreStatus(ChangeRequest expected, ChangeRe
149149
private static void waitForChangeToComplete(String zoneName, String changeId) {
150150
ChangeRequest changeRequest = DNS.getChangeRequest(zoneName, changeId,
151151
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.STATUS));
152+
waitForChangeToComplete(changeRequest);
153+
}
154+
155+
private static void waitForChangeToComplete(ChangeRequest changeRequest) {
152156
while (!changeRequest.isDone()) {
153157
try {
154158
Thread.sleep(500);
@@ -526,9 +530,9 @@ public void testCreateChange() {
526530
assertTrue(ImmutableList.of(ChangeRequest.Status.PENDING, ChangeRequest.Status.DONE)
527531
.contains(created.status()));
528532
assertEqChangesIgnoreStatus(created, DNS.getChangeRequest(ZONE1.name(), "1"));
529-
waitForChangeToComplete(ZONE1.name(), "1");
530-
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
531-
waitForChangeToComplete(ZONE1.name(), "2");
533+
waitForChangeToComplete(created);
534+
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
535+
waitForChangeToComplete(created);
532536
// with options
533537
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
534538
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.ID));
@@ -537,29 +541,29 @@ public void testCreateChange() {
537541
assertTrue(created.deletions().isEmpty());
538542
assertEquals("3", created.generatedId());
539543
assertNull(created.status());
540-
waitForChangeToComplete(ZONE1.name(), "3");
541-
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
542-
waitForChangeToComplete(ZONE1.name(), "4");
544+
waitForChangeToComplete(created);
545+
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
546+
waitForChangeToComplete(created);
543547
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
544548
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.STATUS));
545549
assertTrue(created.additions().isEmpty());
546550
assertNull(created.startTimeMillis());
547551
assertTrue(created.deletions().isEmpty());
548552
assertEquals("5", created.generatedId());
549553
assertNotNull(created.status());
550-
waitForChangeToComplete(ZONE1.name(), "5");
551-
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
552-
waitForChangeToComplete(ZONE1.name(), "6");
554+
waitForChangeToComplete(created);
555+
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
556+
waitForChangeToComplete(created);
553557
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
554558
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.START_TIME));
555559
assertTrue(created.additions().isEmpty());
556560
assertNotNull(created.startTimeMillis());
557561
assertTrue(created.deletions().isEmpty());
558562
assertEquals("7", created.generatedId());
559563
assertNull(created.status());
560-
waitForChangeToComplete(ZONE1.name(), "7");
561-
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
562-
waitForChangeToComplete(ZONE1.name(), "8");
564+
waitForChangeToComplete(created);
565+
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
566+
waitForChangeToComplete(created);
563567
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
564568
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.ADDITIONS));
565569
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
@@ -568,16 +572,16 @@ public void testCreateChange() {
568572
assertEquals("9", created.generatedId());
569573
assertNull(created.status());
570574
// finishes with delete otherwise we cannot delete the zone
571-
waitForChangeToComplete(ZONE1.name(), "9");
575+
waitForChangeToComplete(created);
572576
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1,
573577
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.DELETIONS));
574-
waitForChangeToComplete(ZONE1.name(), "10");
578+
waitForChangeToComplete(created);
575579
assertEquals(CHANGE_DELETE_ZONE1.deletions(), created.deletions());
576580
assertNull(created.startTimeMillis());
577581
assertTrue(created.additions().isEmpty());
578582
assertEquals("10", created.generatedId());
579583
assertNull(created.status());
580-
waitForChangeToComplete(ZONE1.name(), "10");
584+
waitForChangeToComplete(created);
581585
} finally {
582586
clear();
583587
}

0 commit comments

Comments
 (0)