refine ut

Author: shalk

instrumentation/twilio-6.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioClientTest.java

@@ -45,8 +45,12 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 class TwilioClientTest {
 
   @RegisterExtension
@@ -119,7 +123,9 @@ class TwilioClientTest {
           + "      \"more_info\": \"Testing\"\n"
           + "    }";
 
-  private TwilioRestClient twilioRestClient;
+  @Mock private TwilioRestClient twilioRestClient;
+
+  @Mock private CloseableHttpClient httpClient;
 
   @BeforeAll
   static void setUp() {
@@ -135,7 +141,6 @@ static void tearDown() {
 
   @Test
   void synchronousMessage() {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -162,6 +167,7 @@ void synchronousMessage() {
                 span ->
                     span.hasName("MessageCreator.create")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
                                 stringKey("twilio.type"),
@@ -174,7 +180,6 @@ void synchronousMessage() {
 
   @Test
   void synchronousCall() throws URISyntaxException {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -201,6 +206,7 @@ void synchronousCall() throws URISyntaxException {
                 span ->
                     span.hasName("CallCreator.create")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
                                 stringKey("twilio.type"), "com.twilio.rest.api.v2010.account.Call"),
@@ -212,9 +218,8 @@ void synchronousCall() throws URISyntaxException {
 
   @Test
   void httpClient() throws IOException {
-    CloseableHttpClient httpClient = mock(CloseableHttpClient.class);
-    CloseableHttpResponse response1 = mockResponse(MESSAGE_RESPONSE_BODY, 200);
-    when(httpClient.execute(any())).thenReturn(response1);
+    CloseableHttpResponse response = mockResponse(MESSAGE_RESPONSE_BODY, 200);
+    when(httpClient.execute(any())).thenReturn(response);
 
     HttpClientBuilder clientBuilder = getHttpClientBuilder(httpClient);
 
@@ -245,6 +250,7 @@ void httpClient() throws IOException {
                 span ->
                     span.hasName("MessageCreator.create")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
                                 stringKey("twilio.type"),
@@ -264,7 +270,6 @@ void httpClient() throws IOException {
 
   @Test
   void httpClientRetry() throws IOException {
-    CloseableHttpClient httpClient = mock(CloseableHttpClient.class);
     CloseableHttpResponse response1 = mockResponse(ERROR_RESPONSE_BODY, 500);
     CloseableHttpResponse response2 = mockResponse(MESSAGE_RESPONSE_BODY, 200);
     when(httpClient.execute(any())).thenReturn(response1, response2);
@@ -297,6 +302,7 @@ void httpClientRetry() throws IOException {
                 span -> span.hasName("test").hasNoParent().hasAttributes(Attributes.empty()),
                 span ->
                     span.hasName("MessageCreator.create")
+                        .hasParent(trace.getSpan(0))
                         .hasKind(CLIENT)
                         .hasAttributesSatisfyingExactly(
                             equalTo(
@@ -310,7 +316,6 @@ void httpClientRetry() throws IOException {
 
   @Test
   void httpClientRetryAsync() throws Exception {
-    CloseableHttpClient httpClient = mock(CloseableHttpClient.class);
     CloseableHttpResponse response1 = mockResponse(ERROR_RESPONSE_BODY, 500);
     CloseableHttpResponse response2 = mockResponse(MESSAGE_RESPONSE_BODY, 200);
     when(httpClient.execute(any())).thenReturn(response1, response2);
@@ -352,6 +357,7 @@ void httpClientRetryAsync() throws Exception {
                 span ->
                     span.hasName("MessageCreator.createAsync")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
                                 stringKey("twilio.type"),
@@ -364,7 +370,6 @@ void httpClientRetryAsync() throws Exception {
 
   @Test
   void syncFailure() {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -395,13 +400,13 @@ void syncFailure() {
                 span ->
                     span.hasName("MessageCreator.create")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasStatus(StatusData.error())
                         .hasException(new ApiException("Testing Failure"))));
   }
 
   @Test
   void rootSpan() {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -436,7 +441,6 @@ void rootSpan() {
 
   @Test
   void asynchronousCall() throws Exception {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -472,6 +476,7 @@ void asynchronousCall() throws Exception {
                 span ->
                     span.hasName("MessageCreator.createAsync")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             equalTo(
                                 stringKey("twilio.type"),
@@ -484,7 +489,6 @@ void asynchronousCall() throws Exception {
 
   @Test
   void asynchronousError() {
-    twilioRestClient = mock(TwilioRestClient.class);
     when(twilioRestClient.getObjectMapper()).thenReturn(new ObjectMapper());
     when(twilioRestClient.request(any()))
         .thenReturn(
@@ -523,6 +527,7 @@ void asynchronousError() {
                 span ->
                     span.hasName("MessageCreator.createAsync")
                         .hasKind(CLIENT)
+                        .hasParent(trace.getSpan(0))
                         .hasStatus(StatusData.error())
                         .hasException(new ApiException("Testing Failure"))));
   }