Skip to content

Commit dacea19

Browse files
mderkamderka
committed
Another round of comments from @aozarov.
1 parent c95c3aa commit dacea19

File tree

3 files changed

+48
-63
lines changed

3 files changed

+48
-63
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ public String toString() {
318318
.add("dnsName", dnsName())
319319
.add("nameServerSet", nameServerSet())
320320
.add("nameServers", nameServers())
321+
.add("creationTimeMillis", creationTimeMillis())
321322
.toString();
322323
}
323324
}

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/DnsRecordTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ public void testValidTtl() {
7272
@Test
7373
public void testEqualsAndNotEquals() {
7474
DnsRecord clone = record.toBuilder().build();
75-
assertEquals(clone, record);
75+
assertEquals(record, clone);
7676
clone = record.toBuilder().addRecord("another record").build();
77-
assertNotEquals(clone, record);
77+
assertNotEquals(record, clone);
7878
String differentName = "totally different name";
7979
clone = record.toBuilder().name(differentName).build();
80-
assertNotEquals(clone, record);
80+
assertNotEquals(record, clone);
8181
clone = record.toBuilder().ttl(record.ttl() + 1).build();
82-
assertNotEquals(clone, record);
82+
assertNotEquals(record, clone);
8383
clone = record.toBuilder().type(DnsRecord.Type.TXT).build();
84-
assertNotEquals(clone, record);
84+
assertNotEquals(record, clone);
8585
}
8686

8787
@Test

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/ManagedZoneInfoTest.java

+42-58
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import static org.junit.Assert.assertNull;
2222
import static org.junit.Assert.assertTrue;
2323

24+
import com.google.common.collect.ImmutableList;
2425
import com.google.common.collect.Lists;
2526

26-
import org.junit.Before;
2727
import org.junit.Test;
2828

2929
import java.math.BigInteger;
@@ -41,22 +41,14 @@ public class ManagedZoneInfoTest {
4141
private static final String NS1 = "name server 1";
4242
private static final String NS2 = "name server 2";
4343
private static final String NS3 = "name server 3";
44-
private List<String> nameServers = new LinkedList<>();
45-
private ManagedZoneInfo info;
46-
47-
@Before
48-
public void setUp() {
49-
nameServers.add(NS1);
50-
nameServers.add(NS2);
51-
nameServers.add(NS3);
52-
info = ManagedZoneInfo.builder(NAME, ID)
53-
.creationTimeMillis(CREATION_TIME_MILLIS)
54-
.dnsName(DNS_NAME)
55-
.description(DESCRIPTION)
56-
.nameServerSet(NAME_SERVER_SET)
57-
.nameServers(nameServers)
58-
.build();
59-
}
44+
private static final List<String> NAME_SERVERS = ImmutableList.of(NS1, NS2, NS3);
45+
private static final ManagedZoneInfo INFO = ManagedZoneInfo.builder(NAME, ID)
46+
.creationTimeMillis(CREATION_TIME_MILLIS)
47+
.dnsName(DNS_NAME)
48+
.description(DESCRIPTION)
49+
.nameServerSet(NAME_SERVER_SET)
50+
.nameServers(NAME_SERVERS)
51+
.build();
6052

6153
@Test
6254
public void testDefaultBuilders() {
@@ -88,58 +80,51 @@ public void testDefaultBuilders() {
8880

8981
@Test
9082
public void testBuilder() {
91-
assertEquals(3, info.nameServers().size());
92-
assertEquals(NS1, info.nameServers().get(0));
93-
assertEquals(NS2, info.nameServers().get(1));
94-
assertEquals(NS3, info.nameServers().get(2));
95-
assertEquals(NAME, info.name());
96-
assertEquals(ID, info.id());
97-
assertEquals(CREATION_TIME_MILLIS, info.creationTimeMillis());
98-
assertEquals(NAME_SERVER_SET, info.nameServerSet());
99-
assertEquals(DESCRIPTION, info.description());
100-
assertEquals(DNS_NAME, info.dnsName());
101-
}
102-
103-
@Test
104-
public void testValidCreationTime() {
105-
ManagedZoneInfo.builder(NAME).creationTimeMillis(-1);
106-
ManagedZoneInfo.builder(NAME).creationTimeMillis(0);
107-
ManagedZoneInfo.builder(NAME).creationTimeMillis(Long.MAX_VALUE);
83+
assertEquals(3, INFO.nameServers().size());
84+
assertEquals(NS1, INFO.nameServers().get(0));
85+
assertEquals(NS2, INFO.nameServers().get(1));
86+
assertEquals(NS3, INFO.nameServers().get(2));
87+
assertEquals(NAME, INFO.name());
88+
assertEquals(ID, INFO.id());
89+
assertEquals(CREATION_TIME_MILLIS, INFO.creationTimeMillis());
90+
assertEquals(NAME_SERVER_SET, INFO.nameServerSet());
91+
assertEquals(DESCRIPTION, INFO.description());
92+
assertEquals(DNS_NAME, INFO.dnsName());
10893
}
10994

11095
@Test
11196
public void testEqualsAndNotEquals() {
112-
ManagedZoneInfo clone = info.toBuilder().build();
113-
assertEquals(clone, info);
114-
List<String> moreServers = Lists.newLinkedList(nameServers);
97+
ManagedZoneInfo clone = INFO.toBuilder().build();
98+
assertEquals(INFO, clone);
99+
List<String> moreServers = Lists.newLinkedList(NAME_SERVERS);
115100
moreServers.add(NS1);
116-
clone = info.toBuilder().nameServers(moreServers).build();
117-
assertNotEquals(clone, info);
101+
clone = INFO.toBuilder().nameServers(moreServers).build();
102+
assertNotEquals(INFO, clone);
118103
String differentName = "totally different name";
119-
clone = info.toBuilder().name(differentName).build();
120-
assertNotEquals(clone, info);
121-
clone = info.toBuilder().creationTimeMillis(info.creationTimeMillis() + 1).build();
122-
assertNotEquals(clone, info);
123-
clone = info.toBuilder().description(info.description() + "aaaa").build();
124-
assertNotEquals(clone, info);
125-
clone = info.toBuilder().dnsName(differentName).build();
126-
assertNotEquals(clone, info);
127-
clone = info.toBuilder().id(info.id().add(BigInteger.ONE)).build();
128-
assertNotEquals(clone, info);
129-
clone = info.toBuilder().nameServerSet(info.nameServerSet() + "salt").build();
130-
assertNotEquals(clone, info);
104+
clone = INFO.toBuilder().name(differentName).build();
105+
assertNotEquals(INFO, clone);
106+
clone = INFO.toBuilder().creationTimeMillis(INFO.creationTimeMillis() + 1).build();
107+
assertNotEquals(INFO, clone);
108+
clone = INFO.toBuilder().description(INFO.description() + "aaaa").build();
109+
assertNotEquals(INFO, clone);
110+
clone = INFO.toBuilder().dnsName(differentName).build();
111+
assertNotEquals(INFO, clone);
112+
clone = INFO.toBuilder().id(INFO.id().add(BigInteger.ONE)).build();
113+
assertNotEquals(INFO, clone);
114+
clone = INFO.toBuilder().nameServerSet(INFO.nameServerSet() + "salt").build();
115+
assertNotEquals(INFO, clone);
131116
}
132117

133118
@Test
134119
public void testSameHashCodeOnEquals() {
135-
int hash = info.hashCode();
136-
ManagedZoneInfo clone = info.toBuilder().build();
120+
int hash = INFO.hashCode();
121+
ManagedZoneInfo clone = INFO.toBuilder().build();
137122
assertEquals(clone.hashCode(), hash);
138123
}
139124

140125
@Test
141126
public void testToBuilder() {
142-
assertEquals(info, info.toBuilder().build());
127+
assertEquals(INFO, INFO.toBuilder().build());
143128
ManagedZoneInfo partial = ManagedZoneInfo.builder(NAME).build();
144129
assertEquals(partial, partial.toBuilder().build());
145130
partial = ManagedZoneInfo.builder(ID).build();
@@ -160,7 +145,7 @@ public void testToBuilder() {
160145

161146
@Test
162147
public void testToAndFromPb() {
163-
assertEquals(info, ManagedZoneInfo.fromPb(info.toPb()));
148+
assertEquals(INFO, ManagedZoneInfo.fromPb(INFO.toPb()));
164149
ManagedZoneInfo partial = ManagedZoneInfo.builder(NAME).build();
165150
assertEquals(partial, ManagedZoneInfo.fromPb(partial.toPb()));
166151
partial = ManagedZoneInfo.builder(ID).build();
@@ -181,15 +166,14 @@ public void testToAndFromPb() {
181166

182167
@Test
183168
public void testEmptyNameServers() {
184-
ManagedZoneInfo clone = info.toBuilder().nameServers(new LinkedList<String>()).build();
169+
ManagedZoneInfo clone = INFO.toBuilder().nameServers(new LinkedList<String>()).build();
185170
assertTrue(clone.nameServers().isEmpty());
186171
clone.toPb(); // test that this is allowed
187172
}
188173

189174
@Test
190175
public void testDateParsing() {
191-
com.google.api.services.dns.model.ManagedZone pb =
192-
info.toPb();
176+
com.google.api.services.dns.model.ManagedZone pb = INFO.toPb();
193177
pb.setCreationTime("2016-01-19T18:00:12.854Z"); // a real value obtained from Google Cloud DNS
194178
ManagedZoneInfo mz = ManagedZoneInfo.fromPb(pb); // parses the string timestamp to millis
195179
com.google.api.services.dns.model.ManagedZone pbClone = mz.toPb(); // converts it back to string

0 commit comments

Comments
 (0)