diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c98acf..6f8d7cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Cache Maven dependencies @@ -31,7 +31,7 @@ jobs: echo "This ensures all internal dependencies are available locally before testing" # Module build order (based on dependencies) - MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber") + MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "java-reporter-karate" "testomat-allure-adapter") for module in "${MODULES[@]}"; do if [ -d "$module" ]; then @@ -64,7 +64,7 @@ jobs: run: | echo "🧪 Running tests for all modules..." - MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber") + MODULES=("java-reporter-core" "java-reporter-junit" "java-reporter-testng" "java-reporter-cucumber" "java-reporter-karate" "testomat-allure-adapter") for module in "${MODULES[@]}"; do if [ -d "$module" ]; then diff --git a/README.md b/README.md index fd12acd..3748aef 100644 --- a/README.md +++ b/README.md @@ -386,6 +386,7 @@ Artifacts are stored in external S3 buckets. S3 Access can be configured in **tw |-------------------------------------|-----------------------------------------------------|-------------------------------------------| | `testomatio.artifact.disable` | Completely disable artifact uploading | `false` | | `testomatio.artifact.private` | Keep artifacts private (no public URLs) | `false` | +| `testomatio.artifact.sending.delay` | Wait time before uploading test artifacts | `10000 msec` | | `testomatio.step.artifacts.enabled` | Enables uploading artifacts for test steps | `false` | | `s3.force-path-style` | Use path-style URLs for S3-compatible storage | `false` | | `s3.endpoint` | Custom endpoint to be used with force-path-style | `false` | @@ -528,23 +529,64 @@ Steps provide granular visibility into test logic and help identify exactly wher ### Setup -Add AspectJ weaver to your test execution via maven-surefire-plugin: +Configure Compile-Time Weaving (CTW) with the AspectJ Maven Plugin: +maven ```xml - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.2 - - - -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/1.9.24/aspectjweaver-1.9.24.jar" - - - - - + + + org.aspectj + aspectjrt + ${aspectj.version} + + + +dev.aspectj +aspectj-maven-plugin +${aspectj.maven.version} + + + ${java.version} + ${java.version} + ${java.version} + + + + io.testomat + java-reporter-core + + + + + + + + compile + test-compile + + + + + + + org.aspectj + aspectjtools + ${aspectj.version} + + + +``` + +gradle + +```groovy +plugins { + id "io.freefair.aspectj" version "9.5.0" +} + +dependencies { + implementation "org.aspectj:aspectjrt:1.9.24" +} ``` ### Basic Usage diff --git a/java-reporter-core/pom.xml b/java-reporter-core/pom.xml index 5b71993..b21553b 100644 --- a/java-reporter-core/pom.xml +++ b/java-reporter-core/pom.xml @@ -7,7 +7,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 jar Testomat.io Reporter Core @@ -33,8 +33,8 @@ - 11 - 11 + 17 + 17 UTF-8 UTF-8 @@ -72,9 +72,9 @@ org.aspectj - aspectjweaver - ${aspectj.version} - compile + aspectjrt + 1.9.24 + true software.amazon.awssdk @@ -144,14 +144,32 @@ - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} + dev.aspectj + aspectj-maven-plugin + 1.14.1 + - ${maven.compiler.source} - ${maven.compiler.target} - ${project.build.sourceEncoding} + 17 + 17 + 17 + + + + + compile + test-compile + + + + + + + org.aspectj + aspectjtools + 1.9.24 + + @@ -163,10 +181,6 @@ **/*Test.java **/*Tests.java - - - -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar" - @@ -227,10 +241,6 @@ - - - META-INF/aop.xml - diff --git a/java-reporter-core/src/main/java/io/testomat/core/constants/CommonConstants.java b/java-reporter-core/src/main/java/io/testomat/core/constants/CommonConstants.java index 947565e..ea32a7a 100644 --- a/java-reporter-core/src/main/java/io/testomat/core/constants/CommonConstants.java +++ b/java-reporter-core/src/main/java/io/testomat/core/constants/CommonConstants.java @@ -1,7 +1,7 @@ package io.testomat.core.constants; public class CommonConstants { - public static final String REPORTER_VERSION = "0.16.1"; + public static final String REPORTER_VERSION = "0.17.0"; public static final String TESTS_STRING = "tests"; public static final String API_KEY_STRING = "api_key"; diff --git a/java-reporter-core/src/main/java/io/testomat/core/facade/methods/artifact/ArtifactAspect.java b/java-reporter-core/src/main/java/io/testomat/core/facade/methods/artifact/ArtifactAspect.java index 3c23f81..847d1b0 100644 --- a/java-reporter-core/src/main/java/io/testomat/core/facade/methods/artifact/ArtifactAspect.java +++ b/java-reporter-core/src/main/java/io/testomat/core/facade/methods/artifact/ArtifactAspect.java @@ -1,6 +1,7 @@ package io.testomat.core.facade.methods.artifact; -import io.testomat.core.facade.Testomatio; +import io.testomat.core.facade.ServiceRegistryUtil; +import io.testomat.core.facade.methods.artifact.manager.ArtifactManager; import io.testomat.core.step.StepLifecycle; import io.testomat.core.step.TestStep; import java.io.File; @@ -15,7 +16,7 @@ public class ArtifactAspect { private static final Logger log = LoggerFactory.getLogger(ArtifactAspect.class); @AfterReturning( - pointcut = "@annotation(io.testomat.core.annotation.Artifact)", + pointcut = "execution(* *(..)) && @annotation(io.testomat.core.annotation.Artifact)", returning = "result" ) public void afterArtifact(Object result) { @@ -28,10 +29,11 @@ public void afterArtifact(Object result) { if (testStep == null) { testStep = StepLifecycle.lastFinished(); } + ArtifactManager artifactManager = ServiceRegistryUtil.getService(ArtifactManager.class); if (testStep == null || testStep.getId() == null) { - Testomatio.artifact(fileName); + artifactManager.storeDirectories(fileName); } else { - Testomatio.stepArtifact(fileName); + artifactManager.storeStepDirectories(testStep.getId(), fileName); } } diff --git a/java-reporter-core/src/main/java/io/testomat/core/runmanager/GlobalRunManager.java b/java-reporter-core/src/main/java/io/testomat/core/runmanager/GlobalRunManager.java index 689f0b2..f58c262 100644 --- a/java-reporter-core/src/main/java/io/testomat/core/runmanager/GlobalRunManager.java +++ b/java-reporter-core/src/main/java/io/testomat/core/runmanager/GlobalRunManager.java @@ -360,12 +360,12 @@ private boolean isReportingDisabled() { /** * Returns the delay before sending artifacts in milliseconds. * - *

