From ca35036a148f803d339ddc64f6a82676db2b510a Mon Sep 17 00:00:00 2001
From: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
Date: Fri, 1 Dec 2023 19:49:13 +0200
Subject: [PATCH] Move tests to tests/telemetry

Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
---
 microprofile/telemetry/pom.xml                |  5 --
 microprofile/tests/pom.xml                    |  1 +
 microprofile/tests/telemetry/pom.xml          | 58 +++++++++++++++++++
 .../telemetry/InMemorySpanExporter.java       |  0
 .../InMemorySpanExporterProvider.java         |  0
 .../telemetry/RestSpanHierarchyTest.java      |  1 +
 .../telemetry/TestFullUrlName.java            |  3 +-
 ...pi.traces.ConfigurableSpanExporterProvider |  0
 8 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 microprofile/tests/telemetry/pom.xml
 rename microprofile/{ => tests}/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java (100%)
 rename microprofile/{ => tests}/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporterProvider.java (100%)
 rename microprofile/{ => tests}/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java (98%)
 rename microprofile/{ => tests}/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java (95%)
 rename microprofile/{ => tests}/telemetry/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider (100%)

diff --git a/microprofile/telemetry/pom.xml b/microprofile/telemetry/pom.xml
index c24fc67a752..6870dab83e2 100644
--- a/microprofile/telemetry/pom.xml
+++ b/microprofile/telemetry/pom.xml
@@ -102,11 +102,6 @@
             <artifactId>helidon-microprofile-testing-junit5</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/microprofile/tests/pom.xml b/microprofile/tests/pom.xml
index ac8c828c8d3..80cda97c470 100644
--- a/microprofile/tests/pom.xml
+++ b/microprofile/tests/pom.xml
@@ -45,6 +45,7 @@
         <module>arquillian</module>
         <module>server</module>
         <module>testing</module>
+        <module>telemetry</module>
     </modules>
 
     <profiles>
diff --git a/microprofile/tests/telemetry/pom.xml b/microprofile/tests/telemetry/pom.xml
new file mode 100644
index 00000000000..11aaf08f17c
--- /dev/null
+++ b/microprofile/tests/telemetry/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.helidon.microprofile.tests</groupId>
+        <artifactId>helidon-microprofile-tests-project</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>helidon-microprofile-tests-telemetry</artifactId>
+    <name>Helidon Microprofile Telemetry tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.helidon.microprofile.telemetry</groupId>
+            <artifactId>helidon-microprofile-telemetry</artifactId>
+        </dependency>
+        <!-- testing -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.testing</groupId>
+            <artifactId>helidon-microprofile-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java
similarity index 100%
rename from microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java
rename to microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporter.java
diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporterProvider.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporterProvider.java
similarity index 100%
rename from microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporterProvider.java
rename to microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/InMemorySpanExporterProvider.java
diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
similarity index 98%
rename from microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
rename to microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
index 64e202c7e51..1914a2026ad 100644
--- a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
+++ b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import io.helidon.http.Status;
+import io.helidon.microprofile.telemetry.InMemorySpanExporterProvider;
 import io.helidon.microprofile.testing.junit5.AddBean;
 import io.helidon.microprofile.testing.junit5.AddConfig;
 import io.helidon.microprofile.testing.junit5.AddExtension;
diff --git a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
similarity index 95%
rename from microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
rename to microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
index 44ce2eeca40..cbecd852b37 100644
--- a/microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
+++ b/microprofile/tests/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-
 package io.helidon.microprofile.telemetry;
 
 import java.util.List;
 
 import io.helidon.http.Status;
+import io.helidon.microprofile.telemetry.InMemorySpanExporter;
+import io.helidon.microprofile.telemetry.InMemorySpanExporterProvider;
 import io.helidon.microprofile.testing.junit5.AddBean;
 import io.helidon.microprofile.testing.junit5.AddConfig;
 import io.helidon.microprofile.testing.junit5.AddExtension;
diff --git a/microprofile/telemetry/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider b/microprofile/tests/telemetry/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider
similarity index 100%
rename from microprofile/telemetry/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider
rename to microprofile/tests/telemetry/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider