test module

Signed-off-by: Hendrik Ebbers <[email protected]>

Author: hendrikebbers

hiero-enterprise-microprofile/pom.xml

@@ -42,6 +42,11 @@
       <artifactId>jakarta.ws.rs-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>hiero-enterprise-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.helidon.microprofile.server</groupId>
       <artifactId>helidon-microprofile-server</artifactId>

hiero-enterprise-microprofile/src/test/java/com/openelements/hiero/microprofile/test/HieroTestProducer.java

@@ -0,0 +1,18 @@
+package com.openelements.hiero.microprofile.test;
+
+import com.openelements.hiero.base.mirrornode.MirrorNodeClient;
+import com.openelements.hiero.base.protocol.ProtocolLayerClient;
+import com.openelements.hiero.test.HieroTestUtils;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+
+@ApplicationScoped
+public class HieroTestProducer {
+
+    @Produces
+    @ApplicationScoped
+    public HieroTestUtils createHieroTestUtils(
+            MirrorNodeClient mirrorNodeClient, ProtocolLayerClient protocolLayerClient) {
+        return new HieroTestUtils(mirrorNodeClient, protocolLayerClient);
+    }
+}

hiero-enterprise-microprofile/src/test/java/com/openelements/hiero/microprofile/test/TestConfigSource.java

@@ -3,7 +3,6 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.slf4j.Logger;
@@ -41,12 +40,6 @@ public TestConfigSource() {
             properties.put("hiero.network.name", Dotenv.load().get("hiero.network.name"));
         }
 
-        //TODO: Hardcoded for Solo tests,should be fixed later
-        if (Objects.equals(properties.get("hiero.network.name"), "solo")) {
-            properties.put("hiero.network.nodes", "127.0.0.1:50211:0.0.3");
-            properties.put("hiero.network.mirrornode", "http://localhost:8080");
-        }
-
         properties.forEach((k, v) -> log.info("CONFIG: '" + k + "'->'" + v + "'"));
     }
 

hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TestConfig.java

@@ -16,7 +16,6 @@ public class TestConfig {
     @Bean
     HieroTestUtils hieroTestUtils(MirrorNodeClient mirrorNodeClient, ProtocolLayerClient protocolLayerClient) {
         HieroTestUtils testUtils = new HieroTestUtils(mirrorNodeClient, protocolLayerClient);
-        testUtils.init();
         return testUtils;
     }
 }

hiero-enterprise-test/src/main/java/com/openelements/hiero/test/HieroTestUtils.java

@@ -7,31 +7,30 @@
 import com.openelements.hiero.base.protocol.ProtocolLayerClient;
 import com.openelements.hiero.base.protocol.TransactionListener;
 import com.openelements.hiero.base.protocol.TransactionType;
+import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class HieroTestUtils {
+public class HieroTestUtils implements Serializable {
+
+    private final static Logger log = LoggerFactory.getLogger(HieroTestUtils.class);
 
     private final MirrorNodeClient mirrorNodeClient;
 
     private final ProtocolLayerClient protocolLayerClient;
 
     private final AtomicReference<TransactionId> transactionIdRef = new AtomicReference<>();
 
-    private final AtomicBoolean initialized = new AtomicBoolean();
+    public HieroTestUtils() {
+        throw new UnsupportedOperationException("No-args constructor not supported");
+    }
 
     public HieroTestUtils(MirrorNodeClient mirrorNodeClient, ProtocolLayerClient protocolLayerClient) {
         this.mirrorNodeClient = mirrorNodeClient;
         this.protocolLayerClient = protocolLayerClient;
-    }
 
-    public synchronized void init() {
-        final boolean initHappened = initialized.get();
-        if (initHappened) {
-            return;
-        }
-        initialized.set(true);
         protocolLayerClient.addTransactionListener(new TransactionListener() {
             @Override
             public void transactionSubmitted(TransactionType transactionType, TransactionId transactionId) {
@@ -45,27 +44,35 @@ public void transactionHandled(TransactionType transactionType, TransactionId tr
         });
     }
 
-    public void waitForMirrorNodeRecords() throws HieroException {
+    public void waitForMirrorNodeRecords() {
         final TransactionId transactionId = transactionIdRef.get();
         if (transactionId != null) {
+            log.debug("Waiting for transaction '{}' available at mirror node", transactionId);
             final LocalDateTime start = LocalDateTime.now();
             boolean done = false;
             while (!done) {
                 String transactionIdString =
                         transactionId.accountId.toString() + "-" + transactionId.validStart.getEpochSecond() + "-"
                                 + String.format("%09d", transactionId.validStart.getNano());
-                done = mirrorNodeClient.queryTransaction(transactionIdString).isPresent();
+                try {
+                    done = mirrorNodeClient.queryTransaction(transactionIdString).isPresent();
+                } catch (HieroException e) {
+                    throw new RuntimeException("Error in mirror node query!", e);
+                }
                 if (!done) {
                     if (LocalDateTime.now().isAfter(start.plusSeconds(30))) {
-                        throw new HieroException("Timeout waiting for transaction");
+                        throw new RuntimeException("Timeout waiting for transaction");
                     }
                     try {
                         Thread.sleep(100);
                     } catch (InterruptedException e) {
-                        throw new HieroException("Interrupted while waiting for transaction", e);
+                        throw new RuntimeException("Interrupted while waiting for transaction", e);
                     }
                 }
             }
+            log.debug("Transaction '{}' is available at mirror node", transactionId);
+        } else {
+            log.debug("No transaction to wait for");
         }
     }
 }

hiero-enterprise-test/src/main/java/module-info.java

@@ -6,4 +6,5 @@
     requires transitive com.openelements.hiero.base;
     requires org.jspecify;
     requires com.google.auto.service;
+    requires org.slf4j;
 }