Skip to content

Commit 682c7c8

Browse files
committed
api: Make MAX_ADDRESSES_TO_STRING package-private for tests
1 parent 66c5e9e commit 682c7c8

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

api/src/main/java/io/grpc/EquivalentAddressGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1770")
3636
public final class EquivalentAddressGroup {
37-
private static final int MAX_ADDRESSES_TO_STRING = 100;
37+
static final int MAX_ADDRESSES_TO_STRING = 100;
3838

3939
/**
4040
* The authority to be used when constructing Subchannels for this EquivalentAddressGroup.

api/src/test/java/io/grpc/EquivalentAddressGroupTest.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

21-
import java.lang.reflect.Field;
2221
import java.net.SocketAddress;
2322
import java.util.ArrayList;
2423
import java.util.List;
@@ -34,7 +33,7 @@ public class EquivalentAddressGroupTest {
3433

3534
@Test
3635
public void toString_summarizesLargeAddressList() {
37-
int maxAddressesToString = maxAddressesToString();
36+
int maxAddressesToString = EquivalentAddressGroup.MAX_ADDRESSES_TO_STRING;
3837
List<SocketAddress> addrs = new ArrayList<>();
3938
for (int i = 0; i <= maxAddressesToString; i++) {
4039
addrs.add(new FakeSocketAddress("addr" + i));
@@ -55,7 +54,7 @@ public void toString_summarizesLargeAddressList() {
5554

5655
@Test
5756
public void toString_doesNotSummarizeAtMaxAddressCount() {
58-
int maxAddressesToString = maxAddressesToString();
57+
int maxAddressesToString = EquivalentAddressGroup.MAX_ADDRESSES_TO_STRING;
5958
List<SocketAddress> addrs = new ArrayList<>();
6059
for (int i = 0; i < maxAddressesToString; i++) {
6160
addrs.add(new FakeSocketAddress("addr" + i));
@@ -66,16 +65,6 @@ public void toString_doesNotSummarizeAtMaxAddressCount() {
6665
assertThat(eag.toString()).isEqualTo(expected);
6766
}
6867

69-
private static int maxAddressesToString() {
70-
try {
71-
Field field = EquivalentAddressGroup.class.getDeclaredField("MAX_ADDRESSES_TO_STRING");
72-
field.setAccessible(true);
73-
return (int) field.get(null);
74-
} catch (NoSuchFieldException | IllegalAccessException e) {
75-
throw new LinkageError("Unable to read MAX_ADDRESSES_TO_STRING", e);
76-
}
77-
}
78-
7968
private static final class FakeSocketAddress extends SocketAddress {
8069

8170
private final String name;

0 commit comments

Comments
 (0)