Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote6_12</artifactId>
</dependency>
<dependency>
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote7_8</artifactId>
</dependency>
</dependencies>

<build>
Expand All @@ -64,6 +68,7 @@
<include>org.testng.testng-remote:testng-remote6_9_10</include>
<include>org.testng.testng-remote:testng-remote6_10</include>
<include>org.testng.testng-remote:testng-remote6_12</include>
<include>org.testng.testng-remote:testng-remote7_8</include>
</includes>
</artifactSet>
<transformers>
Expand Down
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<modules>
<module>remote</module>
<module>remote7_8</module>
<module>remote6_12</module>
<module>remote6_10</module>
<module>remote6_9_10</module>
Expand All @@ -29,8 +30,8 @@
<gson.version>2.9.0</gson.version>
<auto-service.version>1.0.1</auto-service.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<bintray.repo>testng</bintray.repo>
<bintray.package>testng-remote</bintray.package>
</properties>
Expand Down Expand Up @@ -102,6 +103,11 @@
<artifactId>testng-remote6_12</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote7_8</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion remote6_12/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>

<artifactId>testng-remote6_12</artifactId>
<name>TestNG Remote for version [6.12, -)</name>
<name>TestNG Remote for version [6.12, 7.8)</name>

<properties>
<testng.version>6.13.1</testng.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@AutoService(RemoteTestNGFactory.class)
public class RemoteTestNGFactory6_12 extends AbstractRemoteTestNGFactory {

private static final VersionRange RANGE = new VersionRange("6.12");
private static final VersionRange RANGE = new VersionRange("[6.12,7.8)");

@Override
public IRemoteTestNG createRemoteTestNG() {
Expand Down
53 changes: 53 additions & 0 deletions remote7_8/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<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 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote-parent</artifactId>
<version>1.4.1-SNAPSHOT</version>
</parent>

<artifactId>testng-remote7_8</artifactId>
<name>TestNG Remote for version [7.8.0, -)</name>

<properties>
<testng.version>7.8.0</testng.version>
</properties>

<dependencies>
<dependency>
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.testng.testng-remote</groupId>
<artifactId>testng-remote</artifactId>
<type>test-jar</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<test.resources.dir>${basedir}/../remote/target/test-classes</test.resources.dir>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package org.testng.remote.support;

import org.testng.IClassListener;
import org.testng.IInvokedMethodListener;
import org.testng.ISuite;
import org.testng.ITestRunnerFactory;
import org.testng.SuiteRunner;
import org.testng.TestRunner;
import org.testng.remote.AbstractRemoteTestNG;
import org.testng.remote.strprotocol.MessageHub;
import org.testng.remote.strprotocol.RemoteTestListener;
import org.testng.reporters.JUnitXMLReporter;
import org.testng.reporters.TestHTMLReporter;
import org.testng.xml.XmlTest;

import java.util.Collection;
import java.util.List;

public class RemoteTestNG7_8 extends AbstractRemoteTestNG {

@Override
protected void initialize() {
initializeEverything();
}

@Override
protected ITestRunnerFactory buildTestRunnerFactory() {
if(null == m_customTestRunnerFactory) {
m_customTestRunnerFactory= new ITestRunnerFactory() {
@Override
public TestRunner newTestRunner(ISuite suite, XmlTest xmlTest,
Collection<IInvokedMethodListener> listeners, List<IClassListener> classListeners) {
TestRunner runner =
new TestRunner(getConfiguration(), suite, xmlTest,
false /*skipFailedInvocationCounts */,
listeners, classListeners, (SuiteRunner) suite);
if (m_useDefaultListeners) {
runner.addListener(new TestHTMLReporter());
runner.addListener(new JUnitXMLReporter());
}

return runner;
}
};
}

return m_customTestRunnerFactory;
}

@Override
protected ITestRunnerFactory createDelegatingTestRunnerFactory(ITestRunnerFactory trf, MessageHub smsh) {
return new DelegatingTestRunnerFactory(trf, smsh);
}

private static class DelegatingTestRunnerFactory implements ITestRunnerFactory {
private final ITestRunnerFactory m_delegateFactory;
private final MessageHub m_messageSender;

DelegatingTestRunnerFactory(ITestRunnerFactory trf, MessageHub smsh) {
m_delegateFactory= trf;
m_messageSender= smsh;
}

@Override
public TestRunner newTestRunner(ISuite suite, XmlTest test,
Collection<IInvokedMethodListener> listeners, List<IClassListener> classListeners) {
TestRunner tr = m_delegateFactory.newTestRunner(suite, test, listeners, classListeners);
tr.addListener(new RemoteTestListener(suite, test, m_messageSender));
return tr;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package org.testng.remote.support;

import org.testng.remote.AbstractRemoteTestNGFactory;
import org.testng.remote.IRemoteTestNG;
import org.testng.shaded.osgi.framework.VersionRange;

import com.google.auto.service.AutoService;

@AutoService(RemoteTestNGFactory.class)
public class RemoteTestNGFactory7_8 extends AbstractRemoteTestNGFactory {

private static final VersionRange RANGE = new VersionRange("7.8");

@Override
public IRemoteTestNG createRemoteTestNG() {
return new RemoteTestNG7_8();
}

@Override
protected VersionRange getAcceptableVersions() {
return RANGE;
}

@Override
public int getOrder() {
return 7;
}
}
12 changes: 12 additions & 0 deletions remote7_8/src/test/java/test/remote/Remote7_8_Test.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package test.remote;

import org.testng.internal.Version;

public class Remote7_8_Test extends RemoteTest {

@Override
protected String getTestNGVersion() {
return Version.VERSION;
}

}