Reads the value from the {@code artifacts.sending.delay} system property. + *

Reads the value from the {@code testomatio.artifact.sending.delay} system property. * If the property is missing, non-numeric, or not positive, a default value is used.

*/ private static int getDelayBeforeArtifactsSendingMs() { int defaultDelayMs = 10000; - String value = System.getProperty("artifacts.sending.delay"); + String value = System.getProperty("testomatio.artifact.sending.delay"); if (value == null) { return defaultDelayMs; } @@ -373,7 +373,7 @@ private static int getDelayBeforeArtifactsSendingMs() { int delayMs = Integer.parseInt(value.trim()); return delayMs > 0 ? delayMs : defaultDelayMs; } catch (NumberFormatException nfe) { - log.warn("Invalid artifacts.sending.delay value: {}, using default {}", value, defaultDelayMs); + log.warn("Invalid testomatio.artifact.sending.delay value: {}, using default {}", value, defaultDelayMs); return defaultDelayMs; } } diff --git a/java-reporter-core/src/main/resources/META-INF/aop-ajc.xml b/java-reporter-core/src/main/resources/META-INF/aop-ajc.xml new file mode 100644 index 0000000..300f277 --- /dev/null +++ b/java-reporter-core/src/main/resources/META-INF/aop-ajc.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/java-reporter-core/src/main/resources/META-INF/aop.xml b/java-reporter-core/src/main/resources/META-INF/aop.xml index 1bf6b9c..ccebfb8 100644 --- a/java-reporter-core/src/main/resources/META-INF/aop.xml +++ b/java-reporter-core/src/main/resources/META-INF/aop.xml @@ -1,12 +1,6 @@ - - - - - - - - + + diff --git a/java-reporter-core/src/test/java/io/testomat/core/artifact/ArtifactAspectTest.java b/java-reporter-core/src/test/java/io/testomat/core/artifact/ArtifactAspectTest.java index dfab981..764d4a2 100644 --- a/java-reporter-core/src/test/java/io/testomat/core/artifact/ArtifactAspectTest.java +++ b/java-reporter-core/src/test/java/io/testomat/core/artifact/ArtifactAspectTest.java @@ -1,12 +1,18 @@ package io.testomat.core.artifact; -import io.testomat.core.facade.Testomatio; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.testomat.core.facade.methods.artifact.ArtifactAspect; +import io.testomat.core.facade.methods.artifact.TempArtifactDirectoriesStorage; +import io.testomat.core.facade.methods.artifact.manager.ArtifactManager; import io.testomat.core.step.StepLifecycle; import io.testomat.core.step.TestStep; import java.io.File; -import java.nio.file.Path; +import java.io.IOException; +import java.util.List; import java.util.UUID; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; @@ -14,125 +20,127 @@ class ArtifactAspectTest { + private static final String FILE_NAME = "test-artifact.txt"; private final ArtifactAspect aspect = new ArtifactAspect(); + private File tempFile; + + @BeforeEach + void setUp() throws IOException { + tempFile = File.createTempFile("test-artifact-", ".txt"); + tempFile.deleteOnExit(); + TempArtifactDirectoriesStorage.DIRECTORIES.get().clear(); + } + + @AfterEach + void tearDown() { + TempArtifactDirectoriesStorage.DIRECTORIES.remove(); + } @Test void shouldSendStringArtifact() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { lifecycle.when(StepLifecycle::current).thenReturn(null); lifecycle.when(StepLifecycle::lastFinished).thenReturn(null); - aspect.afterArtifact("file.txt"); + aspect.afterArtifact(tempFile.getAbsolutePath()); - testomatio.verify(() -> Testomatio.artifact("file.txt")); + List dirs = TempArtifactDirectoriesStorage.DIRECTORIES.get(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldSendPathArtifact() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { lifecycle.when(StepLifecycle::current).thenReturn(null); lifecycle.when(StepLifecycle::lastFinished).thenReturn(null); - Path path = Path.of("file.txt"); + aspect.afterArtifact(tempFile.toPath()); - aspect.afterArtifact(path); - - testomatio.verify(() -> Testomatio.artifact(path.toString())); + List dirs = TempArtifactDirectoriesStorage.DIRECTORIES.get(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldSendFileArtifact() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { lifecycle.when(StepLifecycle::current).thenReturn(null); lifecycle.when(StepLifecycle::lastFinished).thenReturn(null); - File file = new File("file.txt"); - - aspect.afterArtifact(file); + aspect.afterArtifact(tempFile); - testomatio.verify(() -> Testomatio.artifact(file.getAbsolutePath())); + List dirs = TempArtifactDirectoriesStorage.DIRECTORIES.get(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldSendStepArtifactWhenCurrentStepExists() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { TestStep step = mock(TestStep.class); - when(step.getId()).thenReturn(UUID.randomUUID()); - lifecycle.when(StepLifecycle::current).thenReturn(step); - aspect.afterArtifact("file.txt"); + aspect.afterArtifact(tempFile.getAbsolutePath()); - testomatio.verify(() -> Testomatio.stepArtifact("file.txt")); + List dirs = TempArtifactDirectoriesStorage.STEP_DATA + .get(Thread.currentThread().getId()) + .get(step.getId()) + .getDirectories(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldSendStepArtifactWhenLastFinishedStepExists() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { TestStep step = mock(TestStep.class); - when(step.getId()).thenReturn(UUID.randomUUID()); - lifecycle.when(StepLifecycle::current).thenReturn(null); lifecycle.when(StepLifecycle::lastFinished).thenReturn(step); - aspect.afterArtifact("file.txt"); + aspect.afterArtifact(tempFile.getAbsolutePath()); - testomatio.verify(() -> Testomatio.stepArtifact("file.txt")); + List dirs = TempArtifactDirectoriesStorage.STEP_DATA + .get(Thread.currentThread().getId()) + .get(step.getId()) + .getDirectories(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldSendArtifactWhenStepHasNullId() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + try (MockedStatic lifecycle = mockStatic(StepLifecycle.class)) { TestStep step = mock(TestStep.class); - when(step.getId()).thenReturn(null); - lifecycle.when(StepLifecycle::current).thenReturn(step); - aspect.afterArtifact("file.txt"); + aspect.afterArtifact(tempFile.getAbsolutePath()); - testomatio.verify(() -> Testomatio.artifact("file.txt")); + List dirs = TempArtifactDirectoriesStorage.DIRECTORIES.get(); + assertTrue(dirs.contains(tempFile.getAbsolutePath())); } } @Test void shouldIgnoreUnsupportedType() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + aspect.afterArtifact(new Object()); - aspect.afterArtifact(new Object()); - - testomatio.verifyNoInteractions(); - } + assertTrue(TempArtifactDirectoriesStorage.DIRECTORIES.get().isEmpty()); } @Test void shouldIgnoreNull() { - try (MockedStatic lifecycle = mockStatic(StepLifecycle.class); - MockedStatic testomatio = mockStatic(Testomatio.class)) { + aspect.afterArtifact(null); - aspect.afterArtifact(null); - - testomatio.verifyNoInteractions(); - } + assertTrue(TempArtifactDirectoriesStorage.DIRECTORIES.get().isEmpty()); } } \ No newline at end of file diff --git a/java-reporter-cucumber/pom.xml b/java-reporter-cucumber/pom.xml index d70a051..5f63e3c 100644 --- a/java-reporter-cucumber/pom.xml +++ b/java-reporter-cucumber/pom.xml @@ -6,7 +6,7 @@ io.testomat java-reporter-cucumber - 0.8.2 + 0.8.3 jar Testomat.io Java Reporter Cucumber @@ -51,7 +51,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 org.slf4j diff --git a/java-reporter-junit/pom.xml b/java-reporter-junit/pom.xml index 4b862c5..ee5366e 100644 --- a/java-reporter-junit/pom.xml +++ b/java-reporter-junit/pom.xml @@ -6,7 +6,7 @@ io.testomat java-reporter-junit - 0.9.2 + 0.9.3 jar Testomat.io Java Reporter JUnit @@ -51,7 +51,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 org.slf4j diff --git a/java-reporter-karate/pom.xml b/java-reporter-karate/pom.xml index c5ba696..df5383b 100644 --- a/java-reporter-karate/pom.xml +++ b/java-reporter-karate/pom.xml @@ -6,7 +6,7 @@ io.testomat java-reporter-karate - 0.3.2 + 0.3.3 jar Testomat.io Java Reporter Karate @@ -52,7 +52,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 io.karatelabs diff --git a/java-reporter-testng/pom.xml b/java-reporter-testng/pom.xml index a72a051..63245cc 100644 --- a/java-reporter-testng/pom.xml +++ b/java-reporter-testng/pom.xml @@ -6,7 +6,7 @@ io.testomat java-reporter-testng - 0.8.2 + 0.8.3 jar Testomat.io Java Reporter TestNG @@ -47,7 +47,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 org.slf4j diff --git a/testomat-allure-adapter/pom.xml b/testomat-allure-adapter/pom.xml index 9b020d5..8bd0c8a 100644 --- a/testomat-allure-adapter/pom.xml +++ b/testomat-allure-adapter/pom.xml @@ -6,7 +6,7 @@ io.testomat testomat-allure-adapter - 0.1.3 + 0.1.4 jar Testomat.io Testomat Allure adapter @@ -67,7 +67,7 @@ io.testomat java-reporter-core - 0.16.1 + 0.17.0 io.qameta.allure diff --git a/testomat-allure-adapter/src/main/resources/META-INF/aop.xml b/testomat-allure-adapter/src/main/resources/META-INF/aop.xml index 57783b4..c9f00a1 100644 --- a/testomat-allure-adapter/src/main/resources/META-INF/aop.xml +++ b/testomat-allure-adapter/src/main/resources/META-INF/aop.xml @@ -1,16 +1,7 @@ - - - - - - - - - - - - - - + + + + + \ No newline at end of file