From b25784e7a242d3361cbcfbca772b95e411df5881 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Mon, 4 Feb 2019 15:39:42 -0500 Subject: [PATCH] Make test results in netty-4.0 client tests more readable --- .../netty-4.0/src/test/groovy/Netty40ClientTest.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy index 3640911e7d..6a477656b3 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy +++ b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy @@ -2,7 +2,6 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags -import io.netty.channel.AbstractChannel import io.opentracing.tag.Tags import org.asynchttpclient.AsyncHttpClient import org.asynchttpclient.DefaultAsyncHttpClientConfig @@ -106,11 +105,13 @@ class Netty40ClientTest extends AgentTestRunner { errored true tags { "$Tags.COMPONENT.key" "netty" + Class errorClass = ConnectException try { - errorTags ConnectException, "Connection refused: localhost/127.0.0.1:$invalidPort" - } catch (AssertionError e) { - errorTags AbstractChannel.AnnotatedConnectException, "Connection refused: localhost/127.0.0.1:$invalidPort" + errorClass = Class.forName('io.netty.channel.AbstractChannel$AnnotatedConnectException') + } catch (ClassNotFoundException e) { + // Older versions use 'java.net.ConnectException' and do not have 'io.netty.channel.AbstractChannel$AnnotatedConnectException' } + errorTags errorClass, "Connection refused: localhost/127.0.0.1:$invalidPort" defaultTags() } }