Skip to content

Commit 6e9ed8c

Browse files
mderkamderka
committed
Replaced change IDs equals tests with not null.
1 parent 66c257d commit 6e9ed8c

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ public void testCreateChange() {
532532
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
533533
assertNotNull(created.startTimeMillis());
534534
assertTrue(created.deletions().isEmpty());
535-
assertEquals("1", created.generatedId());
535+
assertNotNull(created.generatedId());
536536
assertTrue(ImmutableList.of(ChangeRequest.Status.PENDING, ChangeRequest.Status.DONE)
537537
.contains(created.status()));
538538
assertEqChangesIgnoreStatus(created, DNS.getChangeRequest(ZONE1.name(), "1"));
@@ -545,7 +545,7 @@ public void testCreateChange() {
545545
assertTrue(created.additions().isEmpty());
546546
assertNull(created.startTimeMillis());
547547
assertTrue(created.deletions().isEmpty());
548-
assertEquals("3", created.generatedId());
548+
assertNotNull(created.generatedId());
549549
assertNull(created.status());
550550
waitForChangeToComplete(created);
551551
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -555,7 +555,7 @@ public void testCreateChange() {
555555
assertTrue(created.additions().isEmpty());
556556
assertNull(created.startTimeMillis());
557557
assertTrue(created.deletions().isEmpty());
558-
assertEquals("5", created.generatedId());
558+
assertNotNull(created.generatedId());
559559
assertNotNull(created.status());
560560
waitForChangeToComplete(created);
561561
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -565,7 +565,7 @@ public void testCreateChange() {
565565
assertTrue(created.additions().isEmpty());
566566
assertNotNull(created.startTimeMillis());
567567
assertTrue(created.deletions().isEmpty());
568-
assertEquals("7", created.generatedId());
568+
assertNotNull(created.generatedId());
569569
assertNull(created.status());
570570
waitForChangeToComplete(created);
571571
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -575,7 +575,7 @@ public void testCreateChange() {
575575
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
576576
assertNull(created.startTimeMillis());
577577
assertTrue(created.deletions().isEmpty());
578-
assertEquals("9", created.generatedId());
578+
assertNotNull(created.generatedId());
579579
assertNull(created.status());
580580
// finishes with delete otherwise we cannot delete the zone
581581
waitForChangeToComplete(created);
@@ -585,7 +585,7 @@ public void testCreateChange() {
585585
assertEquals(CHANGE_DELETE_ZONE1.deletions(), created.deletions());
586586
assertNull(created.startTimeMillis());
587587
assertTrue(created.additions().isEmpty());
588-
assertEquals("10", created.generatedId());
588+
assertNotNull(created.generatedId());
589589
assertNull(created.status());
590590
waitForChangeToComplete(created);
591591
} finally {
@@ -731,7 +731,7 @@ public void testListChanges() {
731731
change = changes.get(1);
732732
assertEquals(CHANGE_ADD_ZONE1.additions(), change.additions());
733733
assertTrue(change.deletions().isEmpty());
734-
assertEquals("1", change.generatedId());
734+
assertNotNull(change.generatedId());
735735
assertNull(change.startTimeMillis());
736736
assertNull(change.status());
737737
changes = ImmutableList.copyOf(DNS.listChangeRequests(ZONE1.name(),
@@ -740,7 +740,7 @@ public void testListChanges() {
740740
change = changes.get(2);
741741
assertTrue(change.additions().isEmpty());
742742
assertNotNull(change.deletions());
743-
assertEquals("2", change.generatedId());
743+
assertNotNull(change.generatedId());
744744
assertNull(change.startTimeMillis());
745745
assertNull(change.status());
746746
changes = ImmutableList.copyOf(DNS.listChangeRequests(ZONE1.name(),
@@ -749,7 +749,7 @@ public void testListChanges() {
749749
change = changes.get(1);
750750
assertTrue(change.additions().isEmpty());
751751
assertTrue(change.deletions().isEmpty());
752-
assertEquals("1", change.generatedId());
752+
assertNotNull(change.generatedId());
753753
assertNull(change.startTimeMillis());
754754
assertNull(change.status());
755755
changes = ImmutableList.copyOf(DNS.listChangeRequests(ZONE1.name(),
@@ -758,7 +758,7 @@ public void testListChanges() {
758758
change = changes.get(1);
759759
assertTrue(change.additions().isEmpty());
760760
assertTrue(change.deletions().isEmpty());
761-
assertEquals("1", change.generatedId());
761+
assertNotNull(change.generatedId());
762762
assertNotNull(change.startTimeMillis());
763763
assertNull(change.status());
764764
changes = ImmutableList.copyOf(DNS.listChangeRequests(ZONE1.name(),
@@ -767,7 +767,7 @@ public void testListChanges() {
767767
change = changes.get(1);
768768
assertTrue(change.additions().isEmpty());
769769
assertTrue(change.deletions().isEmpty());
770-
assertEquals("1", change.generatedId());
770+
assertNotNull(change.generatedId());
771771
assertNull(change.startTimeMillis());
772772
assertEquals(ChangeRequest.Status.DONE, change.status());
773773
} finally {
@@ -1439,7 +1439,7 @@ public void testCreateChangeBatch() {
14391439
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
14401440
assertNotNull(created.startTimeMillis());
14411441
assertTrue(created.deletions().isEmpty());
1442-
assertEquals("1", created.generatedId());
1442+
assertNotNull(created.generatedId());
14431443
assertTrue(ImmutableList.of(ChangeRequest.Status.PENDING, ChangeRequest.Status.DONE)
14441444
.contains(created.status()));
14451445
assertEqChangesIgnoreStatus(created, DNS.getChangeRequest(ZONE1.name(), "1"));
@@ -1455,7 +1455,7 @@ public void testCreateChangeBatch() {
14551455
assertTrue(created.additions().isEmpty());
14561456
assertNull(created.startTimeMillis());
14571457
assertTrue(created.deletions().isEmpty());
1458-
assertEquals("3", created.generatedId());
1458+
assertNotNull(created.generatedId());
14591459
assertNull(created.status());
14601460
waitForChangeToComplete(created);
14611461
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -1468,7 +1468,7 @@ public void testCreateChangeBatch() {
14681468
assertTrue(created.additions().isEmpty());
14691469
assertNull(created.startTimeMillis());
14701470
assertTrue(created.deletions().isEmpty());
1471-
assertEquals("5", created.generatedId());
1471+
assertNotNull(created.generatedId());
14721472
assertNotNull(created.status());
14731473
waitForChangeToComplete(created);
14741474
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -1481,7 +1481,7 @@ public void testCreateChangeBatch() {
14811481
assertTrue(created.additions().isEmpty());
14821482
assertNotNull(created.startTimeMillis());
14831483
assertTrue(created.deletions().isEmpty());
1484-
assertEquals("7", created.generatedId());
1484+
assertNotNull(created.generatedId());
14851485
assertNull(created.status());
14861486
waitForChangeToComplete(created);
14871487
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
@@ -1494,7 +1494,7 @@ public void testCreateChangeBatch() {
14941494
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
14951495
assertNull(created.startTimeMillis());
14961496
assertTrue(created.deletions().isEmpty());
1497-
assertEquals("9", created.generatedId());
1497+
assertNotNull(created.generatedId());
14981498
assertNull(created.status());
14991499
// finishes with delete otherwise we cannot delete the zone
15001500
waitForChangeToComplete(created);
@@ -1507,7 +1507,7 @@ public void testCreateChangeBatch() {
15071507
assertEquals(CHANGE_DELETE_ZONE1.deletions(), created.deletions());
15081508
assertNull(created.startTimeMillis());
15091509
assertTrue(created.additions().isEmpty());
1510-
assertEquals("10", created.generatedId());
1510+
assertNotNull(created.generatedId());
15111511
assertNull(created.status());
15121512
waitForChangeToComplete(created);
15131513
} finally {
@@ -1671,31 +1671,31 @@ public void testListChangesBatch() {
16711671
change = Iterables.get(resultAdditions.get().values(), 1);
16721672
assertEquals(CHANGE_ADD_ZONE1.additions(), change.additions());
16731673
assertTrue(change.deletions().isEmpty());
1674-
assertEquals("1", change.generatedId());
1674+
assertNotNull(change.generatedId());
16751675
assertNull(change.startTimeMillis());
16761676
assertNull(change.status());
16771677
change = Iterables.get(resultDeletions.get().values(), 2);
16781678
assertTrue(change.additions().isEmpty());
16791679
assertNotNull(change.deletions());
1680-
assertEquals("2", change.generatedId());
1680+
assertNotNull(change.generatedId());
16811681
assertNull(change.startTimeMillis());
16821682
assertNull(change.status());
16831683
change = Iterables.get(resultId.get().values(), 1);
16841684
assertTrue(change.additions().isEmpty());
16851685
assertTrue(change.deletions().isEmpty());
1686-
assertEquals("1", change.generatedId());
1686+
assertNotNull(change.generatedId());
16871687
assertNull(change.startTimeMillis());
16881688
assertNull(change.status());
16891689
change = Iterables.get(resultTime.get().values(), 1);
16901690
assertTrue(change.additions().isEmpty());
16911691
assertTrue(change.deletions().isEmpty());
1692-
assertEquals("1", change.generatedId());
1692+
assertNotNull(change.generatedId());
16931693
assertNotNull(change.startTimeMillis());
16941694
assertNull(change.status());
16951695
change = Iterables.get(resultStatus.get().values(), 1);
16961696
assertTrue(change.additions().isEmpty());
16971697
assertTrue(change.deletions().isEmpty());
1698-
assertEquals("1", change.generatedId());
1698+
assertNotNull(change.generatedId());
16991699
assertNull(change.startTimeMillis());
17001700
assertEquals(ChangeRequest.Status.DONE, change.status());
17011701
} finally {

0 commit comments

Comments
 (0)