Merge pull request #72 from testomatio/id-test-runner-testng

Implemented id run filtering for testng

Author: YevheniiVlasenko

java-reporter-testng/pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.testomat</groupId>
+    <groupId>test</groupId>
     <artifactId>java-reporter-testng</artifactId>
-    <version>0.6.8</version>
+    <version>test</version>
     <packaging>jar</packaging>
 
     <name>Testomat.io Java Reporter TestNG</name>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>io.testomat</groupId>
             <artifactId>java-reporter-core</artifactId>
-            <version>0.6.8</version>
+            <version>0.7.5</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -94,6 +94,17 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M9</version>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>testng.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>

java-reporter-testng/src/main/java/io/testomat/testng/filter/TestIdFilter.java

@@ -0,0 +1,53 @@
+package io.testomat.testng.filter;
+
+import io.testomat.core.annotation.TestId;
+import org.testng.ITestResult;
+import org.testng.SkipException;
+
+/**
+ * Filter for TestNG tests based on @TestId annotation.
+ * Provides filtering logic to include only tests with matching IDs.
+ */
+public class TestIdFilter {
+
+    /**
+     * Checks if test should be executed based on provided filter IDs.
+     * Throws SkipException if test should be skipped.
+     *
+     * @param result test result containing method information
+     * @throws SkipException if test should be filtered out
+     */
+    public void filterTest(ITestResult result) {
+        String providedIds = System.getProperty("ids");
+        if (providedIds == null || providedIds.trim().isEmpty()) {
+            return;
+        }
+
+        TestId testIdAnnotation = result.getMethod().getConstructorOrMethod()
+                .getMethod().getAnnotation(TestId.class);
+
+        if (testIdAnnotation == null) {
+            throw new SkipException("Test filtered: no @TestId annotation");
+        }
+
+        String testId = testIdAnnotation.value();
+        if (!isTestIdIncluded(testId, providedIds)) {
+            throw new SkipException("Test filtered by ID: " + testId);
+        }
+    }
+
+    private boolean isTestIdIncluded(String testId, String providedIds) {
+        if (testId == null || providedIds == null) {
+            return false;
+        }
+
+        String[] allowedIds = providedIds.split(",");
+        for (String allowedId : allowedIds) {
+            String trimmed = allowedId.trim();
+            if (!trimmed.isEmpty() && testId.equals(trimmed)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

java-reporter-testng/src/main/java/io/testomat/testng/listener/TestNgListener.java

@@ -7,12 +7,14 @@
 import io.testomat.core.propertyconfig.impl.PropertyProviderFactoryImpl;
 import io.testomat.core.propertyconfig.interf.PropertyProvider;
 import io.testomat.core.runmanager.GlobalRunManager;
+import io.testomat.testng.filter.TestIdFilter;
 import io.testomat.testng.methodexporter.TestNgMethodExportManager;
 import io.testomat.testng.reporter.TestNgTestResultReporter;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
 import org.testng.ISuite;
 import org.testng.ISuiteListener;
@@ -23,10 +25,10 @@
 /**
  * TestNG listener for Testomat.io integration.
  * Reports TestNG test execution results to Testomat.io platform.
- * Supports custom annotations (@Title, @TestId) and handles disabled tests.
  * Also exports test method bodies when required.
  */
-public class TestNgListener implements ISuiteListener, ITestListener, IInvokedMethodListener {
+public class TestNgListener implements ISuiteListener, ITestListener,
+        IInvokedMethodListener {
     private static final Logger log = LoggerFactory.getLogger(TestNgListener.class);
     private static final String LISTENING_REQUIRED_PROPERTY_NAME = "testomatio.listening";
 
@@ -36,6 +38,7 @@ public class TestNgListener implements ISuiteListener, ITestListener, IInvokedMe
     private final PropertyProvider provider;
 
     private final Set<String> processedClasses;
+    private final TestIdFilter testIdFilter;
 
     public TestNgListener() {
         this.methodExportManager = new TestNgMethodExportManager();
@@ -44,6 +47,7 @@ public TestNgListener() {
         this.reporter = new TestNgTestResultReporter();
         this.provider =
                 PropertyProviderFactoryImpl.getPropertyProviderFactory().getPropertyProvider();
+        this.testIdFilter = new TestIdFilter();
     }
 
     /**
@@ -58,6 +62,7 @@ public TestNgListener(TestNgMethodExportManager methodExportManager,
         this.methodExportManager = methodExportManager;
         this.provider = provider;
         this.processedClasses = ConcurrentHashMap.newKeySet();
+        this.testIdFilter = new TestIdFilter();
     }
 
     @Override
@@ -117,6 +122,15 @@ public void onTestFailure(ITestResult result) {
         exportTestClassIfNotProcessed(result.getTestClass().getRealClass());
     }
 
+    @Override
+    public void onTestStart(ITestResult result) {
+        if (!isListeningRequired()) {
+            return;
+        }
+
+        testIdFilter.filterTest(result);
+    }
+
     @Override
     public void onTestSkipped(ITestResult result) {
         if (!isListeningRequired()) {
@@ -140,6 +154,11 @@ private void exportTestClassIfNotProcessed(Class<?> testClass) {
         }
     }
 
+    @Override
+    public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
+
+    }
+
     private boolean isListeningRequired() {
         try {
             return provider.getProperty(LISTENING_REQUIRED_PROPERTY_NAME) != null;