From 0eeba61872068a2a8e39a9bf75035784a1ea7348 Mon Sep 17 00:00:00 2001 From: Jan Molak <1089173+jan-molak@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:04:38 +0000 Subject: [PATCH] Corrected a typo in class name --- .../reports/asciidoc/AsciidocReporter.kt | 4 ++-- .../WhenLoadingRequirementsOutcomes.kt | 4 ++-- .../requirements/AggregateRequirements.java | 7 +++---- .../requirements/FileSystemRequirements.java | 4 ++-- ...FileSystemRequirementsOutcomeFactory.java} | 20 +++++++++---------- ...eSystemRequirementsOutcomeFactoryTest.java | 4 ++++ 6 files changed, 23 insertions(+), 20 deletions(-) rename serenity-model/src/main/java/net/thucydides/model/requirements/reports/{FileSystemRequirmentsOutcomeFactory.java => FileSystemRequirementsOutcomeFactory.java} (77%) create mode 100644 serenity-model/src/test/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactoryTest.java diff --git a/serenity-asciidoc/src/main/kotlin/net/serenitybdd/reports/asciidoc/AsciidocReporter.kt b/serenity-asciidoc/src/main/kotlin/net/serenitybdd/reports/asciidoc/AsciidocReporter.kt index b3b285262..aab5839a1 100644 --- a/serenity-asciidoc/src/main/kotlin/net/serenitybdd/reports/asciidoc/AsciidocReporter.kt +++ b/serenity-asciidoc/src/main/kotlin/net/serenitybdd/reports/asciidoc/AsciidocReporter.kt @@ -6,7 +6,7 @@ import net.serenitybdd.reports.asciidoc.templates.FreemarkerTemplateEngine import net.thucydides.model.reports.OutcomeFormat import net.thucydides.model.reports.TestOutcomeLoader import net.thucydides.model.reports.TestOutcomes -import net.thucydides.model.requirements.reports.FileSystemRequirmentsOutcomeFactory +import net.thucydides.model.requirements.reports.FileSystemRequirementsOutcomeFactory import net.thucydides.model.requirements.reports.RequirementsOutcomes import net.thucydides.model.util.EnvironmentVariables import java.io.File @@ -82,6 +82,6 @@ class AsciidocReporter(val environmentVariables: EnvironmentVariables) { class RequirementsOutcomesProvider(val testOutcomes: TestOutcomes) { fun using(environmentVariables: EnvironmentVariables): RequirementsOutcomes = - FileSystemRequirmentsOutcomeFactory(environmentVariables).buildRequirementsOutcomesFrom(testOutcomes) + FileSystemRequirementsOutcomeFactory(environmentVariables).buildRequirementsOutcomesFrom(testOutcomes) } } diff --git a/serenity-asciidoc/src/test/kotlin/net/serenitybdd/reports/asciidoc/WhenLoadingRequirementsOutcomes.kt b/serenity-asciidoc/src/test/kotlin/net/serenitybdd/reports/asciidoc/WhenLoadingRequirementsOutcomes.kt index 547c954f5..c1843ebc3 100644 --- a/serenity-asciidoc/src/test/kotlin/net/serenitybdd/reports/asciidoc/WhenLoadingRequirementsOutcomes.kt +++ b/serenity-asciidoc/src/test/kotlin/net/serenitybdd/reports/asciidoc/WhenLoadingRequirementsOutcomes.kt @@ -3,7 +3,7 @@ package net.serenitybdd.reports.asciidoc import net.thucydides.model.reports.OutcomeFormat import net.thucydides.model.reports.TestOutcomeLoader import net.thucydides.model.requirements.FileSystemRequirementsTagProvider -import net.thucydides.model.requirements.reports.FileSystemRequirmentsOutcomeFactory +import net.thucydides.model.requirements.reports.FileSystemRequirementsOutcomeFactory import net.thucydides.model.util.EnvironmentVariables import net.thucydides.model.util.MockEnvironmentVariables import org.assertj.core.api.Assertions.assertThat @@ -39,7 +39,7 @@ class WhenLoadingRequirementsOutcomes { .inFormat(OutcomeFormat.JSON) .from(File("src/test/resources/test_outcomes/with_a_single_test")) - val outcomesFactory = FileSystemRequirmentsOutcomeFactory(environmentVariables) + val outcomesFactory = FileSystemRequirementsOutcomeFactory(environmentVariables) val requirementsOutcomes = outcomesFactory.buildRequirementsOutcomesFrom(testOutcomes) assertThat(requirementsOutcomes.requirementCount).isEqualTo(3) } diff --git a/serenity-model/src/main/java/net/thucydides/model/requirements/AggregateRequirements.java b/serenity-model/src/main/java/net/thucydides/model/requirements/AggregateRequirements.java index 07dbbf728..2c69be7f5 100644 --- a/serenity-model/src/main/java/net/thucydides/model/requirements/AggregateRequirements.java +++ b/serenity-model/src/main/java/net/thucydides/model/requirements/AggregateRequirements.java @@ -4,11 +4,10 @@ import net.serenitybdd.model.environment.ConfiguredEnvironment; import net.thucydides.model.domain.ReportType; import net.thucydides.model.reports.html.ReportNameProvider; -import net.thucydides.model.requirements.reports.FileSystemRequirmentsOutcomeFactory; +import net.thucydides.model.requirements.reports.FileSystemRequirementsOutcomeFactory; import net.thucydides.model.requirements.reports.RequirementsOutcomeFactory; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.List; import static net.thucydides.model.reports.html.ReportNameProvider.NO_CONTEXT; @@ -26,10 +25,10 @@ public AggregateRequirements(Path jsonOutcomes, String featureFilesDirectory) { ModelInfrastructure.getEnvironmentVariables(), new FileSystemRequirementsTagProvider(featureFilesDirectory), new TestOutcomeRequirementsTagProvider().fromSourceDirectory(jsonOutcomes)); - this.requirmentsOutcomeFactory = new FileSystemRequirmentsOutcomeFactory( + this.requirmentsOutcomeFactory = new FileSystemRequirementsOutcomeFactory( ConfiguredEnvironment.getEnvironmentVariables(), ModelInfrastructure.getIssueTracking(), - new ReportNameProvider(NO_CONTEXT, ReportType.HTML, getRequirementsService()), + new ReportNameProvider(NO_CONTEXT, ReportType.HTML, requirementsService), featureFilesDirectory); } diff --git a/serenity-model/src/main/java/net/thucydides/model/requirements/FileSystemRequirements.java b/serenity-model/src/main/java/net/thucydides/model/requirements/FileSystemRequirements.java index 58f3800e6..23f23923c 100644 --- a/serenity-model/src/main/java/net/thucydides/model/requirements/FileSystemRequirements.java +++ b/serenity-model/src/main/java/net/thucydides/model/requirements/FileSystemRequirements.java @@ -4,7 +4,7 @@ import net.serenitybdd.model.environment.ConfiguredEnvironment; import net.thucydides.model.domain.ReportType; import net.thucydides.model.reports.html.ReportNameProvider; -import net.thucydides.model.requirements.reports.FileSystemRequirmentsOutcomeFactory; +import net.thucydides.model.requirements.reports.FileSystemRequirementsOutcomeFactory; import net.thucydides.model.requirements.reports.RequirementsOutcomeFactory; import java.util.List; @@ -21,7 +21,7 @@ public class FileSystemRequirements implements Requirements { public FileSystemRequirements(String path) { this.requirementsService = new FileSystemRequirementsService(path); - this.requirmentsOutcomeFactory = new FileSystemRequirmentsOutcomeFactory( + this.requirmentsOutcomeFactory = new FileSystemRequirementsOutcomeFactory( ConfiguredEnvironment.getEnvironmentVariables(), ModelInfrastructure.getIssueTracking(), new ReportNameProvider(NO_CONTEXT, ReportType.HTML, getRequirementsService()), diff --git a/serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirmentsOutcomeFactory.java b/serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactory.java similarity index 77% rename from serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirmentsOutcomeFactory.java rename to serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactory.java index 03dd9592c..3162d61e2 100644 --- a/serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirmentsOutcomeFactory.java +++ b/serenity-model/src/main/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactory.java @@ -14,34 +14,34 @@ import java.util.List; -public class FileSystemRequirmentsOutcomeFactory implements RequirementsOutcomeFactory { +public class FileSystemRequirementsOutcomeFactory implements RequirementsOutcomeFactory { private final IssueTracking issueTracking; private final EnvironmentVariables environmentVariables; private final FileSystemRequirementsTagProvider tagProvider; private final ReportNameProvider reportNameProvider; - private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemRequirmentsOutcomeFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemRequirementsOutcomeFactory.class); - public FileSystemRequirmentsOutcomeFactory(EnvironmentVariables environmentVariables) { + public FileSystemRequirementsOutcomeFactory(EnvironmentVariables environmentVariables) { this(environmentVariables, new SystemPropertiesIssueTracking(), new ReportNameProvider()); } - public FileSystemRequirmentsOutcomeFactory(EnvironmentVariables environmentVariables, - IssueTracking issueTracking, - ReportNameProvider reportNameProvider) { + public FileSystemRequirementsOutcomeFactory(EnvironmentVariables environmentVariables, + IssueTracking issueTracking, + ReportNameProvider reportNameProvider) { this.issueTracking = issueTracking; this.environmentVariables = environmentVariables; this.tagProvider = new FileSystemRequirementsTagProvider(environmentVariables); this.reportNameProvider = reportNameProvider; } - public FileSystemRequirmentsOutcomeFactory(EnvironmentVariables environmentVariables, - IssueTracking issueTracking, - ReportNameProvider reportNameProvider, - String rootDirectoryPath) { + public FileSystemRequirementsOutcomeFactory(EnvironmentVariables environmentVariables, + IssueTracking issueTracking, + ReportNameProvider reportNameProvider, + String rootDirectoryPath) { this.issueTracking = issueTracking; this.environmentVariables = environmentVariables; this.tagProvider = new FileSystemRequirementsTagProvider(environmentVariables, rootDirectoryPath); diff --git a/serenity-model/src/test/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactoryTest.java b/serenity-model/src/test/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactoryTest.java new file mode 100644 index 000000000..b7ef7a496 --- /dev/null +++ b/serenity-model/src/test/java/net/thucydides/model/requirements/reports/FileSystemRequirementsOutcomeFactoryTest.java @@ -0,0 +1,4 @@ +import static org.junit.jupiter.api.Assertions.*; +class FileSystemRequirmentsOutcomeFactoryTest { + +}