Skip to content

Commit fcb0d44

Browse files
committed
remove unnecessary exceptions and suppressions
1 parent 8375afc commit fcb0d44

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

src/test/java/com/arpnetworking/metrics/impl/TsdMetricsFactoryTest.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.slf4j.Logger;
3838

3939
import java.io.File;
40-
import java.net.UnknownHostException;
4140
import java.util.ArrayList;
4241
import java.util.Arrays;
4342
import java.util.Collections;
@@ -67,7 +66,7 @@ public static void afterClass() {
6766
}
6867

6968
@Test
70-
public void testNewInstance() throws UnknownHostException {
69+
public void testNewInstance() {
7170
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) TsdMetricsFactory.newInstance(
7271
"MyService",
7372
"MyCluster");
@@ -85,7 +84,7 @@ public void testNewInstance() throws UnknownHostException {
8584
}
8685

8786
@Test
88-
public void testBuilderDefaults() throws UnknownHostException {
87+
public void testBuilderDefaults() {
8988
final Logger logger = Mockito.mock(Logger.class);
9089
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
9190
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) new TsdMetricsFactory.Builder(_mockHostResolver, logger)
@@ -106,7 +105,7 @@ public void testBuilderDefaults() throws UnknownHostException {
106105
}
107106

108107
@Test
109-
public void testBuilderNullSinks() throws UnknownHostException {
108+
public void testBuilderNullSinks() {
110109
final Logger logger = Mockito.mock(Logger.class);
111110
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
112111
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) new TsdMetricsFactory.Builder(_mockHostResolver, logger)
@@ -128,7 +127,7 @@ public void testBuilderNullSinks() throws UnknownHostException {
128127
}
129128

130129
@Test
131-
public void testBuilderNullHostResolver() throws UnknownHostException {
130+
public void testBuilderNullHostResolver() {
132131
final Logger logger = Mockito.mock(Logger.class);
133132
final Sink sink = Mockito.mock(Sink.class);
134133
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
@@ -153,7 +152,7 @@ public void testBuilderNullHostResolver() throws UnknownHostException {
153152
}
154153

155154
@Test
156-
public void testBuilderHostResolverFailure() throws UnknownHostException {
155+
public void testBuilderHostResolverFailure() {
157156
final Logger logger = Mockito.mock(Logger.class);
158157
final Sink sink = Mockito.mock(Sink.class);
159158
Mockito.doThrow(new RuntimeException()).when(_mockHostResolver).get();
@@ -168,7 +167,6 @@ public void testBuilderHostResolverFailure() throws UnknownHostException {
168167
Assert.assertEquals(1, metricsFactory.getSinks().size());
169168
Assert.assertSame(sink, metricsFactory.getSinks().get(0));
170169

171-
@SuppressWarnings("resource")
172170
final Metrics metrics = metricsFactory.create();
173171
Mockito.verify(logger).warn(
174172
Mockito.eq("Unable to construct TsdMetrics, metrics disabled; failures=[Unable to determine hostname]"),
@@ -192,7 +190,6 @@ public void testBuilderSinks() {
192190
.setServiceName("MyService")
193191
.setSinks(sinks)
194192
.build();
195-
@SuppressWarnings("resource")
196193
final Metrics metrics = metricsFactory.create();
197194
Assert.assertNotNull(metrics);
198195
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
@@ -213,7 +210,6 @@ public void testBuilderNoSinks() {
213210
Assert.assertEquals(1, metricsFactory.getSinks().size());
214211
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
215212

216-
@SuppressWarnings("resource")
217213
final Metrics metrics = metricsFactory.create();
218214
metrics.close();
219215
}
@@ -229,7 +225,6 @@ public void testBuilderFailureClusterName() {
229225
Mockito.verify(logger).warn(Mockito.anyString());
230226
Assert.assertEquals(1, metricsFactory.getSinks().size());
231227
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
232-
@SuppressWarnings("resource")
233228
final Metrics metrics = metricsFactory.create();
234229
Assert.assertNotNull(metrics);
235230
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
@@ -247,15 +242,14 @@ public void testBuilderFailureServiceName() {
247242
Mockito.verify(logger).warn(Mockito.anyString());
248243
Assert.assertEquals(1, metricsFactory.getSinks().size());
249244
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
250-
@SuppressWarnings("resource")
251245
final Metrics metrics = metricsFactory.create();
252246
Assert.assertNotNull(metrics);
253247
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
254248
metrics.close();
255249
}
256250

257251
@Test
258-
public void testBuilderHostResolver() throws UnknownHostException {
252+
public void testBuilderHostResolver() {
259253
Mockito.doReturn("foo.example.com").when(_mockHostResolver).get();
260254
final Sink sink = Mockito.mock(Sink.class);
261255

@@ -285,7 +279,7 @@ public void testBuilderHostResolver() throws UnknownHostException {
285279
}
286280

287281
@Test
288-
public void testBuilderHostNameOverride() throws UnknownHostException {
282+
public void testBuilderHostNameOverride() {
289283
Mockito.doReturn("foo.example.com").when(_mockHostResolver).get();
290284
final Sink sink = Mockito.mock(Sink.class);
291285

@@ -316,7 +310,7 @@ public void testBuilderHostNameOverride() throws UnknownHostException {
316310
}
317311

318312
@Test
319-
public void testCustomUuidFactory() throws Exception {
313+
public void testCustomUuidFactory() {
320314
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
321315
Mockito.when(_mockUuidFactory.get()).thenReturn(UUID.randomUUID(), UUID.randomUUID());
322316

0 commit comments

Comments
 (0)