test refactoring

Signed-off-by: Alexander Wert <AlexanderWert@users.noreply.github.com>
open-telemetry · Jun 24, 2023 · 96d87e5 · 96d87e5
1 parent 35bc09c
commit 96d87e5
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...search/elasticsearch-api-client-8.0/javaagent/src/test/java/ElasticsearchClient8Test.java b/...search/elasticsearch-api-client-8.0/javaagent/src/test/java/ElasticsearchClient8Test.java
@@ -96,9 +96,7 @@ public void elasticsearchStatus() throws IOException {
                     equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"),
                     equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/"),
                     equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L),
-                    equalTo(SemanticAttributes.USER_AGENT_ORIGINAL,
-                        "elastic-java/" + RestClientBuilder.VERSION + " (Java/"
-                            + System.getProperty("java.version") + ")"),
+                    equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, userAgent()),
                     satisfies(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH,
                         AbstractLongAssert::isPositive)
                 )
@@ -144,15 +142,18 @@ public void elasticsearchIndex() throws IOException {
                     equalTo(SemanticAttributes.HTTP_URL,
                         httpHost.toURI() + "/test-index/_doc/test-id?timeout=1s"),
                     equalTo(SemanticAttributes.HTTP_STATUS_CODE, 201L),
-                    equalTo(SemanticAttributes.USER_AGENT_ORIGINAL,
-                        "elastic-java/" + RestClientBuilder.VERSION + " (Java/"
-                            + System.getProperty("java.version") + ")"),
+                    equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, userAgent()),
                     satisfies(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH,
                         AbstractLongAssert::isPositive)
                 )
         ));
   }
 
+  private String userAgent() {
+    return "elastic-java/" + RestClientBuilder.VERSION + " (Java/"
+        + System.getProperty("java.version") + ")";
+  }
+
   private static class Person {
     public final String name;