Merge pull request #83 from testomatio/step

Implemented step support

Author: YevheniiVlasenko

api.txt

@@ -7,7 +7,7 @@
 
     <groupId>io.testomat</groupId>
     <artifactId>java-reporter-core</artifactId>
-    <version>0.8.1</version>
+    <version>0.8.3</version>
     <packaging>jar</packaging>
 
     <name>Testomat.io Reporter Core</name>
@@ -47,6 +47,7 @@
         <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
         <maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
         <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+        <aspectj.version>1.9.24</aspectj.version>
     </properties>
 
     <dependencies>
@@ -67,11 +68,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>software.amazon.awssdk</groupId>-->
-<!--            <artifactId>s3</artifactId>-->
-<!--            <version>2.33.4</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>${aspectj.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-sdk-java</artifactId>
@@ -132,6 +133,10 @@
                         <include>**/*Test.java</include>
                         <include>**/*Tests.java</include>
                     </includes>
+<!--                    required for tests-->
+                    <argLine>
+                        -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
+                    </argLine>
                 </configuration>
             </plugin>
 

java-reporter-core/pom.xml

@@ -0,0 +1,12 @@
+package io.testomat.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Step {
+    String value() default "";
+}

java-reporter-core/src/main/java/io/testomat/core/annotation/Step.java

@@ -4,8 +4,8 @@
 import static io.testomat.core.constants.CommonConstants.RESPONSE_UID_KEY;
 
 import io.testomat.core.artifact.ArtifactLinkDataStorage;
-import io.testomat.core.artifact.ReportedTestStorage;
 import io.testomat.core.artifact.LinkUploadBodyBuilder;
+import io.testomat.core.artifact.ReportedTestStorage;
 import io.testomat.core.artifact.credential.CredentialsManager;
 import io.testomat.core.artifact.credential.CredentialsValidationService;
 import io.testomat.core.client.http.CustomHttpClient;

java-reporter-core/src/main/java/io/testomat/core/client/TestomatioClient.java

@@ -17,6 +17,7 @@
 import io.testomat.core.model.TestResult;
 import io.testomat.core.propertyconfig.impl.PropertyProviderFactoryImpl;
 import io.testomat.core.propertyconfig.interf.PropertyProvider;
+import io.testomat.core.step.TestStep;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -126,7 +127,7 @@ public String buildUploadLinksBody(String jsonString) {
 
     /**
      * Converts test result to map structure for JSON serialization.
-     * Includes all standard fields plus support for parameterized test data.
+     * Includes all standard fields plus support for parameterized test data and test steps.
      */
     private Map<String, Object> buildTestResultMap(TestResult result) {
         Map<String, Object> body = new HashMap<>();
@@ -156,6 +157,12 @@ private Map<String, Object> buildTestResultMap(TestResult result) {
             body.put("rid", result.getRid());
         }
 
+        if (result.getSteps() != null && !result.getSteps().isEmpty()) {
+            List<Map<String, Object>> stepsMap = convertStepsToMap(result.getSteps());
+            body.put("steps", stepsMap);
+            System.out.println("DEBUG: Adding " + result.getSteps().size() + " steps to request body for test: " + result.getTitle());
+        }
+
         if (createParam) {
             body.put("create", TRUE);
         }
@@ -165,6 +172,34 @@ private Map<String, Object> buildTestResultMap(TestResult result) {
         return body;
     }
 
+    /**
+     * Converts a list of TestStep objects to a list of maps for JSON serialization.
+     * Each step is converted to match the API format with category, title, duration, and nested steps.
+     */
+    private List<Map<String, Object>> convertStepsToMap(List<TestStep> steps) {
+        List<Map<String, Object>> stepMaps = new ArrayList<>();
+        for (TestStep step : steps) {
+            Map<String, Object> stepMap = new HashMap<>();
+
+            if (step.getCategory() != null) {
+                stepMap.put("category", step.getCategory());
+            }
+
+            if (step.getStepTitle() != null) {
+                stepMap.put("title", step.getStepTitle());
+            }
+
+            stepMap.put("duration", step.getDuration());
+
+            if (step.getSubsteps() != null && !step.getSubsteps().isEmpty()) {
+                stepMap.put("steps", convertStepsToMap(step.getSubsteps()));
+            }
+
+            stepMaps.add(stepMap);
+        }
+        return stepMaps;
+    }
+
     /**
      * Safely retrieves property value, returning null if property is not
      * found or any exception occurs.

java-reporter-core/src/main/java/io/testomat/core/client/request/NativeRequestBodyBuilder.java

@@ -1,9 +1,12 @@
 package io.testomat.core.model;
 
+import io.testomat.core.step.TestStep;
+import java.util.List;
+
 /**
  * Represents a test execution result with metadata for Testomat.io reporting.
  * Contains test outcome, diagnostic information, and optional parameterized test data.
- * 
+ *
  * <p>Use the {@link Builder} for convenient construction:
  * <pre>{@code
  * TestResult result = TestResult.builder()
@@ -17,38 +20,41 @@
 public class TestResult {
     /** Human-readable test method or scenario name */
     private String title;
-    
+
     /** Unique test identifier from Testomat.io test management system */
     private String testId;
-    
+
     /** Test suite or test class name containing this test */
     private String suiteTitle;
-    
+
     /** Source file path where the test is located */
     private String file;
-    
+
     /** Test execution status: "passed", "failed", or "skipped" */
     private String status;
-    
+
     /** Error or failure message for failed tests, null for passed tests */
     private String message;
-    
+
     /** Stack trace for failed tests, null for passed tests */
     private String stack;
-    
+
     /** Parameterized test data or example values for data-driven tests */
     private Object example;
-    
+
     /** Run identifier for associating results with specific test execution runs */
     private String rid;
 
+    /** Test steps executed during the test */
+    private List<TestStep> steps;
+
     public TestResult() {
     }
 
     public TestResult(String title, String testId,
                       String suiteTitle, String file,
                       String status, String message, String stack,
-                      Object example, String rid) {
+                      Object example, String rid, List<TestStep> steps) {
         this.title = title;
         this.testId = testId;
         this.suiteTitle = suiteTitle;
@@ -58,6 +64,7 @@ public TestResult(String title, String testId,
         this.stack = stack;
         this.example = example;
         this.rid = rid;
+        this.steps = steps;
     }
 
     /**
@@ -74,6 +81,7 @@ public static class Builder {
         private String stack;
         private Object example;
         private String rid;
+        private List<TestStep> steps;
 
         public Builder withTitle(String title) {
             this.title = title;
@@ -120,8 +128,13 @@ public Builder withRid(String rid) {
             return this;
         }
 
+        public Builder withSteps(List<TestStep> steps) {
+            this.steps = steps;
+            return this;
+        }
+
         public TestResult build() {
-            return new TestResult(title, testId, suiteTitle, file, status, message, stack, example, rid);
+            return new TestResult(title, testId, suiteTitle, file, status, message, stack, example, rid, steps);
         }
     }
 
@@ -205,4 +218,12 @@ public String getRid() {
     public void setRid(String rid) {
         this.rid = rid;
     }
+
+    public List<TestStep> getSteps() {
+        return steps;
+    }
+
+    public void setSteps(List<TestStep> steps) {
+        this.steps = steps;
+    }
 }