Compare commits
4 commits
4e44484157
...
e2695625fd
Author | SHA1 | Date | |
---|---|---|---|
e2695625fd | |||
f2cf1b18bb | |||
fd950f223d | |||
c35b3cefcd |
18 changed files with 48 additions and 70 deletions
4
.idea/libraries/bld.xml
generated
4
.idea/libraries/bld.xml
generated
|
@ -2,12 +2,12 @@
|
|||
<library name="bld">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
<excluded>
|
||||
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
|
||||
|
|
4
.idea/libraries/compile.xml
generated
4
.idea/libraries/compile.xml
generated
|
@ -7,7 +7,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
4
.idea/libraries/runtime.xml
generated
4
.idea/libraries/runtime.xml
generated
|
@ -8,7 +8,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
4
.idea/libraries/test.xml
generated
4
.idea/libraries/test.xml
generated
|
@ -8,7 +8,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
@ -9,7 +9,7 @@
|
|||
],
|
||||
"java.configuration.updateBuildConfiguration": "automatic",
|
||||
"java.project.referencedLibraries": [
|
||||
"${HOME}/.bld/dist/bld-2.0.1.jar",
|
||||
"${HOME}/.bld/dist/bld-2.1.0.jar",
|
||||
"lib/**/*.jar"
|
||||
]
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
[](https://opensource.org/licenses/Apache-2.0)
|
||||
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
|
||||
[](https://rife2.com/bld)
|
||||
[](https://rife2.com/bld)
|
||||
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-testng)
|
||||
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-testng)
|
||||
[](https://github.com/rife2/bld-testng/actions/workflows/bld.yml)
|
||||
|
|
4
examples/.idea/libraries/bld.xml
generated
4
examples/.idea/libraries/bld.xml
generated
|
@ -2,12 +2,12 @@
|
|||
<library name="bld">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
<excluded>
|
||||
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
|
||||
|
|
4
examples/.idea/libraries/compile.xml
generated
4
examples/.idea/libraries/compile.xml
generated
|
@ -7,7 +7,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
4
examples/.idea/libraries/runtime.xml
generated
4
examples/.idea/libraries/runtime.xml
generated
|
@ -8,7 +8,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
4
examples/.idea/libraries/test.xml
generated
4
examples/.idea/libraries/test.xml
generated
|
@ -8,7 +8,7 @@
|
|||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
2
examples/.vscode/settings.json
vendored
2
examples/.vscode/settings.json
vendored
|
@ -10,7 +10,7 @@
|
|||
],
|
||||
"java.configuration.updateBuildConfiguration": "automatic",
|
||||
"java.project.referencedLibraries": [
|
||||
"${HOME}/.bld/dist/bld-2.0.1.jar",
|
||||
"${HOME}/.bld/dist/bld-2.1.0.jar",
|
||||
"lib/**/*.jar"
|
||||
]
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -1,8 +1,8 @@
|
|||
bld.downloadExtensionJavadoc=false
|
||||
bld.downloadExtensionSources=true
|
||||
bld.downloadLocation=
|
||||
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8-SNAPSHOT
|
||||
bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.0-SNAPSHOT
|
||||
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
|
||||
bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.0
|
||||
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
||||
bld.sourceDirectories=
|
||||
bld.version=2.0.1
|
||||
bld.version=2.1.0
|
||||
|
|
Binary file not shown.
|
@ -1,8 +1,8 @@
|
|||
bld.downloadExtensionJavadoc=false
|
||||
bld.downloadExtensionSources=true
|
||||
bld.downloadLocation=
|
||||
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.2
|
||||
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.4
|
||||
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.3
|
||||
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
|
||||
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
||||
bld.sourceDirectories=
|
||||
bld.version=2.0.1
|
||||
bld.version=2.1.0
|
||||
|
|
|
@ -33,7 +33,7 @@ public class TestNgOperationBuild extends Project {
|
|||
public TestNgOperationBuild() {
|
||||
pkg = "rife.bld.extension";
|
||||
name = "bld-testng";
|
||||
version = version(1, 0, 0, "SNAPSHOT");
|
||||
version = version(1, 0, 0);
|
||||
|
||||
javaRelease = 17;
|
||||
|
||||
|
@ -42,7 +42,7 @@ public class TestNgOperationBuild extends Project {
|
|||
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
|
||||
|
||||
scope(compile)
|
||||
.include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1)));
|
||||
.include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
|
||||
|
||||
scope(test)
|
||||
.include(dependency("org.testng", "testng", version(7, 10, 2)))
|
||||
|
|
|
@ -150,8 +150,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #excludeGroups(Collection) #excludeGroups(Collection)
|
||||
*/
|
||||
public TestNgOperation excludeGroups(String... group) {
|
||||
options_.put("-excludegroups", String.join(",", Arrays.stream(group).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return excludeGroups(List.of(group));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -309,8 +308,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #groups(Collection) #groups(Collection)
|
||||
*/
|
||||
public TestNgOperation groups(String... group) {
|
||||
options_.put("-groups", String.join(",", Arrays.stream(group).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return groups(List.of(group));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -383,8 +381,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #listener(Collection) #listener(Collection)
|
||||
*/
|
||||
public TestNgOperation listener(String... listener) {
|
||||
options_.put("-listener", String.join(",", Arrays.stream(listener).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return listener(List.of(listener));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -447,9 +444,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #methodSelectors(Collection) #methodSelectors(Collection)
|
||||
*/
|
||||
public TestNgOperation methodSelectors(String... selector) {
|
||||
options_.put("-methodselectors",
|
||||
String.join(",", Arrays.stream(selector).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return methodSelectors(List.of(selector));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -476,8 +471,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #methods(Collection) #methods(Collection)
|
||||
*/
|
||||
public TestNgOperation methods(String... method) {
|
||||
methods_.addAll(List.of(method));
|
||||
return this;
|
||||
return methods(List.of(method));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -517,31 +511,24 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
}
|
||||
|
||||
/**
|
||||
* Fully qualified class name that implements {@code org.testng.ITestObjectFactory} which can be used to create
|
||||
* The list of {@code .class} files or class names implementing {@code ITestRunnerFactory}.
|
||||
* <p>
|
||||
* A fully qualified class name that implements {@code org.testng.ITestObjectFactory} which can be used to create
|
||||
* test class and listener instances.
|
||||
*
|
||||
* @param objectFactory the object factory
|
||||
* @return this operation instance
|
||||
*/
|
||||
public TestNgOperation objectFactory(String objectFactory) {
|
||||
options_.put("-objectfactory", objectFactory);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* The list of {@code .class} files or class names implementing {@code ITestRunnerFactory}.
|
||||
*
|
||||
* @param factory one or more factories
|
||||
* @param factory one or more factory
|
||||
* @return this operation instance
|
||||
* @see #objectFactory(Collection) #objectFactory(Collection)
|
||||
*/
|
||||
public TestNgOperation objectFactory(String... factory) {
|
||||
options_.put("-objectfactory", String.join(",", Arrays.stream(factory).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return objectFactory(List.of(factory));
|
||||
}
|
||||
|
||||
/**
|
||||
* The list of {@code .class} files or class names implementing {@code ITestRunnerFactory}.
|
||||
* <p>
|
||||
* A fully qualified class name that implements {@code org.testng.ITestObjectFactory} which can be used to create
|
||||
* test class and listener instances.
|
||||
*
|
||||
* @param factory the list of factories
|
||||
* @return this operation instance
|
||||
|
@ -570,9 +557,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #overrideIncludedMethods(Collection) #overrideIncludedMethods(Collection)
|
||||
*/
|
||||
public TestNgOperation overrideIncludedMethods(String... method) {
|
||||
options_.put("-overrideincludedmethods",
|
||||
String.join(",", Arrays.stream(method).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return overrideIncludedMethods(List.of(method));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -600,8 +585,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #packages(Collection) #packages(Collection)
|
||||
*/
|
||||
public TestNgOperation packages(String... name) {
|
||||
packages_.addAll(Arrays.stream(name).filter(this::isNotBlank).toList());
|
||||
return this;
|
||||
return packages(List.of(name));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -783,9 +767,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #spiListenersToSkip(Collection) #spiListenersToSkip(Collection)
|
||||
*/
|
||||
public TestNgOperation spiListenersToSkip(String... listenerToSkip) {
|
||||
options_.put("-spilistenerstoskip",
|
||||
String.join(",", Arrays.stream(listenerToSkip).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return spiListenersToSkip(List.of(listenerToSkip));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -840,8 +822,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #suites(Collection) #suites(Collection)
|
||||
*/
|
||||
public TestNgOperation suites(String... suite) {
|
||||
suites_.addAll(Arrays.stream(suite).filter(this::isNotBlank).toList());
|
||||
return this;
|
||||
return suites(List.of(suite));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -888,8 +869,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #testClass(Collection) #testClass(Collection)
|
||||
*/
|
||||
public TestNgOperation testClass(String... aClass) {
|
||||
options_.put("-testclass", String.join(",", Arrays.stream(aClass).filter(this::isNotBlank).toList()));
|
||||
return this;
|
||||
return testClass(List.of(aClass));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -914,8 +894,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #testClasspath(String...) #testClasspath(String...)
|
||||
*/
|
||||
public TestNgOperation testClasspath(String... entry) {
|
||||
testClasspath_.addAll(Arrays.stream(entry).filter(this::isNotBlank).toList());
|
||||
return this;
|
||||
return testClasspath(List.of(entry));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -976,9 +955,7 @@ public class TestNgOperation extends TestOperation<TestNgOperation, List<String>
|
|||
* @see #testNames(Collection) #testNames(Collection)
|
||||
*/
|
||||
public TestNgOperation testNames(String... name) {
|
||||
options_.put("-testnames",
|
||||
Arrays.stream(name).filter(this::isNotBlank).map(s -> '"' + s + '"').collect(Collectors.joining(",")));
|
||||
return this;
|
||||
return testNames(List.of(name));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -24,6 +24,7 @@ package rife.bld.extension;
|
|||
*/
|
||||
@SuppressWarnings({"PMD.TestClassWithoutTestCases", "unused"})
|
||||
class TestNgExample {
|
||||
@SuppressWarnings("SameReturnValue")
|
||||
public String getMessage() {
|
||||
return "Hello World!";
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue