Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.arpnetworking.build</groupId>
<artifactId>arpnetworking-parent-pom</artifactId>
<version>3.3.6</version>
<version>3.3.9</version>
<relativePath />
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.slf4j.Logger;

import java.io.File;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -67,7 +66,7 @@ public static void afterClass() {
}

@Test
public void testNewInstance() throws UnknownHostException {
public void testNewInstance() {
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) TsdMetricsFactory.newInstance(
"MyService",
"MyCluster");
Expand All @@ -85,7 +84,7 @@ public void testNewInstance() throws UnknownHostException {
}

@Test
public void testBuilderDefaults() throws UnknownHostException {
public void testBuilderDefaults() {
final Logger logger = Mockito.mock(Logger.class);
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) new TsdMetricsFactory.Builder(_mockHostResolver, logger)
Expand All @@ -106,7 +105,7 @@ public void testBuilderDefaults() throws UnknownHostException {
}

@Test
public void testBuilderNullSinks() throws UnknownHostException {
public void testBuilderNullSinks() {
final Logger logger = Mockito.mock(Logger.class);
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
final TsdMetricsFactory metricsFactory = (TsdMetricsFactory) new TsdMetricsFactory.Builder(_mockHostResolver, logger)
Expand All @@ -128,7 +127,7 @@ public void testBuilderNullSinks() throws UnknownHostException {
}

@Test
public void testBuilderNullHostResolver() throws UnknownHostException {
public void testBuilderNullHostResolver() {
final Logger logger = Mockito.mock(Logger.class);
final Sink sink = Mockito.mock(Sink.class);
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
Expand All @@ -153,7 +152,7 @@ public void testBuilderNullHostResolver() throws UnknownHostException {
}

@Test
public void testBuilderHostResolverFailure() throws UnknownHostException {
public void testBuilderHostResolverFailure() {
final Logger logger = Mockito.mock(Logger.class);
final Sink sink = Mockito.mock(Sink.class);
Mockito.doThrow(new RuntimeException()).when(_mockHostResolver).get();
Expand All @@ -168,7 +167,6 @@ public void testBuilderHostResolverFailure() throws UnknownHostException {
Assert.assertEquals(1, metricsFactory.getSinks().size());
Assert.assertSame(sink, metricsFactory.getSinks().get(0));

@SuppressWarnings("resource")
final Metrics metrics = metricsFactory.create();
Mockito.verify(logger).warn(
Mockito.eq("Unable to construct TsdMetrics, metrics disabled; failures=[Unable to determine hostname]"),
Expand All @@ -192,7 +190,6 @@ public void testBuilderSinks() {
.setServiceName("MyService")
.setSinks(sinks)
.build();
@SuppressWarnings("resource")
final Metrics metrics = metricsFactory.create();
Assert.assertNotNull(metrics);
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
Expand All @@ -213,7 +210,6 @@ public void testBuilderNoSinks() {
Assert.assertEquals(1, metricsFactory.getSinks().size());
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));

@SuppressWarnings("resource")
final Metrics metrics = metricsFactory.create();
metrics.close();
}
Expand All @@ -229,7 +225,6 @@ public void testBuilderFailureClusterName() {
Mockito.verify(logger).warn(Mockito.anyString());
Assert.assertEquals(1, metricsFactory.getSinks().size());
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
@SuppressWarnings("resource")
final Metrics metrics = metricsFactory.create();
Assert.assertNotNull(metrics);
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
Expand All @@ -247,15 +242,14 @@ public void testBuilderFailureServiceName() {
Mockito.verify(logger).warn(Mockito.anyString());
Assert.assertEquals(1, metricsFactory.getSinks().size());
MatcherAssert.assertThat(metricsFactory.getSinks().get(0), Matchers.instanceOf(WarningSink.class));
@SuppressWarnings("resource")
final Metrics metrics = metricsFactory.create();
Assert.assertNotNull(metrics);
MatcherAssert.assertThat(metrics, Matchers.instanceOf(TsdMetrics.class));
metrics.close();
}

@Test
public void testBuilderHostResolver() throws UnknownHostException {
public void testBuilderHostResolver() {
Mockito.doReturn("foo.example.com").when(_mockHostResolver).get();
final Sink sink = Mockito.mock(Sink.class);

Expand Down Expand Up @@ -285,7 +279,7 @@ public void testBuilderHostResolver() throws UnknownHostException {
}

@Test
public void testBuilderHostNameOverride() throws UnknownHostException {
public void testBuilderHostNameOverride() {
Mockito.doReturn("foo.example.com").when(_mockHostResolver).get();
final Sink sink = Mockito.mock(Sink.class);

Expand Down Expand Up @@ -316,7 +310,7 @@ public void testBuilderHostNameOverride() throws UnknownHostException {
}

@Test
public void testCustomUuidFactory() throws Exception {
public void testCustomUuidFactory() {
Mockito.doReturn("MyHost").when(_mockHostResolver).get();
Mockito.when(_mockUuidFactory.get()).thenReturn(UUID.randomUUID(), UUID.randomUUID());

Expand Down