Skip to content

Rft test commons #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 1 commit into from
Jan 31, 2024
Merged

Rft test commons #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 26 additions & 37 deletions allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@
*/
package io.qameta.allure.cucumber4jvm;

import cucumber.runtime.ClassFinder;
import cucumber.runtime.FeaturePathFeatureSupplier;
import cucumber.runtime.Runtime;
import cucumber.runtime.io.MultiLoader;
import cucumber.runtime.io.ResourceLoader;
import cucumber.runtime.io.ResourceLoaderClassFinder;
import cucumber.runtime.model.FeatureLoader;
import io.cucumber.core.model.FeatureWithLines;
import io.cucumber.core.options.CommandlineOptionsParser;
import io.cucumber.core.options.RuntimeOptions;
import io.github.glytching.junit.extension.system.SystemProperty;
import io.github.glytching.junit.extension.system.SystemPropertyExtension;
import io.qameta.allure.AllureLifecycle;
import io.qameta.allure.Step;
import io.qameta.allure.model.Attachment;
import io.qameta.allure.model.FixtureResult;
Expand All @@ -41,8 +38,7 @@
import io.qameta.allure.model.TestResult;
import io.qameta.allure.test.AllureFeatures;
import io.qameta.allure.test.AllureResults;
import io.qameta.allure.test.AllureResultsWriterStub;
import io.qameta.allure.test.AllureTestCommonsUtils;
import io.qameta.allure.test.RunUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.parallel.ResourceLock;
Expand Down Expand Up @@ -719,38 +715,31 @@ void shouldSupportProvidedLabels() {
@Step
private AllureResults runFeature(final String featureResource,
final String... moreOptions) {

final AllureResultsWriterStub writer = new AllureResultsWriterStub();

final AllureLifecycle lifecycle = new AllureLifecycle(writer);
final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
final ClassLoader classLoader = currentThread().getContextClassLoader();
final ResourceLoader resourceLoader = new MultiLoader(classLoader);
final ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber4jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser()
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber4Jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();

AllureTestCommonsUtils.attach(writer);

return writer;
return RunUtils.runTests(lifecycle -> {
final AllureCucumber4Jvm cucumber4Jvm = new AllureCucumber4Jvm(lifecycle);
final ClassLoader classLoader = currentThread().getContextClassLoader();
final ResourceLoader resourceLoader = new MultiLoader(classLoader);
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber4jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser()
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(new FeatureLoader(resourceLoader), options);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber4Jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();
});
}


Expand Down
62 changes: 27 additions & 35 deletions allure-cucumber5-jvm/src/test/java/io/qameta/allure/cucumber5jvm/AllureCucumber5JvmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import io.cucumber.core.runtime.TimeServiceEventBus;
import io.github.glytching.junit.extension.system.SystemProperty;
import io.github.glytching.junit.extension.system.SystemPropertyExtension;
import io.qameta.allure.AllureLifecycle;
import io.qameta.allure.Step;
import io.qameta.allure.model.Attachment;
import io.qameta.allure.model.FixtureResult;
Expand All @@ -40,8 +39,7 @@
import io.qameta.allure.model.TestResult;
import io.qameta.allure.test.AllureFeatures;
import io.qameta.allure.test.AllureResults;
import io.qameta.allure.test.AllureResultsWriterStub;
import io.qameta.allure.test.AllureTestCommonsUtils;
import io.qameta.allure.test.RunUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.parallel.ResourceLock;
Expand Down Expand Up @@ -720,38 +718,32 @@ void shouldSupportProvidedLabels() {
@Step
private AllureResults runFeature(final String featureResource,
final String... moreOptions) {

final AllureResultsWriterStub writer = new AllureResultsWriterStub();

final AllureLifecycle lifecycle = new AllureLifecycle(writer);
final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber5jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser()
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber5jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();

AllureTestCommonsUtils.attach(writer);

return writer;
return RunUtils.runTests(lifecycle -> {
final AllureCucumber5Jvm cucumber5jvm = new AllureCucumber5Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber5jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser()
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber5jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();
});
}


Expand Down
62 changes: 27 additions & 35 deletions allure-cucumber6-jvm/src/test/java/io/qameta/allure/cucumber6jvm/AllureCucumber6JvmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import io.cucumber.core.runtime.TimeServiceEventBus;
import io.github.glytching.junit.extension.system.SystemProperty;
import io.github.glytching.junit.extension.system.SystemPropertyExtension;
import io.qameta.allure.AllureLifecycle;
import io.qameta.allure.Step;
import io.qameta.allure.model.Attachment;
import io.qameta.allure.model.FixtureResult;
Expand All @@ -40,8 +39,7 @@
import io.qameta.allure.model.TestResult;
import io.qameta.allure.test.AllureFeatures;
import io.qameta.allure.test.AllureResults;
import io.qameta.allure.test.AllureResultsWriterStub;
import io.qameta.allure.test.AllureTestCommonsUtils;
import io.qameta.allure.test.RunUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.parallel.ResourceLock;
Expand Down Expand Up @@ -720,37 +718,31 @@ void shouldSupportProvidedLabels() {
@Step
private AllureResults runFeature(final String featureResource,
final String... moreOptions) {

final AllureResultsWriterStub writer = new AllureResultsWriterStub();

final AllureLifecycle lifecycle = new AllureLifecycle(writer);
final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber6jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser(System.out)
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber6jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();

AllureTestCommonsUtils.attach(writer);

return writer;
return RunUtils.runTests(lifecycle -> {
final AllureCucumber6Jvm cucumber6jvm = new AllureCucumber6Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber6jvm.samples",
"--plugin", "null_summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser(System.out)
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber6jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();
});
}
}
62 changes: 27 additions & 35 deletions allure-cucumber7-jvm/src/test/java/io/qameta/allure/cucumber7jvm/AllureCucumber7JvmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import io.cucumber.core.runtime.TimeServiceEventBus;
import io.github.glytching.junit.extension.system.SystemProperty;
import io.github.glytching.junit.extension.system.SystemPropertyExtension;
import io.qameta.allure.AllureLifecycle;
import io.qameta.allure.Step;
import io.qameta.allure.model.Attachment;
import io.qameta.allure.model.FixtureResult;
Expand All @@ -40,8 +39,7 @@
import io.qameta.allure.model.TestResult;
import io.qameta.allure.test.AllureFeatures;
import io.qameta.allure.test.AllureResults;
import io.qameta.allure.test.AllureResultsWriterStub;
import io.qameta.allure.test.AllureTestCommonsUtils;
import io.qameta.allure.test.RunUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.parallel.ResourceLock;
Expand Down Expand Up @@ -721,38 +719,32 @@ void shouldSupportProvidedLabels() {
private AllureResults runFeature(final String featureResource,
final String... moreOptions) {

final AllureResultsWriterStub writer = new AllureResultsWriterStub();

final AllureLifecycle lifecycle = new AllureLifecycle(writer);
final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber7jvm.samples",
"--no-summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser(System.out)
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber7jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();

AllureTestCommonsUtils.attach(writer);

return writer;
return RunUtils.runTests(lifecycle -> {
final AllureCucumber7Jvm cucumber7jvm = new AllureCucumber7Jvm(lifecycle);
final Supplier<ClassLoader> classLoader = ClassLoaders::getDefaultClassLoader;
final List<String> opts = new ArrayList<>(Arrays.asList(
"--glue", "io.qameta.allure.cucumber7jvm.samples",
"--no-summary"
));
opts.addAll(Arrays.asList(moreOptions));
final FeatureWithLines featureWithLines = FeatureWithLines.parse("src/test/resources/" + featureResource);
final RuntimeOptions options = new CommandlineOptionsParser(System.out)
.parse(opts.toArray(new String[]{})).addFeature(featureWithLines).build();

final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
final FeatureParser parser = new FeatureParser(bus::generateId);
final FeaturePathFeatureSupplier supplier
= new FeaturePathFeatureSupplier(classLoader, options, parser);

final Runtime runtime = Runtime.builder()
.withClassLoader(classLoader)
.withRuntimeOptions(options)
.withAdditionalPlugins(cucumber7jvm)
.withFeatureSupplier(supplier)
.build();

runtime.run();
});
}


}
Loading