From ea3d54eb6a8aacd21b838a120ae1bb84260013fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:02:55 +0000 Subject: [PATCH 1/8] build(deps): bump net.datafaker:datafaker from 2.5.2 to 2.5.3 Bumps [net.datafaker:datafaker](https://github.com/datafaker-net/datafaker) from 2.5.2 to 2.5.3. - [Release notes](https://github.com/datafaker-net/datafaker/releases) - [Changelog](https://github.com/datafaker-net/datafaker/blob/main/RELEASE_PROCESS.md) - [Commits](https://github.com/datafaker-net/datafaker/compare/2.5.2...2.5.3) --- updated-dependencies: - dependency-name: net.datafaker:datafaker dependency-version: 2.5.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 498f7d85..5358d0f3 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ net.datafaker datafaker - 2.5.2 + 2.5.3 From d94611d5e5ddb6abf46c332e2f0e158f559588d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:32:08 +0000 Subject: [PATCH 2/8] build(deps): bump selenium.version from 4.37.0 to 4.38.0 Bumps `selenium.version` from 4.37.0 to 4.38.0. Updates `org.seleniumhq.selenium:selenium-java` from 4.37.0 to 4.38.0 - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.37.0...selenium-4.38.0) Updates `org.seleniumhq.selenium:selenium-grid` from 4.37.0 to 4.38.0 - [Release notes](https://github.com/SeleniumHQ/selenium/releases) - [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.37.0...selenium-4.38.0) --- updated-dependencies: - dependency-name: org.seleniumhq.selenium:selenium-java dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.seleniumhq.selenium:selenium-grid dependency-version: 4.38.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 498f7d85..2653f4cf 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 8.12.6 4.38.0 2.0.17 - 4.37.0 + 4.38.0 From 43e9c0ecb091a9eb51a24f9e33f0f6aa55e965c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:34:38 +0000 Subject: [PATCH 3/8] build(deps): bump com.puppycrawl.tools:checkstyle from 12.1.0 to 12.1.1 Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 12.1.0 to 12.1.1. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-12.1.0...checkstyle-12.1.1) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-version: 12.1.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 498f7d85..78afe815 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,7 @@ com.puppycrawl.tools checkstyle - 12.1.0 + 12.1.1 com.github.sevntu-checkstyle From 681190e6714f944610a43afe44603b04271926e9 Mon Sep 17 00:00:00 2001 From: Giulio Longfils Date: Mon, 27 Oct 2025 20:57:35 +0100 Subject: [PATCH 4/8] chore: introducing spotless plugin, formatting imports by blocks --- .../spectrum/it_appium/pages/AndroidPage.java | 2 + .../spectrum/it_appium/tests/AndroidIT.java | 5 +- .../spectrum/it_bidi/pages/CheckboxPage.java | 10 ++-- .../spectrum/it_bidi/pages/LandingPage.java | 2 + .../it_bidi/tests/BiDiCheckboxIT.java | 9 ++-- .../it_bidi/tests/BrowsingContextIT.java | 13 ++--- .../tests/BrowsingContextInspectorIT.java | 14 ++--- .../spectrum/it_bidi/tests/JsExceptionIT.java | 16 +++--- .../spectrum/it_bidi/tests/NetworkIT.java | 7 +-- .../spectrum/it_grid/pages/DownloadPage.java | 6 ++- .../spectrum/it_grid/pages/UploadPage.java | 2 + .../spectrum/it_grid/tests/FilesIT.java | 29 ++++++----- .../spectrum/it_grid/tests/ProxyIT.java | 5 +- .../spectrum/it_macos/pages/CheckboxPage.java | 10 ++-- .../spectrum/it_macos/pages/LandingPage.java | 2 + .../it_macos/tests/SafariCheckboxIT.java | 7 +-- .../it_testbook/TestBookSessionListener.java | 18 ++++--- .../spectrum/it_testbook/data/Data.java | 4 +- .../it_testbook/pages/CheckboxPage.java | 6 ++- .../it_testbook/pages/DownloadPage.java | 6 ++- .../it_testbook/pages/LandingPage.java | 2 + .../spectrum/it_testbook/pages/LoginPage.java | 4 +- .../it_testbook/pages/UploadPage.java | 2 + .../it_testbook/tests/CheckboxIT.java | 5 +- .../spectrum/it_testbook/tests/DemoIT.java | 1 + .../spectrum/it_testbook/tests/FilesIT.java | 9 ++-- .../it_testbook/tests/LoginFormIT.java | 19 +++---- .../github/giulong/spectrum/it/data/Data.java | 4 +- .../spectrum/it/pages/CheckboxPage.java | 10 ++-- .../spectrum/it/pages/DownloadPage.java | 6 ++- .../it/pages/DynamicControlsPage.java | 2 + .../spectrum/it/pages/DynamicLoadingPage.java | 2 + .../giulong/spectrum/it/pages/InputsPage.java | 2 + .../spectrum/it/pages/JsCheckboxPage.java | 10 ++-- .../spectrum/it/pages/JsLandingPage.java | 2 + .../spectrum/it/pages/JsLoginPage.java | 8 +-- .../spectrum/it/pages/JsShadowDomPage.java | 2 + .../spectrum/it/pages/LandingPage.java | 2 + .../giulong/spectrum/it/pages/LoginPage.java | 6 ++- .../spectrum/it/pages/ShadowDomPage.java | 2 + .../spectrum/it/pages/TestBookPage.java | 2 + .../giulong/spectrum/it/pages/UploadPage.java | 2 + .../giulong/spectrum/it/tests/CheckboxIT.java | 7 +-- .../giulong/spectrum/it/tests/DemoIT.java | 1 + .../giulong/spectrum/it/tests/DynamicIT.java | 5 +- .../giulong/spectrum/it/tests/FakerIT.java | 18 ++++--- .../giulong/spectrum/it/tests/FilesIT.java | 7 +-- .../spectrum/it/tests/JavascriptIT.java | 9 ++-- .../spectrum/it/tests/JsWebElementIT.java | 13 ++--- .../spectrum/it/tests/LoginFormIT.java | 22 ++++---- .../spectrum/it/tests/NavigationIT.java | 5 +- .../spectrum/it/tests/TestFactoryIT.java | 11 ++-- pom.xml | 14 +++++ .../giulong/spectrum/SpectrumEntity.java | 36 +++++++------ .../github/giulong/spectrum/SpectrumPage.java | 12 +++-- .../spectrum/SpectrumSessionListener.java | 10 ++-- .../github/giulong/spectrum/SpectrumTest.java | 18 ++++--- .../giulong/spectrum/drivers/Android.java | 5 +- .../giulong/spectrum/drivers/Appium.java | 10 ++-- .../spectrum/drivers/AppiumGeneric.java | 5 +- .../giulong/spectrum/drivers/Chrome.java | 1 + .../giulong/spectrum/drivers/Chromium.java | 7 +-- .../giulong/spectrum/drivers/Driver.java | 6 ++- .../github/giulong/spectrum/drivers/Edge.java | 1 + .../giulong/spectrum/drivers/Firefox.java | 1 + .../github/giulong/spectrum/drivers/Mac2.java | 4 +- .../giulong/spectrum/drivers/Safari.java | 1 + .../giulong/spectrum/drivers/Windows.java | 5 +- .../giulong/spectrum/drivers/XCUITest.java | 4 +- .../github/giulong/spectrum/enums/Frame.java | 1 + .../giulong/spectrum/enums/LocatorType.java | 8 +-- .../github/giulong/spectrum/enums/Result.java | 5 +- .../interceptors/SpectrumInterceptor.java | 25 +++++---- .../extensions/resolvers/ActionsResolver.java | 7 +-- .../resolvers/ConfigurationResolver.java | 6 ++- .../extensions/resolvers/DataResolver.java | 12 +++-- .../resolvers/DownloadWaitResolver.java | 12 +++-- .../extensions/resolvers/DriverResolver.java | 20 ++++---- .../resolvers/EventsDispatcherResolver.java | 6 ++- .../resolvers/ExtentReportsResolver.java | 7 ++- .../extensions/resolvers/FakerResolver.java | 9 ++-- .../resolvers/ImplicitWaitResolver.java | 10 ++-- .../extensions/resolvers/JsResolver.java | 8 +-- .../JsWebElementProxyBuilderResolver.java | 18 ++++--- .../resolvers/PageLoadWaitResolver.java | 10 ++-- .../resolvers/ScriptWaitResolver.java | 12 +++-- .../resolvers/StatefulExtentTestResolver.java | 15 +++--- .../resolvers/TestContextResolver.java | 2 + .../resolvers/TestDataResolver.java | 14 ++--- .../bidi/BiDiTypeBasedParameterResolver.java | 8 +-- .../BrowsingContextInspectorResolver.java | 1 + .../bidi/BrowsingContextResolver.java | 1 + .../resolvers/bidi/LogInspectorResolver.java | 1 + .../resolvers/bidi/NetworkResolver.java | 1 + .../extensions/watchers/EventsWatcher.java | 13 ++--- .../spectrum/interfaces/BiDiDriver.java | 1 + .../giulong/spectrum/interfaces/Endpoint.java | 6 +-- .../spectrum/interfaces/JsWebElement.java | 6 +-- .../spectrum/interfaces/JsonSchemaTypes.java | 6 +-- .../giulong/spectrum/interfaces/Secured.java | 6 +-- .../giulong/spectrum/interfaces/Shared.java | 6 +-- .../spectrum/interfaces/WebElementFinder.java | 4 +- .../interfaces/reports/CanReportSummary.java | 7 +-- .../interfaces/reports/CanReportTestBook.java | 7 +-- .../giulong/spectrum/internals/AppiumLog.java | 5 +- .../spectrum/internals/ColoredConverter.java | 6 +-- .../giulong/spectrum/internals/DriverLog.java | 5 +- .../deserializers/ClassDeserializer.java | 9 ++-- .../deserializers/DriverDeserializer.java | 10 ++-- .../deserializers/DurationDeserializer.java | 11 ++-- .../deserializers/DynamicDeserializer.java | 6 ++- .../EnvironmentDeserializer.java | 10 ++-- .../InterpolatedBooleanDeserializer.java | 9 ++-- .../InterpolatedDeserializer.java | 8 +-- .../InterpolatedObjectDeserializer.java | 20 ++++---- .../InterpolatedStringDeserializer.java | 10 ++-- .../LogbackLogLevelDeserializer.java | 10 ++-- .../deserializers/RandomDeserializer.java | 11 ++-- .../UtilLogLevelDeserializer.java | 11 ++-- .../JsonSchemaGeneratorModule.java | 25 +++++---- .../JsonSchemaInternalGeneratorModule.java | 22 ++++---- .../page_factory/SpectrumFieldDecorator.java | 9 ++-- .../SpectrumLocatingElementHandler.java | 5 +- .../AutoWaitWebDriverListener.java | 9 ++-- .../EventsWebDriverListener.java | 24 +++++---- .../SpectrumWebDriverListener.java | 11 ++-- .../spectrum/pojos/events/Attachment.java | 1 + .../giulong/spectrum/pojos/events/Event.java | 9 ++-- .../spectrum/pojos/events/TestStep.java | 4 +- .../spectrum/pojos/testbook/QualityGate.java | 1 + .../pojos/testbook/TestBookStatistics.java | 10 ++-- .../spectrum/pojos/testbook/TestBookTest.java | 6 ++- .../giulong/spectrum/types/DownloadWait.java | 4 +- .../giulong/spectrum/types/ImplicitWait.java | 4 +- .../giulong/spectrum/types/PageLoadWait.java | 4 +- .../giulong/spectrum/types/ScriptWait.java | 4 +- .../giulong/spectrum/types/TestData.java | 9 ++-- .../giulong/spectrum/utils/Configuration.java | 19 ++++--- .../spectrum/utils/ContextManager.java | 9 ++-- .../spectrum/utils/ExtentReporter.java | 33 ++++++------ .../giulong/spectrum/utils/FileUtils.java | 10 ++-- .../spectrum/utils/FixedSizeQueue.java | 4 +- .../spectrum/utils/FreeMarkerWrapper.java | 20 ++++---- .../giulong/spectrum/utils/HtmlUtils.java | 15 +++--- .../giulong/spectrum/utils/JsonUtils.java | 9 ++-- .../spectrum/utils/MetadataManager.java | 15 +++--- .../giulong/spectrum/utils/Reflections.java | 8 +-- .../giulong/spectrum/utils/Retention.java | 26 +++++----- .../spectrum/utils/StatefulExtentTest.java | 1 + .../giulong/spectrum/utils/StringUtils.java | 4 +- .../giulong/spectrum/utils/Summary.java | 25 +++++---- .../github/giulong/spectrum/utils/Vars.java | 4 +- .../giulong/spectrum/utils/YamlUtils.java | 15 +++--- .../utils/environments/AppiumEnvironment.java | 13 +++-- .../utils/environments/Environment.java | 1 + .../utils/environments/GridEnvironment.java | 7 ++- .../utils/environments/LocalEnvironment.java | 3 ++ .../spectrum/utils/events/DriverConsumer.java | 19 ++++--- .../spectrum/utils/events/EventsConsumer.java | 16 +++--- .../utils/events/EventsDispatcher.java | 14 ++--- .../utils/events/ExtentTestConsumer.java | 2 + .../spectrum/utils/events/LogConsumer.java | 11 ++-- .../spectrum/utils/events/MailConsumer.java | 12 +++-- .../spectrum/utils/events/SlackConsumer.java | 6 ++- .../utils/events/TestBookConsumer.java | 5 +- .../utils/events/video/VideoBaseConsumer.java | 8 +-- .../utils/events/video/VideoConsumer.java | 34 +++++++------ .../events/video/VideoDynamicConsumer.java | 12 +++-- .../events/video/VideoDynamicFinalizer.java | 5 +- .../video/VideoDynamicInitConsumer.java | 5 +- .../utils/events/video/VideoFinalizer.java | 20 +++++--- .../utils/events/video/VideoInitConsumer.java | 14 ++--- .../file_providers/ClientFileProvider.java | 12 +++-- .../utils/file_providers/FileProvider.java | 1 + .../file_providers/InternalFileProvider.java | 2 + .../github/giulong/spectrum/utils/js/Js.java | 10 ++-- .../js/JsWebElementInvocationHandler.java | 16 +++--- .../js/JsWebElementListInvocationHandler.java | 9 ++-- .../utils/js/JsWebElementProxyBuilder.java | 7 +-- .../utils/reporters/FileReporter.java | 18 ++++--- .../spectrum/utils/reporters/LogReporter.java | 2 + .../spectrum/utils/reporters/Reporter.java | 3 ++ .../spectrum/utils/testbook/TestBook.java | 20 ++++---- .../parsers/SimpleTestBookParser.java | 9 ++-- .../testbook/parsers/TestBookParser.java | 12 +++-- .../testbook/parsers/YamlTestBookParser.java | 5 +- .../tests_comparators/NameComparator.java | 1 + .../tests_comparators/NoOpComparator.java | 1 + .../tests_comparators/StatusComparator.java | 11 ++-- .../tests_comparators/TestsComparator.java | 10 ++-- .../giulong/spectrum/utils/video/Video.java | 6 ++- .../HighlightElementConsumer.java | 5 +- .../web_driver_events/HtmlReportConsumer.java | 11 ++-- .../web_driver_events/ScreenshotConsumer.java | 14 ++--- .../TestStepBuilderConsumer.java | 11 ++-- .../web_driver_events/TestStepsConsumer.java | 19 ++++--- .../web_driver_events/WebDriverEvent.java | 6 ++- .../WebDriverEventConsumer.java | 4 +- .../giulong/spectrum/SpectrumEntityTest.java | 51 ++++++++++--------- .../giulong/spectrum/SpectrumPageTest.java | 23 +++++---- .../spectrum/SpectrumSessionListenerTest.java | 19 +++---- .../giulong/spectrum/SpectrumTestTest.java | 18 ++++--- .../io/github/giulong/spectrum/TestYaml.java | 2 + .../giulong/spectrum/drivers/AndroidTest.java | 13 ++--- .../spectrum/drivers/AppiumGenericTest.java | 15 +++--- .../giulong/spectrum/drivers/AppiumTest.java | 19 +++---- .../giulong/spectrum/drivers/ChromeTest.java | 19 +++---- .../spectrum/drivers/ChromiumTest.java | 11 ++-- .../giulong/spectrum/drivers/DriverTest.java | 19 +++---- .../giulong/spectrum/drivers/EdgeTest.java | 19 +++---- .../spectrum/drivers/EspressoTest.java | 15 +++--- .../giulong/spectrum/drivers/FirefoxTest.java | 15 +++--- .../giulong/spectrum/drivers/Mac2Test.java | 15 +++--- .../giulong/spectrum/drivers/SafariTest.java | 9 ++-- .../spectrum/drivers/UiAutomator2Test.java | 15 +++--- .../giulong/spectrum/drivers/WindowsTest.java | 15 +++--- .../spectrum/drivers/XCUITestTest.java | 17 ++++--- .../interceptors/SpectrumInterceptorTest.java | 34 +++++++------ .../resolvers/ActionsResolverTest.java | 10 ++-- .../resolvers/ConfigurationResolverTest.java | 19 +++---- .../resolvers/DataResolverTest.java | 31 +++++------ .../resolvers/DownloadWaitResolverTest.java | 17 ++++--- .../resolvers/DriverResolverTest.java | 27 +++++----- .../EventsDispatcherResolverTest.java | 15 +++--- .../resolvers/ExtentReportsResolverTest.java | 16 +++--- .../resolvers/FakerResolverTest.java | 22 ++++---- .../resolvers/ImplicitWaitResolverTest.java | 19 +++---- .../extensions/resolvers/JsResolverTest.java | 13 ++--- .../JsWebElementProxyBuilderResolverTest.java | 23 +++++---- .../resolvers/PageLoadWaitResolverTest.java | 17 ++++--- .../resolvers/ScriptWaitResolverTest.java | 17 ++++--- .../StatefulExtentTestResolverTest.java | 24 +++++---- .../resolvers/TestContextResolverTest.java | 9 ++-- .../resolvers/TestDataResolverTest.java | 21 ++++---- .../BiDiTypeBasedParameterResolverTest.java | 22 ++++---- .../BrowsingContextInspectorResolverTest.java | 6 +-- .../bidi/BrowsingContextResolverTest.java | 8 +-- .../bidi/LogInspectorResolverTest.java | 6 +-- .../resolvers/bidi/NetworkResolverTest.java | 6 +-- .../watchers/EventsWatcherTest.java | 21 ++++---- .../spectrum/interfaces/BiDiDriverTest.java | 11 ++-- .../spectrum/internals/AppiumLogTest.java | 11 ++-- .../internals/ColoredConverterTest.java | 17 ++++--- .../spectrum/internals/DriverLogTest.java | 11 ++-- .../deserializers/ClassDeserializerTest.java | 11 ++-- .../deserializers/DriverDeserializerTest.java | 18 ++++--- .../DurationDeserializerTest.java | 15 +++--- .../DynamicDeserializerTest.java | 14 ++--- .../EnvironmentDeserializerTest.java | 18 ++++--- .../InterpolatedBooleanDeserializerTest.java | 18 ++++--- .../InterpolatedObjectDeserializerTest.java | 30 ++++++----- .../InterpolatedStringDeserializerTest.java | 22 ++++---- .../LogbackLogLevelDeserializerTest.java | 20 ++++---- .../deserializers/RandomDeserializerTest.java | 17 ++++--- .../UtilLogLevelDeserializerTest.java | 15 +++--- .../SpectrumFieldDecoratorTest.java | 13 ++--- .../SpectrumLocatingElementHandlerTest.java | 17 ++++--- .../AutoWaitWebDriverListenerTest.java | 12 ++--- .../EventsWebDriverListenerTest.java | 24 +++++---- .../SpectrumWebDriverListenerTest.java | 17 ++++--- .../spectrum/utils/ConfigurationTest.java | 4 +- .../spectrum/utils/ContextManagerTest.java | 16 +++--- .../spectrum/utils/ExtentReporterTest.java | 45 ++++++++-------- .../giulong/spectrum/utils/FileUtilsTest.java | 30 +++++------ .../spectrum/utils/FixedSizeQueueTest.java | 16 +++--- .../spectrum/utils/FreeMarkerWrapperTest.java | 27 +++++----- .../giulong/spectrum/utils/HtmlUtilsTest.java | 27 +++++----- .../giulong/spectrum/utils/JsonUtilsTest.java | 19 +++---- .../spectrum/utils/MetadataManagerTest.java | 21 ++++---- .../spectrum/utils/ReflectionsTest.java | 18 ++++--- .../giulong/spectrum/utils/RetentionTest.java | 31 +++++------ .../utils/StatefulExtentTestTest.java | 7 +-- .../spectrum/utils/StringUtilsTest.java | 4 +- .../giulong/spectrum/utils/SummaryTest.java | 27 +++++----- .../spectrum/utils/TestContextTest.java | 14 ++--- .../giulong/spectrum/utils/VarsTest.java | 4 +- .../giulong/spectrum/utils/YamlUtilsTest.java | 22 ++++---- .../environments/AppiumEnvironmentTest.java | 17 ++++--- .../environments/GridEnvironmentTest.java | 19 +++---- .../environments/LocalEnvironmentTest.java | 11 ++-- .../utils/events/DriverConsumerTest.java | 23 +++++---- .../utils/events/EventsConsumerTest.java | 23 +++++---- .../utils/events/EventsDispatcherTest.java | 19 +++---- .../utils/events/ExtentTestConsumerTest.java | 7 +-- .../utils/events/LogConsumerTest.java | 9 ++-- .../utils/events/MailConsumerTest.java | 14 ++--- .../utils/events/SlackConsumerTest.java | 16 +++--- .../utils/events/TestBookConsumerTest.java | 11 ++-- .../events/video/VideoBaseConsumerTest.java | 21 ++++---- .../utils/events/video/VideoConsumerTest.java | 42 +++++++-------- .../video/VideoDynamicConsumerTest.java | 23 +++++---- .../video/VideoDynamicFinalizerTest.java | 11 ++-- .../video/VideoDynamicInitConsumerTest.java | 11 ++-- .../events/video/VideoFinalizerTest.java | 28 +++++----- .../events/video/VideoInitConsumerTest.java | 15 +++--- .../ClientFileProviderTest.java | 24 +++++---- .../file_providers/FileProviderTest.java | 9 ++-- .../InternalFileProviderTest.java | 10 ++-- .../giulong/spectrum/utils/js/JsTest.java | 13 ++--- .../js/JsWebElementInvocationHandlerTest.java | 25 ++++----- ...JsWebElementListInvocationHandlerTest.java | 18 +++---- .../js/JsWebElementProxyBuilderTest.java | 20 ++++---- .../utils/reporters/FileReporterTest.java | 17 ++++--- .../utils/reporters/ReporterTest.java | 12 +++-- .../utils/testbook/TestBookUnitTest.java | 21 ++++---- .../parsers/CsvTestBookParserTest.java | 9 ++-- .../parsers/SimpleTestBookParserTest.java | 9 ++-- .../parsers/TxtTestBookParserTest.java | 9 ++-- .../parsers/YamlTestBookParserTest.java | 11 ++-- .../tests_comparators/NameComparatorTest.java | 12 ++--- .../tests_comparators/NoOpComparatorTest.java | 4 +- .../StatusComparatorTest.java | 17 ++++--- .../spectrum/utils/video/VideoTest.java | 19 +++---- .../HighlightElementConsumerTest.java | 11 ++-- .../HtmlReportConsumerTest.java | 14 ++--- .../web_driver_events/LogConsumerTest.java | 6 +-- .../ScreenshotConsumerTest.java | 21 ++++---- .../TestStepBuilderConsumerTest.java | 21 ++++---- .../TestStepsConsumerTest.java | 27 +++++----- .../web_driver_events/WebDriverEventTest.java | 9 ++-- .../unit/ItAppiumVerifierTest.java | 5 +- .../spectrum/verify_browsers/data/Data.java | 4 +- .../pages/BiDiExtentReportPage.java | 6 ++- .../pages/ExtentReportPage.java | 6 ++- .../verify_browsers/pages/SummaryPage.java | 2 + .../verify_browsers/pages/TestBookPage.java | 2 + .../tests/BiDiExtentReportVerifierIT.java | 13 ++--- .../tests/ExtentReportVerifierIT.java | 19 +++---- .../tests/SummaryVerifierIT.java | 15 +++--- .../tests/TestBookVerifierIT.java | 21 ++++---- .../unit/ItBiDiVerifierTest.java | 5 +- .../unit/ItGridVerifierTest.java | 5 +- .../unit/ItTestStepsVerifierTest.java | 12 +++-- .../verify_browsers/unit/ItVerifierTest.java | 9 ++-- .../FailsafeReportsVerifier.java | 13 ++--- .../verify_macos/ItMacosVerifierTest.java | 7 +-- 336 files changed, 2225 insertions(+), 1749 deletions(-) diff --git a/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/pages/AndroidPage.java b/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/pages/AndroidPage.java index 5f249ed4..a784e425 100644 --- a/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/pages/AndroidPage.java +++ b/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/pages/AndroidPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it_appium.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/tests/AndroidIT.java b/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/tests/AndroidIT.java index e22c297a..15d1fbd8 100644 --- a/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/tests/AndroidIT.java +++ b/it-appium/src/test/java/io/github/giulong/spectrum/it_appium/tests/AndroidIT.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.it_appium.tests; +import static org.junit.jupiter.api.Assertions.assertEquals; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_appium.data.Data; import io.github.giulong.spectrum.it_appium.pages.AndroidPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.RepeatedTest; -import static org.junit.jupiter.api.Assertions.assertEquals; - @SuppressWarnings("unused") class AndroidIT extends SpectrumTest { diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/CheckboxPage.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/CheckboxPage.java index e38907dc..24ccb7ef 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/CheckboxPage.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/CheckboxPage.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.it_bidi.pages; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - @Getter @Endpoint("checkboxes") public class CheckboxPage extends SpectrumPage { diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/LandingPage.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/LandingPage.java index 9559da79..4dee2486 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/LandingPage.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/pages/LandingPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it_bidi.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BiDiCheckboxIT.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BiDiCheckboxIT.java index a80f2fba..9cef8b5f 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BiDiCheckboxIT.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BiDiCheckboxIT.java @@ -1,18 +1,19 @@ package io.github.giulong.spectrum.it_bidi.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.bidi.browsingcontext.ReadinessState.COMPLETE; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_bidi.pages.CheckboxPage; import io.github.giulong.spectrum.it_bidi.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; import org.openqa.selenium.bidi.browsingcontext.BrowsingContext; import org.openqa.selenium.bidi.browsingcontext.NavigationResult; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.openqa.selenium.bidi.browsingcontext.ReadinessState.COMPLETE; - @SuppressWarnings("unused") @DisplayName("Checkbox Page") public class BiDiCheckboxIT extends SpectrumTest { diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextIT.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextIT.java index a3f10dda..1e324830 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextIT.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextIT.java @@ -1,15 +1,16 @@ package io.github.giulong.spectrum.it_bidi.tests; -import io.github.giulong.spectrum.SpectrumTest; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.bidi.browsingcontext.BrowsingContextInfo; - -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.openqa.selenium.bidi.browsingcontext.ReadinessState.COMPLETE; +import java.util.List; + +import io.github.giulong.spectrum.SpectrumTest; + +import org.junit.jupiter.api.Test; +import org.openqa.selenium.bidi.browsingcontext.BrowsingContextInfo; + public class BrowsingContextIT extends SpectrumTest { @Test diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextInspectorIT.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextInspectorIT.java index 6e1210f5..47bd6dd0 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextInspectorIT.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/BrowsingContextInspectorIT.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.it_bidi.tests; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.bidi.browsingcontext.ReadinessState.COMPLETE; + +import java.util.concurrent.CompletableFuture; + import io.github.giulong.spectrum.SpectrumTest; + import lombok.SneakyThrows; + import org.junit.jupiter.api.Test; import org.openqa.selenium.bidi.browsingcontext.NavigationInfo; -import java.util.concurrent.CompletableFuture; - -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.openqa.selenium.bidi.browsingcontext.ReadinessState.COMPLETE; - public class BrowsingContextInspectorIT extends SpectrumTest { @Test diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/JsExceptionIT.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/JsExceptionIT.java index 8a2aadad..58c8d77e 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/JsExceptionIT.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/JsExceptionIT.java @@ -1,20 +1,22 @@ package io.github.giulong.spectrum.it_bidi.tests; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.openqa.selenium.bidi.log.LogLevel.ERROR; + +import java.util.concurrent.CompletableFuture; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_bidi.pages.JavascriptErrorPage; + import lombok.SneakyThrows; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.bidi.log.JavascriptLogEntry; -import java.util.concurrent.CompletableFuture; - -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.openqa.selenium.bidi.log.LogLevel.ERROR; - @SuppressWarnings("unused") @DisplayName("Js Exception") public class JsExceptionIT extends SpectrumTest { diff --git a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/NetworkIT.java b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/NetworkIT.java index 7c7d1233..5cf68cc2 100644 --- a/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/NetworkIT.java +++ b/it-bidi/src/test/java/io/github/giulong/spectrum/it_bidi/tests/NetworkIT.java @@ -1,12 +1,13 @@ package io.github.giulong.spectrum.it_bidi.tests; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.openqa.selenium.bidi.network.InterceptPhase.BEFORE_REQUEST_SENT; + import io.github.giulong.spectrum.SpectrumTest; + import org.junit.jupiter.api.Test; import org.openqa.selenium.bidi.network.AddInterceptParameters; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.openqa.selenium.bidi.network.InterceptPhase.BEFORE_REQUEST_SENT; - public class NetworkIT extends SpectrumTest { @Test diff --git a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/DownloadPage.java b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/DownloadPage.java index a61b278e..561e0670 100644 --- a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/DownloadPage.java +++ b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/DownloadPage.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.it_grid.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @Endpoint("download") @SuppressWarnings("unused") diff --git a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/UploadPage.java b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/UploadPage.java index 45067fd7..736f8a1e 100644 --- a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/UploadPage.java +++ b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/pages/UploadPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/FilesIT.java b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/FilesIT.java index 791292c6..0df6cc60 100644 --- a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/FilesIT.java +++ b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/FilesIT.java @@ -1,14 +1,9 @@ package io.github.giulong.spectrum.it_grid.tests; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.github.giulong.spectrum.SpectrumTest; -import io.github.giulong.spectrum.it_grid.pages.DownloadPage; -import io.github.giulong.spectrum.it_grid.pages.UploadPage; -import lombok.Getter; -import lombok.SneakyThrows; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.TimeoutException; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; import java.io.IOException; import java.io.OutputStream; @@ -19,10 +14,18 @@ import java.util.Map; import java.util.Scanner; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.github.giulong.spectrum.SpectrumTest; +import io.github.giulong.spectrum.it_grid.pages.DownloadPage; +import io.github.giulong.spectrum.it_grid.pages.UploadPage; + +import lombok.Getter; +import lombok.SneakyThrows; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.TimeoutException; @DisplayName("Files Test") @SuppressWarnings("unused") diff --git a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/ProxyIT.java b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/ProxyIT.java index 3896db40..f8a1e062 100644 --- a/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/ProxyIT.java +++ b/it-grid/src/test/java/io/github/giulong/spectrum/it_grid/tests/ProxyIT.java @@ -1,12 +1,13 @@ package io.github.giulong.spectrum.it_grid.tests; +import static org.junit.jupiter.api.Assertions.assertThrows; + import io.github.giulong.spectrum.SpectrumTest; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriverException; -import static org.junit.jupiter.api.Assertions.assertThrows; - @DisplayName("Proxy Test") class ProxyIT extends SpectrumTest { diff --git a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/CheckboxPage.java b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/CheckboxPage.java index 7ae5e3e0..3e629951 100644 --- a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/CheckboxPage.java +++ b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/CheckboxPage.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.it_macos.pages; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - @Getter @Endpoint("checkboxes") @SuppressWarnings("unused") diff --git a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/LandingPage.java b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/LandingPage.java index ffb03643..bc186337 100644 --- a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/LandingPage.java +++ b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/pages/LandingPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it_macos.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/tests/SafariCheckboxIT.java b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/tests/SafariCheckboxIT.java index 64985279..3c0a22d5 100644 --- a/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/tests/SafariCheckboxIT.java +++ b/it-macos/src/test/java/io/github/giulong/spectrum/it_macos/tests/SafariCheckboxIT.java @@ -1,17 +1,18 @@ package io.github.giulong.spectrum.it_macos.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.condition.OS.MAC; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_macos.pages.CheckboxPage; import io.github.giulong.spectrum.it_macos.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.condition.EnabledOnOs; import org.openqa.selenium.WebElement; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.condition.OS.MAC; - @SuppressWarnings("unused") @DisplayName("Checkbox Page") @EnabledOnOs(MAC) diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/TestBookSessionListener.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/TestBookSessionListener.java index 76266d5e..6ece60b4 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/TestBookSessionListener.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/TestBookSessionListener.java @@ -1,10 +1,8 @@ package io.github.giulong.spectrum.it_testbook; -import io.github.giulong.spectrum.utils.*; -import io.github.giulong.spectrum.utils.reporters.FileReporter; -import lombok.SneakyThrows; -import org.junit.platform.launcher.LauncherSession; -import org.junit.platform.launcher.LauncherSessionListener; +import static java.util.Comparator.comparingLong; +import static java.util.function.Predicate.not; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.nio.file.Files; @@ -13,9 +11,13 @@ import java.util.List; import java.util.Map; -import static java.util.Comparator.comparingLong; -import static java.util.function.Predicate.not; -import static org.junit.jupiter.api.Assertions.*; +import io.github.giulong.spectrum.utils.*; +import io.github.giulong.spectrum.utils.reporters.FileReporter; + +import lombok.SneakyThrows; + +import org.junit.platform.launcher.LauncherSession; +import org.junit.platform.launcher.LauncherSessionListener; @SuppressWarnings("unused") public class TestBookSessionListener implements LauncherSessionListener { diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/data/Data.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/data/Data.java index e0109ce8..e3ee2c59 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/data/Data.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/data/Data.java @@ -1,9 +1,9 @@ package io.github.giulong.spectrum.it_testbook.data; -import lombok.Getter; - import java.util.Map; +import lombok.Getter; + @Getter @SuppressWarnings("unused") public class Data { diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/CheckboxPage.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/CheckboxPage.java index a83d0eda..77a8b4a7 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/CheckboxPage.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/CheckboxPage.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.it_testbook.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @Endpoint("checkboxes") @SuppressWarnings("unused") diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/DownloadPage.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/DownloadPage.java index 6cc08001..736de215 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/DownloadPage.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/DownloadPage.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.it_testbook.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @Endpoint("download") @SuppressWarnings("unused") diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LandingPage.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LandingPage.java index 2dbe7279..9f030d49 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LandingPage.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LandingPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it_testbook.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LoginPage.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LoginPage.java index bb3a9bd8..ef1b6ee1 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LoginPage.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/LoginPage.java @@ -2,9 +2,11 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; -import io.github.giulong.spectrum.it_testbook.data.Data; import io.github.giulong.spectrum.interfaces.Secured; +import io.github.giulong.spectrum.it_testbook.data.Data; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/UploadPage.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/UploadPage.java index 88940295..b36771e2 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/UploadPage.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/pages/UploadPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/CheckboxIT.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/CheckboxIT.java index 5cb158eb..448523de 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/CheckboxIT.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/CheckboxIT.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.it_testbook.tests; +import static org.junit.jupiter.api.Assertions.*; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_testbook.pages.CheckboxPage; import io.github.giulong.spectrum.it_testbook.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; -import static org.junit.jupiter.api.Assertions.*; - @SuppressWarnings("unused") @DisplayName("Checkbox Page") class CheckboxIT extends SpectrumTest { diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/DemoIT.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/DemoIT.java index 2dfd0bc0..b3da5e91 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/DemoIT.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/DemoIT.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.it_testbook.tests; import io.github.giulong.spectrum.SpectrumTest; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/FilesIT.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/FilesIT.java index 3462ec24..a2cb6e45 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/FilesIT.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/FilesIT.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.it_testbook.tests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_testbook.pages.DownloadPage; import io.github.giulong.spectrum.it_testbook.pages.UploadPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.TimeoutException; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; - @DisplayName("Files Test") @SuppressWarnings("unused") class FilesIT extends SpectrumTest { diff --git a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/LoginFormIT.java b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/LoginFormIT.java index be2abebd..e352852b 100644 --- a/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/LoginFormIT.java +++ b/it-testbook/src/test/java/io/github/giulong/spectrum/it_testbook/tests/LoginFormIT.java @@ -1,22 +1,23 @@ package io.github.giulong.spectrum.it_testbook.tests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.openqa.selenium.By.id; +import static org.openqa.selenium.support.ui.ExpectedConditions.urlContains; + +import java.util.Objects; +import java.util.stream.Stream; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it_testbook.data.Data; import io.github.giulong.spectrum.it_testbook.pages.LoginPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import java.util.Objects; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.openqa.selenium.By.id; -import static org.openqa.selenium.support.ui.ExpectedConditions.urlContains; - @DisplayName("Login Form") @SuppressWarnings("unused") class LoginFormIT extends SpectrumTest { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/data/Data.java b/it/src/test/java/io/github/giulong/spectrum/it/data/Data.java index 51070124..f1871e72 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/data/Data.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/data/Data.java @@ -1,9 +1,9 @@ package io.github.giulong.spectrum.it.data; -import lombok.Getter; - import java.util.Map; +import lombok.Getter; + @Getter @SuppressWarnings("unused") public class Data { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/CheckboxPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/CheckboxPage.java index 82864c2b..4a8b30ce 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/CheckboxPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/CheckboxPage.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.it.pages; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - @Getter @Endpoint("checkboxes") public class CheckboxPage extends SpectrumPage { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/DownloadPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/DownloadPage.java index 5b5bdbbc..a94b4767 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/DownloadPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/DownloadPage.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.it.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @Endpoint("download") @SuppressWarnings("unused") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicControlsPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicControlsPage.java index dc544cb5..165572d0 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicControlsPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicControlsPage.java @@ -3,7 +3,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.it.data.Data; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicLoadingPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicLoadingPage.java index 4816e0ff..87e40725 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicLoadingPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/DynamicLoadingPage.java @@ -3,7 +3,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.it.data.Data; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/InputsPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/InputsPage.java index 0cf3c454..8b72ec07 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/InputsPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/InputsPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsCheckboxPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsCheckboxPage.java index 457a564b..d4b55f66 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsCheckboxPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsCheckboxPage.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum.it.pages; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.JsWebElement; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - @Getter @Endpoint("checkboxes") @SuppressWarnings("unused") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLandingPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLandingPage.java index eaefecaa..471024e8 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLandingPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLandingPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.JsWebElement; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLoginPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLoginPage.java index 0862939e..2d32a235 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLoginPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsLoginPage.java @@ -1,18 +1,20 @@ package io.github.giulong.spectrum.it.pages; +import static org.openqa.selenium.By.id; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.JsWebElement; -import io.github.giulong.spectrum.it.data.Data; import io.github.giulong.spectrum.interfaces.Secured; +import io.github.giulong.spectrum.it.data.Data; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedCondition; -import static org.openqa.selenium.By.id; - @Getter @Slf4j @Endpoint("login") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsShadowDomPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsShadowDomPage.java index a42f3510..58dabe70 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/JsShadowDomPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/JsShadowDomPage.java @@ -3,7 +3,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.JsWebElement; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/LandingPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/LandingPage.java index 51799a76..1c0ae294 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/LandingPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/LandingPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/LoginPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/LoginPage.java index 2cc3d92e..085b96ec 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/LoginPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/LoginPage.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum.it.pages; +import static org.openqa.selenium.By.id; + import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.Secured; import io.github.giulong.spectrum.it.data.Data; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedCondition; -import static org.openqa.selenium.By.id; - @Getter @Slf4j @Endpoint("login") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/ShadowDomPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/ShadowDomPage.java index 4360fac9..35f467c0 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/ShadowDomPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/ShadowDomPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/TestBookPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/TestBookPage.java index da16406f..daac55a5 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/TestBookPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/TestBookPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.it.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/pages/UploadPage.java b/it/src/test/java/io/github/giulong/spectrum/it/pages/UploadPage.java index c2e9dc91..0abb3dc3 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/pages/UploadPage.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/pages/UploadPage.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.SpectrumPage; import io.github.giulong.spectrum.interfaces.Endpoint; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/CheckboxIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/CheckboxIT.java index e1ae77be..9afabb02 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/CheckboxIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/CheckboxIT.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; + import io.github.giulong.spectrum.SpectrumTest; -import io.github.giulong.spectrum.it.pages.LandingPage; import io.github.giulong.spectrum.it.pages.CheckboxPage; +import io.github.giulong.spectrum.it.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; -import static org.junit.jupiter.api.Assertions.*; - @DisplayName("Checkbox Page") class CheckboxIT extends SpectrumTest { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/DemoIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/DemoIT.java index c1e4d40d..5507c241 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/DemoIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/DemoIT.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.it.tests; import io.github.giulong.spectrum.SpectrumTest; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/DynamicIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/DynamicIT.java index 1470eec2..301e53ec 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/DynamicIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/DynamicIT.java @@ -1,12 +1,13 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; + import io.github.giulong.spectrum.it.pages.DynamicControlsPage; import io.github.giulong.spectrum.it.pages.DynamicLoadingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - @DisplayName("Dynamic elements") class DynamicIT extends BaseIT { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/FakerIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/FakerIT.java index d9959478..1affa607 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/FakerIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/FakerIT.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.openqa.selenium.Keys.ARROW_UP; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; + +import java.util.Objects; +import java.util.stream.Stream; + import io.github.giulong.spectrum.it.pages.InputsPage; import io.github.giulong.spectrum.it.pages.LoginPage; + import net.datafaker.providers.base.Name; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -12,14 +22,6 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import java.util.Objects; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.openqa.selenium.Keys.ARROW_UP; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; - @DisplayName("Faker") @SuppressWarnings("unused") public class FakerIT extends BaseIT { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/FilesIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/FilesIT.java index 09ef022f..0f4af17e 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/FilesIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/FilesIT.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it.pages.DownloadPage; import io.github.giulong.spectrum.it.pages.UploadPage; + import org.junit.jupiter.api.*; import org.openqa.selenium.TimeoutException; -import static org.junit.jupiter.api.Assertions.*; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; - @DisplayName("Files Test") @SuppressWarnings("unused") class FilesIT extends SpectrumTest { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/JavascriptIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/JavascriptIT.java index c437952b..a9d0f0ce 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/JavascriptIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/JavascriptIT.java @@ -1,20 +1,21 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.enums.LocatorType; import io.github.giulong.spectrum.it.pages.CheckboxPage; import io.github.giulong.spectrum.it.pages.LandingPage; import io.github.giulong.spectrum.it.pages.LoginPage; import io.github.giulong.spectrum.it.pages.ShadowDomPage; + import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebElement; -import static org.junit.jupiter.api.Assertions.*; -import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; - class JavascriptIT extends SpectrumTest { @SuppressWarnings("unused") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/JsWebElementIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/JsWebElementIT.java index 29d09977..98e7eb2e 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/JsWebElementIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/JsWebElementIT.java @@ -1,21 +1,22 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; +import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; +import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; + +import java.util.Objects; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.enums.LocatorType; import io.github.giulong.spectrum.it.pages.JsCheckboxPage; import io.github.giulong.spectrum.it.pages.JsLandingPage; import io.github.giulong.spectrum.it.pages.JsLoginPage; import io.github.giulong.spectrum.it.pages.JsShadowDomPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.*; -import java.util.Objects; - -import static org.junit.jupiter.api.Assertions.*; -import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; -import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf; - @DisplayName("JsWebElement") class JsWebElementIT extends SpectrumTest { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/LoginFormIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/LoginFormIT.java index fc0c69d4..7ec2def9 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/LoginFormIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/LoginFormIT.java @@ -1,8 +1,20 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.openqa.selenium.By.id; +import static org.openqa.selenium.Keys.ARROW_UP; +import static org.openqa.selenium.support.ui.ExpectedConditions.urlContains; + +import java.util.Objects; +import java.util.stream.Stream; + import io.github.giulong.spectrum.it.pages.InputsPage; import io.github.giulong.spectrum.it.pages.LoginPage; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,16 +23,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.openqa.selenium.WebElement; -import java.util.Objects; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.openqa.selenium.By.id; -import static org.openqa.selenium.Keys.ARROW_UP; -import static org.openqa.selenium.support.ui.ExpectedConditions.urlContains; - @Slf4j @DisplayName("Login Form") @SuppressWarnings("unused") diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/NavigationIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/NavigationIT.java index a5e43a57..c4a336f0 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/NavigationIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/NavigationIT.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.*; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it.pages.CheckboxPage; import io.github.giulong.spectrum.it.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; -import static org.junit.jupiter.api.Assertions.*; - @DisplayName("Navigation") class NavigationIT extends SpectrumTest { diff --git a/it/src/test/java/io/github/giulong/spectrum/it/tests/TestFactoryIT.java b/it/src/test/java/io/github/giulong/spectrum/it/tests/TestFactoryIT.java index 0113ad77..0824ef24 100644 --- a/it/src/test/java/io/github/giulong/spectrum/it/tests/TestFactoryIT.java +++ b/it/src/test/java/io/github/giulong/spectrum/it/tests/TestFactoryIT.java @@ -1,17 +1,18 @@ package io.github.giulong.spectrum.it.tests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.DynamicTest.dynamicTest; + +import java.util.stream.Stream; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.it.pages.CheckboxPage; import io.github.giulong.spectrum.it.pages.LandingPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DynamicNode; import org.junit.jupiter.api.TestFactory; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.DynamicTest.dynamicTest; - @DisplayName("Test Factory") class TestFactoryIT extends SpectrumTest { diff --git a/pom.xml b/pom.xml index 74d0a3ad..76da4c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -315,6 +315,20 @@ maven-clean-plugin 3.5.0 + + com.diffplug.spotless + spotless-maven-plugin + 3.0.0 + + + + + java,javax,ch,com,io,net,lombok,org + + + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumEntity.java b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumEntity.java index 64d4af26..12b43301 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumEntity.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumEntity.java @@ -1,18 +1,37 @@ package io.github.giulong.spectrum; +import static com.aventstack.extentreports.MediaEntityBuilder.createScreenCaptureFromPath; +import static com.aventstack.extentreports.Status.*; +import static io.github.giulong.spectrum.enums.Frame.MANUAL; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; +import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.openqa.selenium.OutputType.BYTES; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.MessageDigest; +import java.util.Arrays; +import java.util.Map; + import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.ExtentTest; import com.aventstack.extentreports.Status; import com.aventstack.extentreports.model.Media; + import io.github.giulong.spectrum.interfaces.Shared; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.js.Js; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + +import net.datafaker.Faker; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import net.datafaker.Faker; + import org.junit.jupiter.api.extension.ExtensionContext; import org.openqa.selenium.By; import org.openqa.selenium.TakesScreenshot; @@ -25,21 +44,6 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.MessageDigest; -import java.util.Arrays; -import java.util.Map; - -import static com.aventstack.extentreports.MediaEntityBuilder.createScreenCaptureFromPath; -import static com.aventstack.extentreports.Status.*; -import static io.github.giulong.spectrum.enums.Frame.MANUAL; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; -import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.openqa.selenium.OutputType.BYTES; - @Slf4j public abstract class SpectrumEntity, Data> { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumPage.java b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumPage.java index 7d451c9b..ab36eb17 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumPage.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumPage.java @@ -1,22 +1,24 @@ package io.github.giulong.spectrum; +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.time.Duration; +import java.util.List; + import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.JsWebElement; import io.github.giulong.spectrum.internals.page_factory.SpectrumFieldDecorator; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.js.JsWebElementListInvocationHandler; + import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory; -import java.lang.reflect.Field; -import java.lang.reflect.Proxy; -import java.time.Duration; -import java.util.List; - @Slf4j @Getter public abstract class SpectrumPage, Data> extends SpectrumEntity { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumSessionListener.java b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumSessionListener.java index 5aa7ac79..2046ddb6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumSessionListener.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumSessionListener.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum; +import static java.util.function.Predicate.not; + +import java.util.*; + import io.github.giulong.spectrum.types.ProjectProperties; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.events.EventsDispatcher; + import lombok.extern.slf4j.Slf4j; + import org.junit.platform.launcher.LauncherSession; import org.junit.platform.launcher.LauncherSessionListener; import org.slf4j.bridge.SLF4JBridgeHandler; -import java.util.*; - -import static java.util.function.Predicate.not; - @Slf4j public class SpectrumSessionListener implements LauncherSessionListener { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumTest.java b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumTest.java index 1a048f1c..34150ad0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumTest.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/SpectrumTest.java @@ -1,6 +1,13 @@ package io.github.giulong.spectrum; +import static java.util.function.Predicate.not; + +import java.lang.reflect.Field; +import java.lang.reflect.Type; +import java.util.List; + import com.aventstack.extentreports.ExtentReports; + import io.github.giulong.spectrum.extensions.interceptors.SpectrumInterceptor; import io.github.giulong.spectrum.extensions.resolvers.*; import io.github.giulong.spectrum.extensions.resolvers.bidi.BrowsingContextInspectorResolver; @@ -14,9 +21,12 @@ import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.js.Js; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + +import net.datafaker.Faker; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import net.datafaker.Faker; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,12 +37,6 @@ import org.openqa.selenium.bidi.module.Network; import org.openqa.selenium.interactions.Actions; -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.List; - -import static java.util.function.Predicate.not; - @Slf4j public abstract class SpectrumTest extends SpectrumEntity, Data> { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Android.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Android.java index 99e5b7da..8141e1e2 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Android.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Android.java @@ -1,12 +1,13 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; + import io.appium.java_client.android.AndroidDriver; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.WebDriver; -import java.net.URL; - public abstract class Android extends Appium { @Override diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Appium.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Appium.java index 8b6a80d4..fa524127 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Appium.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Appium.java @@ -1,18 +1,20 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; +import java.nio.file.Path; +import java.util.Map; + import io.appium.java_client.AppiumDriver; import io.appium.java_client.service.local.AppiumDriverLocalService; import io.appium.java_client.service.local.AppiumServiceBuilder; import io.github.giulong.spectrum.interfaces.BiDiDriver; import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.remote.service.DriverService; -import java.net.URL; -import java.nio.file.Path; -import java.util.Map; - @Slf4j public abstract class Appium extends Driver implements BiDiDriver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/AppiumGeneric.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/AppiumGeneric.java index 10ce97ea..2e2772ea 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/AppiumGeneric.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/AppiumGeneric.java @@ -1,9 +1,10 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; + import io.appium.java_client.AppiumDriver; -import org.openqa.selenium.MutableCapabilities; -import java.net.URL; +import org.openqa.selenium.MutableCapabilities; public class AppiumGeneric extends Appium { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chrome.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chrome.java index c4a23728..6cb34bb6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chrome.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chrome.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.drivers; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.chrome.ChromeDriverService; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.remote.service.DriverService; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chromium.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chromium.java index 80033557..9a7069b7 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chromium.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Chromium.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.drivers; +import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; +import static org.openqa.selenium.logging.LogType.*; + import io.github.giulong.spectrum.interfaces.BiDiDriver; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.chromium.ChromiumOptions; import org.openqa.selenium.logging.LoggingPreferences; import org.openqa.selenium.remote.service.DriverService; -import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; -import static org.openqa.selenium.logging.LogType.*; - public abstract class Chromium, U extends DriverService, V extends DriverService.Builder> extends Driver implements BiDiDriver { void setLoggingPreferencesFrom(final Configuration.Drivers.Logs logs) { final LoggingPreferences loggingPreferences = new LoggingPreferences(); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Driver.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Driver.java index 2bc26167..202a85e4 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Driver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Driver.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.drivers; +import java.util.Map; + import io.github.giulong.spectrum.utils.Configuration; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.service.DriverService; import org.openqa.selenium.support.ThreadGuard; -import java.util.Map; - @Getter @Slf4j public abstract class Driver> { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Edge.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Edge.java index 60ca757b..3a35001e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Edge.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Edge.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.drivers; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.edge.EdgeDriverService; import org.openqa.selenium.edge.EdgeOptions; import org.openqa.selenium.remote.service.DriverService; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Firefox.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Firefox.java index 2ead0315..6ea5388f 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Firefox.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Firefox.java @@ -2,6 +2,7 @@ import io.github.giulong.spectrum.interfaces.BiDiDriver; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.firefox.GeckoDriverService; import org.openqa.selenium.remote.service.DriverService; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Mac2.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Mac2.java index b54fe6c9..06bd2195 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Mac2.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Mac2.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; + import io.appium.java_client.mac.Mac2Driver; import io.appium.java_client.mac.options.Mac2Options; -import java.net.URL; - public class Mac2 extends Appium { @Override diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Safari.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Safari.java index 19a14357..6b982be0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Safari.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Safari.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.drivers; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.remote.service.DriverService; import org.openqa.selenium.safari.SafariDriverService; import org.openqa.selenium.safari.SafariOptions; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Windows.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Windows.java index d6832286..33710d97 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Windows.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/Windows.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; + import io.appium.java_client.windows.WindowsDriver; import io.appium.java_client.windows.options.WindowsOptions; import io.github.giulong.spectrum.utils.Configuration; -import org.openqa.selenium.WebDriver; -import java.net.URL; +import org.openqa.selenium.WebDriver; public class Windows extends Appium { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/XCUITest.java b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/XCUITest.java index a30a4781..70ed1b5d 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/drivers/XCUITest.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/drivers/XCUITest.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.drivers; +import java.net.URL; + import io.appium.java_client.ios.IOSDriver; import io.appium.java_client.ios.options.XCUITestOptions; -import java.net.URL; - public class XCUITest extends Appium { @Override diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/enums/Frame.java b/spectrum/src/main/java/io/github/giulong/spectrum/enums/Frame.java index 5837642e..3c3d0e6f 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/enums/Frame.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/enums/Frame.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.enums; import com.fasterxml.jackson.annotation.JsonValue; + import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/enums/LocatorType.java b/spectrum/src/main/java/io/github/giulong/spectrum/enums/LocatorType.java index 0683db7f..b2b8314b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/enums/LocatorType.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/enums/LocatorType.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum.enums; +import java.util.Arrays; +import java.util.List; + import io.github.giulong.spectrum.interfaces.WebElementFinder; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.By; import org.openqa.selenium.By.*; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import java.util.Arrays; -import java.util.List; - @Slf4j @Getter @AllArgsConstructor diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/enums/Result.java b/spectrum/src/main/java/io/github/giulong/spectrum/enums/Result.java index 7728c63d..b8a4783b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/enums/Result.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/enums/Result.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.enums; +import static com.aventstack.extentreports.Status.*; + import com.aventstack.extentreports.Status; + import lombok.AllArgsConstructor; import lombok.Getter; -import static com.aventstack.extentreports.Status.*; - @AllArgsConstructor @Getter public enum Result { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptor.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptor.java index e7ef1b8e..ec264a86 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptor.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptor.java @@ -1,26 +1,29 @@ package io.github.giulong.spectrum.extensions.interceptors; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.nio.file.Path; +import java.util.Set; + import com.aventstack.extentreports.ExtentTest; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.video.Video; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.DynamicTestInvocationContext; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.InvocationInterceptor; -import java.nio.file.Path; -import java.util.Set; - -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class SpectrumInterceptor implements InvocationInterceptor { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolver.java index 5190bccd..a892afc4 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolver.java @@ -1,6 +1,10 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; @@ -8,9 +12,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.interactions.Actions; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class ActionsResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolver.java index a3446d18..1a08c758 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolver.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class ConfigurationResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DataResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DataResolver.java index 35f46cd1..5186263a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DataResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DataResolver.java @@ -1,20 +1,22 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.lang.reflect.Type; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.YamlUtils; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolver; -import java.lang.reflect.Type; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class DataResolver implements ParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolver.java index adabeb22..f902c1e2 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolver.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.types.DownloadWait; +import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class DownloadWaitResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolver.java index 77d909a7..86db60d9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolver.java @@ -1,5 +1,14 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.internals.web_driver_listeners.AutoWaitWebDriverListener; import io.github.giulong.spectrum.internals.web_driver_listeners.EventsWebDriverListener; import io.github.giulong.spectrum.types.TestData; @@ -9,7 +18,9 @@ import io.github.giulong.spectrum.utils.StatefulExtentTest; import io.github.giulong.spectrum.utils.video.Video; import io.github.giulong.spectrum.utils.web_driver_events.*; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; @@ -22,15 +33,6 @@ import org.openqa.selenium.support.events.WebDriverListener; import org.openqa.selenium.support.ui.WebDriverWait; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class DriverResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolver.java index f09e47dd..57c0f6f5 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolver.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.utils.events.EventsDispatcher; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class EventsDispatcherResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolver.java index 0bd5d6cb..f6f50dc9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolver.java @@ -1,15 +1,18 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import com.aventstack.extentreports.ExtentReports; + import io.github.giulong.spectrum.utils.ExtentReporter; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class ExtentReportsResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolver.java index 235aad1d..c04f2ae6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolver.java @@ -1,16 +1,19 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.utils.Configuration; + import net.datafaker.Faker; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class FakerResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolver.java index 21b1eb07..a303553f 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolver.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.types.ImplicitWait; +import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class ImplicitWaitResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsResolver.java index 1e138988..0e5da2a9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsResolver.java @@ -1,7 +1,12 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.utils.js.Js; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; @@ -9,9 +14,6 @@ import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class JsResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolver.java index 9f98c261..25bd9110 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolver.java @@ -1,24 +1,26 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.lang.reflect.Method; +import java.util.*; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.js.Js; import io.github.giulong.spectrum.utils.js.JsWebElementInvocationHandler; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; import org.openqa.selenium.WebElement; -import java.lang.reflect.Method; -import java.util.*; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class JsWebElementProxyBuilderResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolver.java index f949688b..1bcb1ee4 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolver.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.types.PageLoadWait; +import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class PageLoadWaitResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolver.java index b39a88b8..20cc3459 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolver.java @@ -1,17 +1,19 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.types.ScriptWait; +import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class ScriptWaitResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolver.java index ed187d32..3f0ed099 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolver.java @@ -1,22 +1,25 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import com.aventstack.extentreports.ExtentTest; -import io.github.giulong.spectrum.utils.ContextManager; -import io.github.giulong.spectrum.utils.StatefulExtentTest; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Configuration; +import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.ExtentReporter; +import io.github.giulong.spectrum.utils.StatefulExtentTest; import io.github.giulong.spectrum.utils.video.Video; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class StatefulExtentTestResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolver.java index 4d492e69..b406e0e0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolver.java @@ -2,7 +2,9 @@ import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.TestContext; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolver.java index 4dbe9a38..521116d8 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolver.java @@ -1,21 +1,23 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.FileUtils; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public class TestDataResolver extends TypeBasedParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolver.java index 45fd2ae3..7e2d407b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolver.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolver; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j public abstract class BiDiTypeBasedParameterResolver implements ParameterResolver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolver.java index b1ca3b94..09238560 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolver.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; import lombok.Getter; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.BrowsingContextInspector; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolver.java index d0a20ac9..44a2b8fd 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolver.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; import lombok.Getter; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.browsingcontext.BrowsingContext; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolver.java index ed5fa7e3..caab63e5 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolver.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; import lombok.Getter; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.LogInspector; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolver.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolver.java index 7da53474..cd87aa34 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolver.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; import lombok.Getter; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.Network; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcher.java b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcher.java index 228b8ec4..837163ea 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcher.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcher.java @@ -1,15 +1,16 @@ package io.github.giulong.spectrum.extensions.watchers; -import io.github.giulong.spectrum.enums.Result; -import io.github.giulong.spectrum.utils.events.EventsDispatcher; -import org.junit.jupiter.api.TestFactory; -import org.junit.jupiter.api.extension.*; +import static io.github.giulong.spectrum.enums.Result.*; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; import java.util.Optional; import java.util.Set; -import static io.github.giulong.spectrum.enums.Result.*; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import io.github.giulong.spectrum.enums.Result; +import io.github.giulong.spectrum.utils.events.EventsDispatcher; + +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.extension.*; public class EventsWatcher implements TestWatcher, BeforeTestExecutionCallback, BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/BiDiDriver.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/BiDiDriver.java index 2328d36f..4f211a66 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/BiDiDriver.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/BiDiDriver.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.interfaces; import io.github.giulong.spectrum.utils.Configuration; + import org.openqa.selenium.MutableCapabilities; public interface BiDiDriver { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Endpoint.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Endpoint.java index a4f94979..1239b05b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Endpoint.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Endpoint.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.interfaces; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Retention(RUNTIME) @Target(TYPE) public @interface Endpoint { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsWebElement.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsWebElement.java index a053f6ea..5e31b51c 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsWebElement.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsWebElement.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.interfaces; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Retention(RUNTIME) @Target(FIELD) public @interface JsWebElement { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsonSchemaTypes.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsonSchemaTypes.java index 7a68ef02..621b7413 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsonSchemaTypes.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/JsonSchemaTypes.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.interfaces; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Retention(RUNTIME) @Target(FIELD) public @interface JsonSchemaTypes { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Secured.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Secured.java index f8550639..e9fb6698 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Secured.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Secured.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.interfaces; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Retention(RUNTIME) @Target(FIELD) public @interface Secured { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Shared.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Shared.java index bce0f2a6..a75d0e79 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Shared.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/Shared.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.interfaces; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + @Retention(RUNTIME) @Target(FIELD) public @interface Shared { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/WebElementFinder.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/WebElementFinder.java index cb51ff31..266bc734 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/WebElementFinder.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/WebElementFinder.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.interfaces; +import java.util.List; + import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import java.util.List; - public interface WebElementFinder { WebElement findElement(JavascriptExecutor driver, WebElement context, String locatorValue); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportSummary.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportSummary.java index 13489470..d0fdd132 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportSummary.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportSummary.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.interfaces.reports; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; + import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.reporters.LogReporter; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; - @JsonTypeInfo(use = NAME, include = WRAPPER_OBJECT) @JsonSubTypes({ @JsonSubTypes.Type(value = LogReporter.LogSummaryReporter.class, name = "log"), diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportTestBook.java b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportTestBook.java index 5f9c2e06..34d93a8e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportTestBook.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/interfaces/reports/CanReportTestBook.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.interfaces.reports; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; + import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.reporters.LogReporter; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; - @JsonTypeInfo(use = NAME, include = WRAPPER_OBJECT) @JsonSubTypes({ @JsonSubTypes.Type(value = LogReporter.LogTestBookReporter.class, name = "log"), diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/AppiumLog.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/AppiumLog.java index aea6c58a..61b5d68c 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/AppiumLog.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/AppiumLog.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.internals; +import java.io.OutputStream; + import lombok.Builder; import lombok.Builder.Default; import lombok.extern.slf4j.Slf4j; -import org.slf4j.event.Level; -import java.io.OutputStream; +import org.slf4j.event.Level; @Slf4j @Builder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/ColoredConverter.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/ColoredConverter.java index ccc7e7aa..c761bb93 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/ColoredConverter.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/ColoredConverter.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.internals; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.pattern.color.ForegroundCompositeConverterBase; - import static ch.qos.logback.classic.Level.*; import static ch.qos.logback.core.pattern.color.ANSIConstants.*; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.pattern.color.ForegroundCompositeConverterBase; + public class ColoredConverter extends ForegroundCompositeConverterBase { @Override diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/DriverLog.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/DriverLog.java index 351779b5..86a13e1b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/DriverLog.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/DriverLog.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.internals; +import java.io.OutputStream; + import lombok.Builder; import lombok.Builder.Default; import lombok.extern.slf4j.Slf4j; -import org.slf4j.event.Level; -import java.io.OutputStream; +import org.slf4j.event.Level; @Slf4j @Builder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializer.java index dd11646a..417501b6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializer.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; + import lombok.NoArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class ClassDeserializer extends JsonDeserializer> { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializer.java index b6996d74..f45651ee 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializer.java @@ -1,15 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.drivers.*; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class DriverDeserializer extends InterpolatedDeserializer> { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializer.java index 656fbb9d..0f007256 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializer.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; +import java.time.Duration; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; -import java.time.Duration; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class DurationDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializer.java index b7af0556..d575a8f5 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializer.java @@ -1,15 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; + import io.github.giulong.spectrum.utils.YamlUtils; + import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - @Slf4j @AllArgsConstructor public class DynamicDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializer.java index d1336c32..76242991 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializer.java @@ -1,18 +1,20 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.utils.environments.AppiumEnvironment; import io.github.giulong.spectrum.utils.environments.Environment; import io.github.giulong.spectrum.utils.environments.GridEnvironment; import io.github.giulong.spectrum.utils.environments.LocalEnvironment; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class EnvironmentDeserializer extends InterpolatedDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializer.java index 991ffd66..f07dda87 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializer.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class InterpolatedBooleanDeserializer extends InterpolatedDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedDeserializer.java index 0f77c62d..a5a54907 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedDeserializer.java @@ -1,11 +1,13 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import com.fasterxml.jackson.databind.JsonDeserializer; + import io.github.giulong.spectrum.utils.Vars; -import lombok.extern.slf4j.Slf4j; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import lombok.extern.slf4j.Slf4j; @Slf4j public abstract class InterpolatedDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializer.java index b094be22..38b8abdd 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializer.java @@ -1,5 +1,14 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static java.util.stream.Collectors.toMap; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; @@ -7,19 +16,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeType; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; + import io.github.giulong.spectrum.utils.Vars; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static java.util.stream.Collectors.toMap; -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class InterpolatedObjectDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializer.java index a5c87b61..7a138bd4 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializer.java @@ -1,15 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.utils.FileUtils; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class InterpolatedStringDeserializer extends InterpolatedDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializer.java index 8d1b5ba4..5dfcfa28 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializer.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; + import ch.qos.logback.classic.Level; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import lombok.NoArgsConstructor; - -import java.io.IOException; -import static lombok.AccessLevel.PRIVATE; +import lombok.NoArgsConstructor; @NoArgsConstructor(access = PRIVATE) public class LogbackLogLevelDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializer.java index 5597f7ba..52397a6b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializer.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static lombok.AccessLevel.PRIVATE; + +import java.io.IOException; +import java.util.Random; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.IOException; -import java.util.Random; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class RandomDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializer.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializer.java index 66a46815..6819692a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializer.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import lombok.NoArgsConstructor; +import static lombok.AccessLevel.PRIVATE; import java.io.IOException; import java.util.logging.Level; -import static lombok.AccessLevel.PRIVATE; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import lombok.NoArgsConstructor; @NoArgsConstructor(access = PRIVATE) public class UtilLogLevelDeserializer extends JsonDeserializer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaGeneratorModule.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaGeneratorModule.java index 1824b20c..7e0e2735 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaGeneratorModule.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaGeneratorModule.java @@ -1,5 +1,16 @@ package io.github.giulong.spectrum.internals.jackson.json_schema; +import static java.util.function.Predicate.not; + +import java.io.FileReader; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + import com.fasterxml.classmate.ResolvedType; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonView; @@ -7,23 +18,15 @@ import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder; import com.github.victools.jsonschema.generator.TypeContext; import com.github.victools.jsonschema.module.jackson.JsonSubTypesResolver; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import java.io.FileReader; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -import static java.util.function.Predicate.not; - @Slf4j public class JsonSchemaGeneratorModule extends JsonSchemaInternalGeneratorModule { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaInternalGeneratorModule.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaInternalGeneratorModule.java index 53598820..f81eed93 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaInternalGeneratorModule.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/jackson/json_schema/JsonSchemaInternalGeneratorModule.java @@ -1,5 +1,15 @@ package io.github.giulong.spectrum.internals.jackson.json_schema; +import static com.github.victools.jsonschema.generator.Option.*; +import static com.github.victools.jsonschema.module.jackson.JacksonOption.FLATTENED_ENUMS_FROM_JSONVALUE; +import static com.github.victools.jsonschema.module.jackson.JacksonOption.SKIP_SUBTYPE_LOOKUP; + +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; + import com.fasterxml.classmate.ResolvedType; import com.github.victools.jsonschema.generator.FieldScope; import com.github.victools.jsonschema.generator.Module; @@ -7,19 +17,11 @@ import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder; import com.github.victools.jsonschema.module.jackson.JacksonModule; import com.github.victools.jsonschema.module.jackson.JsonSubTypesResolver; + import io.github.giulong.spectrum.interfaces.JsonSchemaTypes; import io.github.giulong.spectrum.utils.Configuration; -import lombok.SneakyThrows; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.List; - -import static com.github.victools.jsonschema.generator.Option.*; -import static com.github.victools.jsonschema.module.jackson.JacksonOption.FLATTENED_ENUMS_FROM_JSONVALUE; -import static com.github.victools.jsonschema.module.jackson.JacksonOption.SKIP_SUBTYPE_LOOKUP; +import lombok.SneakyThrows; public class JsonSchemaInternalGeneratorModule implements Module { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecorator.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecorator.java index dc221a54..bffe553d 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecorator.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecorator.java @@ -1,6 +1,11 @@ package io.github.giulong.spectrum.internals.page_factory; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; + import io.github.giulong.spectrum.interfaces.Secured; + import org.openqa.selenium.WebElement; import org.openqa.selenium.WrapsElement; import org.openqa.selenium.interactions.Locatable; @@ -8,10 +13,6 @@ import org.openqa.selenium.support.pagefactory.ElementLocator; import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; - public class SpectrumFieldDecorator extends DefaultFieldDecorator { public SpectrumFieldDecorator(final ElementLocatorFactory factory) { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandler.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandler.java index 12ca4c47..259de16f 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandler.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandler.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.internals.page_factory; +import java.lang.reflect.Method; + import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.support.pagefactory.ElementLocator; import org.openqa.selenium.support.pagefactory.internal.LocatingElementHandler; -import java.lang.reflect.Method; - @Slf4j public class SpectrumLocatingElementHandler extends LocatingElementHandler { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListener.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListener.java index 5dc68457..c5ddbb7a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListener.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListener.java @@ -1,7 +1,12 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.Arrays; + import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.ElementNotInteractableException; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; @@ -9,10 +14,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; -import java.util.Arrays; - -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - @Slf4j @SuperBuilder public class AutoWaitWebDriverListener extends SpectrumWebDriverListener { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListener.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListener.java index eb0f8eec..6dab1508 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListener.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListener.java @@ -1,29 +1,31 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; +import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.time.Duration; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Configuration.Drivers.Events; import io.github.giulong.spectrum.utils.web_driver_events.WebDriverEvent; import io.github.giulong.spectrum.utils.web_driver_events.WebDriverEventConsumer; + import lombok.Generated; import lombok.SneakyThrows; import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.*; import org.openqa.selenium.interactions.Sequence; import org.slf4j.event.Level; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URL; -import java.time.Duration; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; -import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; - @Slf4j @SuperBuilder public class EventsWebDriverListener extends SpectrumWebDriverListener { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListener.java b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListener.java index 4ae1857e..513c8b53 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListener.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListener.java @@ -1,6 +1,12 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import lombok.experimental.SuperBuilder; + import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; @@ -8,11 +14,6 @@ import org.openqa.selenium.support.events.WebDriverListener; import org.openqa.selenium.support.ui.WebDriverWait; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - @SuperBuilder public abstract class SpectrumWebDriverListener implements WebDriverListener { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Attachment.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Attachment.java index 03b722d7..b774bf3e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Attachment.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Attachment.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.pojos.events; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import lombok.Getter; @Getter diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Event.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Event.java index 0873e55b..b7527445 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Event.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/Event.java @@ -1,15 +1,18 @@ package io.github.giulong.spectrum.pojos.events; +import java.util.Map; +import java.util.Set; + import com.fasterxml.jackson.annotation.JsonIgnore; + import io.github.giulong.spectrum.enums.Result; + import lombok.Builder; import lombok.Getter; import lombok.ToString; import lombok.extern.jackson.Jacksonized; -import org.junit.jupiter.api.extension.ExtensionContext; -import java.util.Map; -import java.util.Set; +import org.junit.jupiter.api.extension.ExtensionContext; @Getter @Builder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/TestStep.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/TestStep.java index 20f1bad8..b12aeb38 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/TestStep.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/events/TestStep.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.pojos.events; +import java.time.LocalDateTime; + import lombok.Builder; import lombok.Getter; -import java.time.LocalDateTime; - @Getter @Builder public class TestStep { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/QualityGate.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/QualityGate.java index 39ee8dbd..b9c7aa26 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/QualityGate.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/QualityGate.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.pojos.testbook; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import lombok.Getter; @SuppressWarnings("unused") diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookStatistics.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookStatistics.java index 96bca897..f6989784 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookStatistics.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookStatistics.java @@ -1,13 +1,15 @@ package io.github.giulong.spectrum.pojos.testbook; -import io.github.giulong.spectrum.enums.Result; -import com.google.common.util.concurrent.AtomicDouble; -import lombok.Getter; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import com.google.common.util.concurrent.AtomicDouble; + +import io.github.giulong.spectrum.enums.Result; + +import lombok.Getter; + @Getter public class TestBookStatistics { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookTest.java b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookTest.java index 40c64c41..d176bbc8 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookTest.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/pojos/testbook/TestBookTest.java @@ -1,14 +1,16 @@ package io.github.giulong.spectrum.pojos.testbook; +import static io.github.giulong.spectrum.enums.Result.NOT_RUN; + import com.fasterxml.jackson.annotation.JsonIgnore; + import io.github.giulong.spectrum.enums.Result; + import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import static io.github.giulong.spectrum.enums.Result.NOT_RUN; - @Getter @Builder @EqualsAndHashCode(exclude = {"weight", "result"}) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/types/DownloadWait.java b/spectrum/src/main/java/io/github/giulong/spectrum/types/DownloadWait.java index 35d0bc32..65bd6833 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/types/DownloadWait.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/types/DownloadWait.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.types; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - public class DownloadWait extends WebDriverWait { public DownloadWait(final WebDriver driver, final Duration timeout) { super(driver, timeout); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/types/ImplicitWait.java b/spectrum/src/main/java/io/github/giulong/spectrum/types/ImplicitWait.java index 871d0583..6d12eb02 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/types/ImplicitWait.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/types/ImplicitWait.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.types; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - public class ImplicitWait extends WebDriverWait { public ImplicitWait(final WebDriver driver, final Duration timeout) { super(driver, timeout); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/types/PageLoadWait.java b/spectrum/src/main/java/io/github/giulong/spectrum/types/PageLoadWait.java index 9c85909e..29a74d39 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/types/PageLoadWait.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/types/PageLoadWait.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.types; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - public class PageLoadWait extends WebDriverWait { public PageLoadWait(final WebDriver driver, final Duration timeout) { super(driver, timeout); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/types/ScriptWait.java b/spectrum/src/main/java/io/github/giulong/spectrum/types/ScriptWait.java index b01c1695..a2fb9433 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/types/ScriptWait.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/types/ScriptWait.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.types; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - public class ScriptWait extends WebDriverWait { public ScriptWait(final WebDriver driver, final Duration timeout) { super(driver, timeout); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/types/TestData.java b/spectrum/src/main/java/io/github/giulong/spectrum/types/TestData.java index 622e3e92..74dcac05 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/types/TestData.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/types/TestData.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.types; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; + import lombok.Builder; import lombok.Getter; import lombok.Setter; -import org.jcodec.api.awt.AWTSequenceEncoder; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.Map; +import org.jcodec.api.awt.AWTSequenceEncoder; @Getter @Builder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Configuration.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Configuration.java index e4e3519e..ca4778c0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Configuration.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Configuration.java @@ -1,10 +1,19 @@ package io.github.giulong.spectrum.utils; +import static lombok.AccessLevel.PRIVATE; + +import java.io.File; +import java.net.URL; +import java.time.Duration; +import java.util.*; +import java.util.logging.Level; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.interfaces.JsonSchemaTypes; import io.github.giulong.spectrum.utils.environments.Environment; @@ -12,20 +21,14 @@ import io.github.giulong.spectrum.utils.testbook.TestBook; import io.github.giulong.spectrum.utils.tests_comparators.TestsComparator; import io.github.giulong.spectrum.utils.video.Video; + import lombok.Generated; import lombok.Getter; import lombok.NoArgsConstructor; + import org.openqa.selenium.chromium.ChromiumDriverLogLevel; import org.openqa.selenium.firefox.FirefoxDriverLogLevel; -import java.io.File; -import java.net.URL; -import java.time.Duration; -import java.util.*; -import java.util.logging.Level; - -import static lombok.AccessLevel.PRIVATE; - @SuppressWarnings("unused") @Getter @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/ContextManager.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/ContextManager.java index e4d465b9..4decaeda 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/ContextManager.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/ContextManager.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.utils; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.junit.jupiter.api.extension.ExtensionContext; +import static lombok.AccessLevel.PRIVATE; import java.nio.file.Path; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static lombok.AccessLevel.PRIVATE; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import org.junit.jupiter.api.extension.ExtensionContext; @NoArgsConstructor(access = PRIVATE) public final class ContextManager { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java index b663075b..7752f469 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java @@ -1,5 +1,20 @@ package io.github.giulong.spectrum.utils; +import static com.aventstack.extentreports.Status.INFO; +import static com.aventstack.extentreports.Status.SKIP; +import static com.aventstack.extentreports.markuputils.ExtentColor.*; +import static com.aventstack.extentreports.markuputils.MarkupHelper.createLabel; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.*; +import static lombok.AccessLevel.PRIVATE; + +import java.awt.*; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.ExtentTest; import com.aventstack.extentreports.Status; @@ -9,33 +24,21 @@ import com.aventstack.extentreports.reporter.ExtentSparkReporter; import com.aventstack.extentreports.reporter.configuration.ExtentSparkReporterConfig; import com.aventstack.extentreports.reporter.configuration.Theme; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.interfaces.SessionHook; import io.github.giulong.spectrum.interfaces.reports.CanProduceMetadata; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.video.Video; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtensionContext; -import java.awt.*; -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; - -import static com.aventstack.extentreports.Status.INFO; -import static com.aventstack.extentreports.Status.SKIP; -import static com.aventstack.extentreports.markuputils.ExtentColor.*; -import static com.aventstack.extentreports.markuputils.MarkupHelper.createLabel; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.*; -import static lombok.AccessLevel.PRIVATE; - @Slf4j @Getter @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FileUtils.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FileUtils.java index bae2df37..183d1fbf 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FileUtils.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FileUtils.java @@ -1,8 +1,7 @@ package io.github.giulong.spectrum.utils; -import lombok.NoArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import static java.util.Comparator.reverseOrder; +import static lombok.AccessLevel.PRIVATE; import java.io.File; import java.io.InputStream; @@ -18,8 +17,9 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import static java.util.Comparator.reverseOrder; -import static lombok.AccessLevel.PRIVATE; +import lombok.NoArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; @Slf4j @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FixedSizeQueue.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FixedSizeQueue.java index 87e29aa3..e2757972 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FixedSizeQueue.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FixedSizeQueue.java @@ -1,9 +1,9 @@ package io.github.giulong.spectrum.utils; -import lombok.extern.slf4j.Slf4j; - import java.util.PriorityQueue; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class FixedSizeQueue extends PriorityQueue { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FreeMarkerWrapper.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FreeMarkerWrapper.java index 01569512..2ea38f95 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/FreeMarkerWrapper.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/FreeMarkerWrapper.java @@ -1,20 +1,22 @@ package io.github.giulong.spectrum.utils; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.Version; -import io.github.giulong.spectrum.interfaces.SessionHook; -import io.github.giulong.spectrum.utils.Configuration.FreeMarker; -import lombok.NoArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import static lombok.AccessLevel.PRIVATE; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import java.util.Map; -import static lombok.AccessLevel.PRIVATE; +import io.github.giulong.spectrum.interfaces.SessionHook; +import io.github.giulong.spectrum.utils.Configuration.FreeMarker; + +import lombok.NoArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; + +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.Version; @Slf4j @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/HtmlUtils.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/HtmlUtils.java index 6640963f..72e9da82 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/HtmlUtils.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/HtmlUtils.java @@ -1,10 +1,7 @@ package io.github.giulong.spectrum.utils; -import io.github.giulong.spectrum.interfaces.SessionHook; -import io.github.giulong.spectrum.types.TestData; -import lombok.NoArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; +import static java.util.regex.Pattern.DOTALL; +import static lombok.AccessLevel.PRIVATE; import java.nio.file.Files; import java.nio.file.Path; @@ -13,8 +10,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.util.regex.Pattern.DOTALL; -import static lombok.AccessLevel.PRIVATE; +import io.github.giulong.spectrum.interfaces.SessionHook; +import io.github.giulong.spectrum.types.TestData; + +import lombok.NoArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; @Slf4j @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/JsonUtils.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/JsonUtils.java index 5e74849a..2776bfa7 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/JsonUtils.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/JsonUtils.java @@ -1,15 +1,16 @@ package io.github.giulong.spectrum.utils; +import static lombok.AccessLevel.PRIVATE; + +import java.io.File; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.json.JsonMapper; + import lombok.NoArgsConstructor; import lombok.SneakyThrows; -import java.io.File; - -import static lombok.AccessLevel.PRIVATE; - @NoArgsConstructor(access = PRIVATE) public final class JsonUtils { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/MetadataManager.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/MetadataManager.java index 0e0c4a35..3c1fe40e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/MetadataManager.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/MetadataManager.java @@ -1,20 +1,21 @@ package io.github.giulong.spectrum.utils; +import static lombok.AccessLevel.PRIVATE; + +import java.io.File; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; + import io.github.giulong.spectrum.interfaces.SessionHook; import io.github.giulong.spectrum.interfaces.reports.CanProduceMetadata; import io.github.giulong.spectrum.types.ProjectProperties; + import lombok.Generated; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import java.io.File; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.Map; - -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public class MetadataManager implements SessionHook { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Reflections.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Reflections.java index d9d99457..21fa8b8a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Reflections.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Reflections.java @@ -1,8 +1,6 @@ package io.github.giulong.spectrum.utils; -import lombok.SneakyThrows; -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; +import static java.util.Arrays.asList; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -11,7 +9,9 @@ import java.util.Arrays; import java.util.List; -import static java.util.Arrays.asList; +import lombok.SneakyThrows; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; @Slf4j @UtilityClass diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Retention.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Retention.java index 8c25756b..51a82ead 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Retention.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Retention.java @@ -1,17 +1,5 @@ package io.github.giulong.spectrum.utils; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import io.github.giulong.spectrum.interfaces.reports.CanProduceMetadata; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; - -import java.io.File; -import java.nio.file.attribute.FileTime; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - import static java.lang.Integer.MAX_VALUE; import static java.lang.Math.clamp; import static java.lang.Math.max; @@ -21,6 +9,20 @@ import static java.util.function.Predicate.not; import static java.util.stream.Collectors.partitioningBy; +import java.io.File; +import java.nio.file.attribute.FileTime; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; + +import io.github.giulong.spectrum.interfaces.reports.CanProduceMetadata; + +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + @Slf4j @Getter public class Retention { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/StatefulExtentTest.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/StatefulExtentTest.java index c0d8fad7..bdaca0ad 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/StatefulExtentTest.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/StatefulExtentTest.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.utils; import com.aventstack.extentreports.ExtentTest; + import lombok.*; @Getter diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/StringUtils.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/StringUtils.java index c00cb8a1..8f1269bd 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/StringUtils.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/StringUtils.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.utils; -import lombok.NoArgsConstructor; +import static lombok.AccessLevel.PRIVATE; import java.util.Objects; -import static lombok.AccessLevel.PRIVATE; +import lombok.NoArgsConstructor; @NoArgsConstructor(access = PRIVATE) public final class StringUtils { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Summary.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Summary.java index 0482cbe4..b59190d1 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Summary.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Summary.java @@ -1,29 +1,32 @@ package io.github.giulong.spectrum.utils; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.interfaces.SessionHook; import io.github.giulong.spectrum.interfaces.reports.CanReportSummary; import io.github.giulong.spectrum.interfaces.reports.Reportable; import io.github.giulong.spectrum.utils.reporters.FileReporter; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.junit.platform.launcher.listeners.SummaryGeneratingListener; import org.junit.platform.launcher.listeners.TestExecutionSummary; import org.mvel2.MVEL; -import java.nio.file.Path; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static java.util.concurrent.TimeUnit.MILLISECONDS; - @Getter @Slf4j public class Summary implements SessionHook, Reportable { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Vars.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Vars.java index 3c2c35ae..fd2e88d7 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/Vars.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/Vars.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.utils; -import lombok.NoArgsConstructor; +import static lombok.AccessLevel.PRIVATE; import java.util.HashMap; -import static lombok.AccessLevel.PRIVATE; +import lombok.NoArgsConstructor; @NoArgsConstructor(access = PRIVATE) public class Vars extends HashMap { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/YamlUtils.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/YamlUtils.java index d3b59bfc..196424e8 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/YamlUtils.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/YamlUtils.java @@ -1,10 +1,18 @@ package io.github.giulong.spectrum.utils; +import static com.fasterxml.jackson.databind.SerializationFeature.FAIL_ON_EMPTY_BEANS; +import static lombok.AccessLevel.PRIVATE; + +import java.time.Duration; +import java.util.Random; + import ch.qos.logback.classic.Level; + import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.internals.jackson.deserializers.*; import io.github.giulong.spectrum.utils.environments.Environment; @@ -17,16 +25,11 @@ import io.github.giulong.spectrum.utils.reporters.FileReporter.TxtTestBookReporter; import io.github.giulong.spectrum.utils.reporters.LogReporter.LogSummaryReporter; import io.github.giulong.spectrum.utils.reporters.LogReporter.LogTestBookReporter; + import lombok.NoArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import java.time.Duration; -import java.util.Random; - -import static com.fasterxml.jackson.databind.SerializationFeature.FAIL_ON_EMPTY_BEANS; -import static lombok.AccessLevel.PRIVATE; - @Slf4j @NoArgsConstructor(access = PRIVATE) public final class YamlUtils { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironment.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironment.java index 5c505606..d0b42a07 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironment.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironment.java @@ -1,23 +1,26 @@ package io.github.giulong.spectrum.utils.environments; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; + import com.fasterxml.jackson.annotation.JsonIgnore; + import io.appium.java_client.service.local.AppiumDriverLocalService; import io.appium.java_client.service.local.AppiumServiceBuilder; import io.github.giulong.spectrum.drivers.Appium; import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.internals.AppiumLog; import io.github.giulong.spectrum.utils.Configuration; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; -import java.io.IOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; - @Slf4j @Getter public class AppiumEnvironment extends GridEnvironment { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/Environment.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/Environment.java index 9e3857f4..c4f0e1d2 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/Environment.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/Environment.java @@ -2,6 +2,7 @@ import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.interfaces.SessionHook; + import org.openqa.selenium.WebDriver; public abstract class Environment implements SessionHook { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/GridEnvironment.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/GridEnvironment.java index 5ca3ab3b..905eb753 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/GridEnvironment.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/GridEnvironment.java @@ -1,16 +1,19 @@ package io.github.giulong.spectrum.utils.environments; +import java.net.URL; + import com.fasterxml.jackson.annotation.JsonIgnore; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.utils.Configuration; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.LocalFileDetector; import org.openqa.selenium.remote.RemoteWebDriver; -import java.net.URL; - @Slf4j @Getter public class GridEnvironment extends Environment { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/LocalEnvironment.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/LocalEnvironment.java index cf6b9009..f8fcd39a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/LocalEnvironment.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/environments/LocalEnvironment.java @@ -1,10 +1,13 @@ package io.github.giulong.spectrum.utils.environments; import com.fasterxml.jackson.annotation.JsonIgnore; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.internals.DriverLog; import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.service.DriverService; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/DriverConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/DriverConsumer.java index c44b6404..719f4ad1 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/DriverConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/DriverConsumer.java @@ -1,23 +1,26 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.DISABLED; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.BrowsingContextInspectorResolver.BROWSING_CONTEXT_INSPECTOR; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.LogInspectorResolver.LOG_INSPECTOR; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.NetworkResolver.NETWORK; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.util.Optional; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.Configuration; + import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.openqa.selenium.bidi.module.BrowsingContextInspector; import org.openqa.selenium.bidi.module.LogInspector; import org.openqa.selenium.bidi.module.Network; -import java.util.Optional; - -import static io.github.giulong.spectrum.enums.Result.DISABLED; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.BrowsingContextInspectorResolver.BROWSING_CONTEXT_INSPECTOR; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.LogInspectorResolver.LOG_INSPECTOR; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.NetworkResolver.NETWORK; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j @JsonView(Internal.class) public class DriverConsumer extends EventsConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsConsumer.java index 05cf8467..a5a4ab2d 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsConsumer.java @@ -1,21 +1,23 @@ package io.github.giulong.spectrum.utils.events; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; +import static java.util.stream.Collectors.toSet; + +import java.util.List; +import java.util.function.Consumer; + import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.events.video.*; import io.github.giulong.spectrum.utils.web_driver_events.TestStepsConsumer; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import java.util.List; -import java.util.function.Consumer; - -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; -import static java.util.stream.Collectors.toSet; - @JsonTypeInfo(use = NAME, include = WRAPPER_OBJECT) @JsonSubTypes({ @JsonSubTypes.Type(value = SlackConsumer.class, name = "slack"), diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsDispatcher.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsDispatcher.java index 7add0708..f5a3d12e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsDispatcher.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/EventsDispatcher.java @@ -1,18 +1,20 @@ package io.github.giulong.spectrum.utils.events; +import static lombok.AccessLevel.PRIVATE; + +import java.util.Map; +import java.util.Optional; +import java.util.Set; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.interfaces.SessionHook; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.Configuration; + import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.extension.ExtensionContext; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -import static lombok.AccessLevel.PRIVATE; +import org.junit.jupiter.api.extension.ExtensionContext; @Slf4j @NoArgsConstructor(access = PRIVATE) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumer.java index 6641347f..551d8230 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumer.java @@ -2,9 +2,11 @@ import com.aventstack.extentreports.Status; import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.ExtentReporter; + import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/LogConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/LogConsumer.java index a6e3b0a5..f2dde55c 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/LogConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/LogConsumer.java @@ -1,16 +1,19 @@ package io.github.giulong.spectrum.utils.events; +import static org.slf4j.event.Level.INFO; + +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.slf4j.event.Level; - -import java.util.Map; -import static org.slf4j.event.Level.INFO; +import org.slf4j.event.Level; @Slf4j @Getter diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/MailConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/MailConsumer.java index 87a7d58f..a90f4dc0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/MailConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/MailConsumer.java @@ -1,20 +1,24 @@ package io.github.giulong.spectrum.utils.events; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.pojos.events.Attachment; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; -import jakarta.activation.FileDataSource; + import lombok.Getter; + import org.simplejavamail.api.email.AttachmentResource; import org.simplejavamail.api.mailer.Mailer; import org.simplejavamail.email.EmailBuilder; import org.simplejavamail.mailer.MailerBuilder; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import jakarta.activation.FileDataSource; @Getter public class MailConsumer extends EventsConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/SlackConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/SlackConsumer.java index c2ccc2cf..99f230e9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/SlackConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/SlackConsumer.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.utils.events; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.slack.api.Slack; import com.slack.api.methods.request.chat.ChatPostMessageRequest; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; + import lombok.Getter; import lombok.SneakyThrows; -import java.util.Map; - @Getter public class SlackConsumer extends EventsConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/TestBookConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/TestBookConsumer.java index e2d20804..64cf1517 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/TestBookConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/TestBookConsumer.java @@ -1,6 +1,9 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; @@ -8,8 +11,6 @@ import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.testbook.TestBook; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; - @JsonView(Internal.class) public class TestBookConsumer extends EventsConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumer.java index 8379100e..0809f0dd 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumer.java @@ -1,14 +1,14 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.enums.Result.DISABLED; + +import java.nio.file.Path; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.events.EventsConsumer; -import java.nio.file.Path; - -import static io.github.giulong.spectrum.enums.Result.DISABLED; - public abstract class VideoBaseConsumer extends EventsConsumer { protected final Configuration configuration = Configuration.getInstance(); diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoConsumer.java index 5a623a2c..2b1800d5 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoConsumer.java @@ -1,32 +1,36 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.SpectrumEntity.HASH_ALGORITHM; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.ORIGINAL_DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.nio.file.Path; +import java.security.MessageDigest; +import java.util.Arrays; + +import javax.imageio.ImageIO; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.video.Video; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.jcodec.api.awt.AWTSequenceEncoder; import org.junit.jupiter.api.extension.ExtensionContext; import org.openqa.selenium.Dimension; import org.openqa.selenium.WebDriver; -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.nio.file.Path; -import java.security.MessageDigest; -import java.util.Arrays; - -import static io.github.giulong.spectrum.SpectrumEntity.HASH_ALGORITHM; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.ORIGINAL_DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; -import static java.awt.image.BufferedImage.TYPE_INT_RGB; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j @JsonView(Internal.class) public class VideoConsumer extends VideoBaseConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumer.java index 3fceaa1e..4011ea41 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumer.java @@ -1,15 +1,17 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.nio.file.Path; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; -import org.junit.jupiter.api.extension.ExtensionContext; - -import java.nio.file.Path; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import org.junit.jupiter.api.extension.ExtensionContext; @JsonView(Internal.class) public class VideoDynamicConsumer extends VideoConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizer.java index ab29a9e1..427189f9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizer.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.utils.events.video; +import java.nio.file.Path; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.types.TestData; -import java.nio.file.Path; - @JsonView(Internal.class) public class VideoDynamicFinalizer extends VideoFinalizer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumer.java index fb08656c..8fa9396b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumer.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.utils.events.video; +import java.nio.file.Path; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.types.TestData; -import java.nio.file.Path; - @JsonView(Internal.class) public class VideoDynamicInitConsumer extends VideoInitConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizer.java index dddce197..063afaa1 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizer.java @@ -1,20 +1,24 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.net.URL; +import java.nio.file.Path; +import java.util.Objects; + +import javax.imageio.ImageIO; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.jcodec.api.awt.AWTSequenceEncoder; - -import javax.imageio.ImageIO; -import java.net.URL; -import java.nio.file.Path; -import java.util.Objects; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import org.jcodec.api.awt.AWTSequenceEncoder; @Slf4j @JsonView(Internal.class) diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumer.java index 7ec2b513..ca8e7292 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumer.java @@ -1,18 +1,20 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.jcodec.api.awt.AWTSequenceEncoder.createSequenceEncoder; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.nio.file.Path; + import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; + import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import java.nio.file.Path; - -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.jcodec.api.awt.AWTSequenceEncoder.createSequenceEncoder; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; - @Slf4j @JsonView(Internal.class) public class VideoInitConsumer extends VideoBaseConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProvider.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProvider.java index 832e0e75..1597185b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProvider.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProvider.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.utils.file_providers; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Stream; + import com.fasterxml.jackson.databind.InjectableValues; + import io.github.giulong.spectrum.internals.jackson.views.Views; import io.github.giulong.spectrum.internals.jackson.views.Views.Client; + import lombok.Builder; import lombok.extern.slf4j.Slf4j; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Stream; - @Slf4j @Builder public final class ClientFileProvider implements FileProvider { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/FileProvider.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/FileProvider.java index 160c57f8..0b5b112b 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/FileProvider.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/FileProvider.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; + import io.github.giulong.spectrum.internals.jackson.views.Views; public interface FileProvider { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProvider.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProvider.java index 7ddd207e..386ba5e0 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProvider.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProvider.java @@ -1,8 +1,10 @@ package io.github.giulong.spectrum.utils.file_providers; import com.fasterxml.jackson.databind.InjectableValues; + import io.github.giulong.spectrum.internals.jackson.views.Views; import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; + import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/Js.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/Js.java index ca50ac9b..c7c91bdc 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/Js.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/Js.java @@ -1,13 +1,15 @@ package io.github.giulong.spectrum.utils.js; +import static java.util.stream.Collectors.joining; + +import java.util.*; + import io.github.giulong.spectrum.interfaces.WebElementFinder; import io.github.giulong.spectrum.utils.StringUtils; -import lombok.Builder; -import org.openqa.selenium.*; -import java.util.*; +import lombok.Builder; -import static java.util.stream.Collectors.joining; +import org.openqa.selenium.*; @Builder @SuppressWarnings("checkstyle:MultipleStringLiterals") diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandler.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandler.java index b7ee05ec..3672de87 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandler.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandler.java @@ -1,12 +1,5 @@ package io.github.giulong.spectrum.utils.js; -import io.github.giulong.spectrum.enums.LocatorType; -import lombok.Builder; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; -import org.openqa.selenium.*; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.List; @@ -14,6 +7,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.github.giulong.spectrum.enums.LocatorType; + +import lombok.Builder; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; + +import org.jetbrains.annotations.NotNull; +import org.openqa.selenium.*; + @Slf4j @Builder public class JsWebElementInvocationHandler implements WebElement, InvocationHandler { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandler.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandler.java index bd9e77a7..d1b6b7ec 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandler.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandler.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.utils.js; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.util.List; + import lombok.Builder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.openqa.selenium.WebElement; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.util.List; +import org.openqa.selenium.WebElement; @Slf4j @Builder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilder.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilder.java index 8e34d075..571c1a33 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilder.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilder.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.utils.js; -import lombok.Builder; -import org.openqa.selenium.WebElement; - import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Map; import java.util.regex.Pattern; +import lombok.Builder; + +import org.openqa.selenium.WebElement; + @Builder public class JsWebElementProxyBuilder { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/FileReporter.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/FileReporter.java index fb5544d6..da7f7430 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/FileReporter.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/FileReporter.java @@ -1,7 +1,16 @@ package io.github.giulong.spectrum.utils.reporters; +import static java.util.function.Predicate.not; + +import java.awt.*; +import java.io.File; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.interfaces.reports.CanProduceMetadata; import io.github.giulong.spectrum.interfaces.reports.CanReportSummary; import io.github.giulong.spectrum.interfaces.reports.CanReportTestBook; @@ -9,19 +18,12 @@ import io.github.giulong.spectrum.utils.FixedSizeQueue; import io.github.giulong.spectrum.utils.MetadataManager; import io.github.giulong.spectrum.utils.Retention; + import lombok.Generated; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import java.awt.*; -import java.io.File; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.List; - -import static java.util.function.Predicate.not; - @Slf4j @Getter public abstract class FileReporter extends Reporter implements CanProduceMetadata { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/LogReporter.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/LogReporter.java index 10d90bf0..0a9527d6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/LogReporter.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/LogReporter.java @@ -1,8 +1,10 @@ package io.github.giulong.spectrum.utils.reporters; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.interfaces.reports.CanReportSummary; import io.github.giulong.spectrum.interfaces.reports.CanReportTestBook; + import lombok.Generated; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/Reporter.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/Reporter.java index 9ac54c37..2ba64d81 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/Reporter.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/reporters/Reporter.java @@ -1,10 +1,13 @@ package io.github.giulong.spectrum.utils.reporters; import com.fasterxml.jackson.annotation.JsonIgnore; + import io.github.giulong.spectrum.interfaces.reports.CanReport; import io.github.giulong.spectrum.interfaces.reports.Reportable; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; + import lombok.Getter; + import org.jetbrains.annotations.NotNull; @Getter diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/TestBook.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/TestBook.java index fa4e7abb..b7e8f962 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/TestBook.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/TestBook.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.utils.testbook; +import static io.github.giulong.spectrum.enums.Result.*; +import static java.util.function.Function.identity; +import static java.util.stream.Collectors.toMap; + +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.interfaces.SessionHook; import io.github.giulong.spectrum.interfaces.reports.CanReportTestBook; @@ -16,18 +26,10 @@ import io.github.giulong.spectrum.utils.Vars; import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.testbook.parsers.TestBookParser; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import java.nio.file.Path; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; - -import static io.github.giulong.spectrum.enums.Result.*; -import static java.util.function.Function.identity; -import static java.util.stream.Collectors.toMap; - @Getter @Slf4j public class TestBook implements SessionHook, Reportable { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParser.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParser.java index 57ab1794..1951088f 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParser.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParser.java @@ -1,15 +1,16 @@ package io.github.giulong.spectrum.utils.testbook.parsers; -import io.github.giulong.spectrum.pojos.testbook.TestBookTest; -import io.github.giulong.spectrum.utils.FileUtils; -import lombok.extern.slf4j.Slf4j; +import static java.lang.System.lineSeparator; import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static java.lang.System.lineSeparator; +import io.github.giulong.spectrum.pojos.testbook.TestBookTest; +import io.github.giulong.spectrum.utils.FileUtils; + +import lombok.extern.slf4j.Slf4j; @Slf4j public abstract class SimpleTestBookParser extends TestBookParser { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/TestBookParser.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/TestBookParser.java index 36ae8a84..3bf42d8c 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/TestBookParser.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/TestBookParser.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; + +import java.util.List; + import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.github.giulong.spectrum.pojos.testbook.TestBookTest; -import lombok.Getter; -import java.util.List; +import io.github.giulong.spectrum.pojos.testbook.TestBookTest; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; +import lombok.Getter; @JsonTypeInfo(use = NAME, include = WRAPPER_OBJECT) @JsonSubTypes({ diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParser.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParser.java index 8ca6fc03..c0ef1f77 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParser.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParser.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import java.util.List; + import io.github.giulong.spectrum.pojos.testbook.TestBookTest; import io.github.giulong.spectrum.pojos.testbook.TestBookYamlData; import io.github.giulong.spectrum.utils.YamlUtils; -import lombok.extern.slf4j.Slf4j; -import java.util.List; +import lombok.extern.slf4j.Slf4j; @Slf4j public class YamlTestBookParser extends TestBookParser { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparator.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparator.java index 71e96c1b..08a741d2 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparator.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparator.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.utils.tests_comparators; import com.aventstack.extentreports.model.Test; + import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparator.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparator.java index 2cc459fd..c195154e 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparator.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparator.java @@ -1,6 +1,7 @@ package io.github.giulong.spectrum.utils.tests_comparators; import com.aventstack.extentreports.model.Test; + import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparator.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparator.java index a3329841..835c77f8 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparator.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparator.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.tests_comparators; +import static com.aventstack.extentreports.Status.*; + +import java.util.HashMap; +import java.util.Map; + import com.aventstack.extentreports.Status; import com.aventstack.extentreports.model.Test; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import java.util.HashMap; -import java.util.Map; - -import static com.aventstack.extentreports.Status.*; - @Slf4j @Getter public class StatusComparator implements TestsComparator { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/TestsComparator.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/TestsComparator.java index a63c4898..c58f3a4a 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/TestsComparator.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/tests_comparators/TestsComparator.java @@ -1,13 +1,13 @@ package io.github.giulong.spectrum.utils.tests_comparators; -import com.aventstack.extentreports.model.Test; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; +import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; import java.util.Comparator; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; -import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; +import com.aventstack.extentreports.model.Test; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; @JsonTypeInfo(use = NAME, include = WRAPPER_OBJECT) @JsonSubTypes({ diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/video/Video.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/video/Video.java index a11f9fbb..5e8c1cd6 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/video/Video.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/video/Video.java @@ -1,15 +1,17 @@ package io.github.giulong.spectrum.utils.video; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.interfaces.JsonSchemaTypes; import io.github.giulong.spectrum.types.TestData; + import lombok.Generated; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import java.util.List; - @Slf4j @Getter public class Video { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumer.java index cf4fda8b..4d307dd9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumer.java @@ -1,12 +1,13 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import java.util.List; + import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; + import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import java.util.List; - @Slf4j @SuperBuilder public class HighlightElementConsumer extends WebDriverEventConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumer.java index 52bf06ae..ab0947e9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumer.java @@ -1,18 +1,21 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static com.aventstack.extentreports.Status.INFO; +import static com.aventstack.extentreports.Status.WARNING; +import static org.slf4j.event.Level.WARN; + import com.aventstack.extentreports.ExtentTest; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.HtmlUtils; import io.github.giulong.spectrum.utils.StatefulExtentTest; import io.github.giulong.spectrum.utils.video.Video; + import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; -import org.slf4j.event.Level; -import static com.aventstack.extentreports.Status.INFO; -import static com.aventstack.extentreports.Status.WARNING; -import static org.slf4j.event.Level.WARN; +import org.slf4j.event.Level; @Slf4j @SuperBuilder diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumer.java index 496ffdff..6d9dc327 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumer.java @@ -1,21 +1,23 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.openqa.selenium.OutputType.BYTES; + +import java.util.Map; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.utils.HtmlUtils; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.video.Video; + import lombok.experimental.SuperBuilder; import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.extension.ExtensionContext; import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebDriver; -import java.util.Map; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.openqa.selenium.OutputType.BYTES; - @Slf4j @SuperBuilder public class ScreenshotConsumer extends WebDriverEventConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumer.java index bd749969..bb2b54c7 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumer.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.web_driver_events; -import io.github.giulong.spectrum.pojos.events.TestStep; -import lombok.Builder; -import lombok.Getter; -import lombok.experimental.SuperBuilder; +import static java.time.temporal.ChronoUnit.MILLIS; import java.time.Duration; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import static java.time.temporal.ChronoUnit.MILLIS; +import io.github.giulong.spectrum.pojos.events.TestStep; + +import lombok.Builder; +import lombok.Getter; +import lombok.experimental.SuperBuilder; @SuperBuilder public class TestStepBuilderConsumer extends WebDriverEventConsumer { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumer.java index 7cd0ad99..678eb7cd 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumer.java @@ -1,23 +1,26 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static io.github.giulong.spectrum.enums.Result.DISABLED; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.TEST_STEP_BUILDER_CONSUMER; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; + +import java.nio.file.Path; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyDescription; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.FileUtils; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.events.EventsConsumer; + import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.extension.ExtensionContext; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.enums.Result.DISABLED; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.TEST_STEP_BUILDER_CONSUMER; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import org.junit.jupiter.api.extension.ExtensionContext; @Slf4j @Getter diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEvent.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEvent.java index 0653e88d..98c4b828 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEvent.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEvent.java @@ -1,13 +1,15 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import java.util.List; + import io.github.giulong.spectrum.enums.Frame; + import lombok.Builder; import lombok.Getter; + import org.openqa.selenium.WebElement; import org.slf4j.event.Level; -import java.util.List; - @Getter @Builder public class WebDriverEvent { diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventConsumer.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventConsumer.java index a19b2b2f..7e976bf9 100644 --- a/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventConsumer.java +++ b/spectrum/src/main/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventConsumer.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import java.util.function.Consumer; + import lombok.Getter; import lombok.experimental.SuperBuilder; -import java.util.function.Consumer; - @Getter @SuperBuilder public abstract class WebDriverEventConsumer implements Consumer { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumEntityTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumEntityTest.java index ccbd4534..28196c79 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumEntityTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumEntityTest.java @@ -1,15 +1,42 @@ package io.github.giulong.spectrum; +import static com.aventstack.extentreports.Status.*; +import static io.github.giulong.spectrum.SpectrumEntity.HASH_ALGORITHM; +import static io.github.giulong.spectrum.enums.Frame.MANUAL; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; +import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.OutputType.BYTES; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; + import com.aventstack.extentreports.ExtentTest; import com.aventstack.extentreports.MediaEntityBuilder; import com.aventstack.extentreports.Status; import com.aventstack.extentreports.model.Media; + import io.github.giulong.spectrum.interfaces.Shared; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.video.Video; + import lombok.SneakyThrows; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -24,30 +51,6 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Stream; - -import static com.aventstack.extentreports.Status.*; -import static io.github.giulong.spectrum.SpectrumEntity.HASH_ALGORITHM; -import static io.github.giulong.spectrum.enums.Frame.MANUAL; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; -import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; -import static org.openqa.selenium.OutputType.BYTES; - class SpectrumEntityTest { private MockedStatic pathMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumPageTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumPageTest.java index f96c3d0a..205c1995 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumPageTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumPageTest.java @@ -1,5 +1,16 @@ package io.github.giulong.spectrum; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; +import java.time.Duration; +import java.util.List; +import java.util.stream.Stream; + import io.github.giulong.spectrum.interfaces.JsWebElement; import io.github.giulong.spectrum.interfaces.Secured; import io.github.giulong.spectrum.internals.page_factory.SpectrumFieldDecorator; @@ -8,6 +19,7 @@ import io.github.giulong.spectrum.utils.TestContext; import io.github.giulong.spectrum.utils.js.JsWebElementListInvocationHandler; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -21,17 +33,6 @@ import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory; -import java.lang.reflect.Field; -import java.lang.reflect.Proxy; -import java.time.Duration; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class SpectrumPageTest { private MockedStatic pageFactoryMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumSessionListenerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumSessionListenerTest.java index 19eeaa47..4eca27a1 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumSessionListenerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumSessionListenerTest.java @@ -1,10 +1,20 @@ package io.github.giulong.spectrum; +import static io.github.giulong.spectrum.SpectrumSessionListener.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import io.github.giulong.spectrum.types.ProjectProperties; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.environments.Environment; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.testbook.TestBook; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -21,15 +31,6 @@ import org.mockito.MockedStatic; import org.slf4j.bridge.SLF4JBridgeHandler; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.SpectrumSessionListener.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class SpectrumSessionListenerTest { private MockedStatic slf4JBridgeHandlerMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumTestTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumTestTest.java index f5f5e5a9..d0412e58 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumTestTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/SpectrumTestTest.java @@ -1,8 +1,14 @@ package io.github.giulong.spectrum; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import java.time.Duration; +import java.util.List; + import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.ExtentTest; -import net.datafaker.Faker; + import io.github.giulong.spectrum.interfaces.Endpoint; import io.github.giulong.spectrum.interfaces.JsWebElement; import io.github.giulong.spectrum.types.*; @@ -10,7 +16,11 @@ import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.js.Js; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + +import net.datafaker.Faker; + import lombok.Getter; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -24,12 +34,6 @@ import org.openqa.selenium.bidi.module.Network; import org.openqa.selenium.interactions.Actions; -import java.time.Duration; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - class SpectrumTestTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/TestYaml.java b/spectrum/src/test/java/io/github/giulong/spectrum/TestYaml.java index 812aded7..29cf1518 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/TestYaml.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/TestYaml.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum; import com.fasterxml.jackson.annotation.JsonView; + import io.github.giulong.spectrum.internals.jackson.views.Views.Internal; + import lombok.Builder; import lombok.Getter; import lombok.extern.jackson.Jacksonized; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AndroidTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AndroidTest.java index 469261df..51198d60 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AndroidTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AndroidTest.java @@ -1,9 +1,16 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.net.URL; +import java.time.Duration; + import io.appium.java_client.android.AndroidDriver; import io.appium.java_client.android.options.UiAutomator2Options; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,12 +19,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.net.URL; -import java.time.Duration; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class AndroidTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumGenericTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumGenericTest.java index de4c9966..041ead3a 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumGenericTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumGenericTest.java @@ -1,8 +1,16 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + +import java.net.URL; +import java.util.Map; + import io.appium.java_client.AppiumDriver; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,13 +20,6 @@ import org.openqa.selenium.Capabilities; import org.openqa.selenium.MutableCapabilities; -import java.net.URL; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class AppiumGenericTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumTest.java index 44db41c1..b0042f7e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/AppiumTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.drivers; +import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.time.Duration; +import java.util.Map; + import io.appium.java_client.service.local.AppiumServiceBuilder; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -10,15 +20,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.nio.file.Path; -import java.time.Duration; -import java.util.Map; - -import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.*; - class AppiumTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromeTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromeTest.java index 2691bd86..2aea5b1f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromeTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromeTest.java @@ -1,7 +1,17 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; +import static org.openqa.selenium.logging.LogType.*; + +import java.util.List; +import java.util.Map; +import java.util.logging.Level; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,15 +24,6 @@ import org.openqa.selenium.logging.LoggingPreferences; import org.openqa.selenium.remote.service.DriverService; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; -import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; -import static org.openqa.selenium.logging.LogType.*; - class ChromeTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromiumTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromiumTest.java index 8a6a66c6..f3873b74 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromiumTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/ChromiumTest.java @@ -1,7 +1,13 @@ package io.github.giulong.spectrum.drivers; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; + +import java.util.logging.Level; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,11 +17,6 @@ import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.logging.LoggingPreferences; -import java.util.logging.Level; - -import static org.mockito.Mockito.*; -import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; - class ChromiumTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/DriverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/DriverTest.java index 7d4055bd..b21f2eac 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/DriverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/DriverTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.drivers; +import static io.github.giulong.spectrum.drivers.Driver.WEB_DRIVER_THREAD_LOCAL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.environments.Environment; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -14,15 +24,6 @@ import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.support.ThreadGuard; -import java.time.Duration; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -import static io.github.giulong.spectrum.drivers.Driver.WEB_DRIVER_THREAD_LOCAL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class DriverTest { private MockedStatic threadGuardMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EdgeTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EdgeTest.java index d99b97e1..5e980fea 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EdgeTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EdgeTest.java @@ -1,7 +1,17 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; +import static org.openqa.selenium.logging.LogType.*; + +import java.util.List; +import java.util.Map; +import java.util.logging.Level; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,15 +24,6 @@ import org.openqa.selenium.logging.LoggingPreferences; import org.openqa.selenium.remote.service.DriverService; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; -import static org.openqa.selenium.chrome.ChromeOptions.LOGGING_PREFS; -import static org.openqa.selenium.logging.LogType.*; - class EdgeTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EspressoTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EspressoTest.java index 6345a133..3848a716 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EspressoTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/EspressoTest.java @@ -1,8 +1,16 @@ package io.github.giulong.spectrum.drivers; +import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.util.Map; + import io.appium.java_client.android.options.EspressoOptions; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -10,13 +18,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class EspressoTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/FirefoxTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/FirefoxTest.java index 8c81f2b1..6df971e9 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/FirefoxTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/FirefoxTest.java @@ -1,7 +1,15 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.io.File; +import java.util.List; +import java.util.Map; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -13,13 +21,6 @@ import org.openqa.selenium.firefox.GeckoDriverService; import org.openqa.selenium.remote.service.DriverService; -import java.io.File; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class FirefoxTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/Mac2Test.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/Mac2Test.java index 2a319089..0f4c87f5 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/Mac2Test.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/Mac2Test.java @@ -1,9 +1,17 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + +import java.net.URL; +import java.util.Map; + import io.appium.java_client.mac.Mac2Driver; import io.appium.java_client.mac.options.Mac2Options; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,13 +19,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.net.URL; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class Mac2Test { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/SafariTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/SafariTest.java index a0c4ad6b..b85dd09a 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/SafariTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/SafariTest.java @@ -1,7 +1,12 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,10 +19,6 @@ import org.openqa.selenium.safari.SafariDriverService; import org.openqa.selenium.safari.SafariOptions; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class SafariTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/UiAutomator2Test.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/UiAutomator2Test.java index 57b7af9d..3753b923 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/UiAutomator2Test.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/UiAutomator2Test.java @@ -1,8 +1,16 @@ package io.github.giulong.spectrum.drivers; +import static io.github.giulong.spectrum.drivers.Android.APP_CAPABILITY; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.util.Map; + import io.appium.java_client.android.options.UiAutomator2Options; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -10,13 +18,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.drivers.Android.APP_CAPABILITY; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class UiAutomator2Test { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/WindowsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/WindowsTest.java index 89523499..a46e92ca 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/WindowsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/WindowsTest.java @@ -1,9 +1,17 @@ package io.github.giulong.spectrum.drivers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.net.URL; +import java.time.Duration; +import java.util.Map; + import io.appium.java_client.windows.WindowsDriver; import io.appium.java_client.windows.options.WindowsOptions; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,13 +20,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.net.URL; -import java.time.Duration; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class WindowsTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/XCUITestTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/XCUITestTest.java index 1a106e16..b9f6e054 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/drivers/XCUITestTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/drivers/XCUITestTest.java @@ -1,9 +1,18 @@ package io.github.giulong.spectrum.drivers; +import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.net.URL; +import java.nio.file.Path; +import java.util.Map; + import io.appium.java_client.ios.IOSDriver; import io.appium.java_client.ios.options.XCUITestOptions; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,14 +20,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.net.URL; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.drivers.Appium.APP_CAPABILITY; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class XCUITestTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptorTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptorTest.java index 4e20feb3..73dc4f35 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptorTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/interceptors/SpectrumInterceptorTest.java @@ -1,10 +1,28 @@ package io.github.giulong.spectrum.extensions.interceptors; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + import com.aventstack.extentreports.ExtentTest; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -17,22 +35,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.nio.file.Path; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class SpectrumInterceptorTest { private final String className = "className"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolverTest.java index 51670861..ecc839b5 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ActionsResolverTest.java @@ -1,5 +1,10 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -10,11 +15,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.interactions.Actions; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class ActionsResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolverTest.java index 8acd8cad..5b906939 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ConfigurationResolverTest.java @@ -1,6 +1,16 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +import java.util.function.Function; + import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -9,15 +19,6 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.mockito.*; -import java.util.function.Function; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - class ConfigurationResolverTest { private static MockedStatic configurationMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DataResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DataResolverTest.java index 8bbd346d..f31946fd 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DataResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DataResolverTest.java @@ -1,10 +1,26 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.DataResolver.DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +import java.lang.reflect.Parameter; +import java.lang.reflect.Type; +import java.util.function.Function; +import java.util.stream.Stream; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.TestYaml; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.YamlUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.extension.ExtensionContext; @@ -18,21 +34,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.lang.reflect.Parameter; -import java.lang.reflect.Type; -import java.util.function.Function; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.DataResolver.DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - class DataResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolverTest.java index b3b67ac8..7aba2385 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DownloadWaitResolverTest.java @@ -1,7 +1,15 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.time.Duration; + import io.github.giulong.spectrum.types.DownloadWait; +import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -11,13 +19,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.time.Duration; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class DownloadWaitResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolverTest.java index 035357cc..67dc8928 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/DriverResolverTest.java @@ -1,5 +1,18 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.*; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.time.Duration; +import java.util.List; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.internals.web_driver_listeners.AutoWaitWebDriverListener; import io.github.giulong.spectrum.internals.web_driver_listeners.EventsWebDriverListener; @@ -7,6 +20,7 @@ import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.video.Video; import io.github.giulong.spectrum.utils.web_driver_events.*; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -23,19 +37,6 @@ import org.openqa.selenium.support.events.WebDriverListener; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; -import java.util.List; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.*; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class DriverResolverTest { private static MockedStatic eventsListenerMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolverTest.java index e95d6ae9..bef99fc3 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/EventsDispatcherResolverTest.java @@ -1,6 +1,14 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.EventsDispatcherResolver.EVENTS_DISPATCHER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.util.function.Function; + import io.github.giulong.spectrum.utils.events.EventsDispatcher; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,13 +20,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.util.function.Function; - -import static io.github.giulong.spectrum.extensions.resolvers.EventsDispatcherResolver.EVENTS_DISPATCHER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class EventsDispatcherResolverTest { private MockedStatic eventsDispatcherMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolverTest.java index 8ddb1875..7b8ee37c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ExtentReportsResolverTest.java @@ -1,8 +1,17 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ExtentReportsResolver.EXTENT_REPORTS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.util.function.Function; + import com.aventstack.extentreports.ExtentReports; + import io.github.giulong.spectrum.utils.ExtentReporter; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -11,13 +20,6 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.mockito.*; -import java.util.function.Function; - -import static io.github.giulong.spectrum.extensions.resolvers.ExtentReportsResolver.EXTENT_REPORTS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class ExtentReportsResolverTest { private static MockedStatic extentReporterMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolverTest.java index 68e2329f..bda96148 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/FakerResolverTest.java @@ -1,23 +1,25 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.FakerResolver.FAKER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +import java.util.Locale; +import java.util.Random; +import java.util.function.Function; + import io.github.giulong.spectrum.utils.Configuration; + import net.datafaker.Faker; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.mockito.*; -import java.util.Locale; -import java.util.Random; -import java.util.function.Function; - -import static io.github.giulong.spectrum.extensions.resolvers.FakerResolver.FAKER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - class FakerResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolverTest.java index 9bdc5998..1bf2dc52 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ImplicitWaitResolverTest.java @@ -1,7 +1,16 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.ImplicitWaitResolver.IMPLICIT_WAIT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.time.Duration; + import io.github.giulong.spectrum.types.ImplicitWait; +import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -11,14 +20,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.time.Duration; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.ImplicitWaitResolver.IMPLICIT_WAIT; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class ImplicitWaitResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsResolverTest.java index c3e745f1..b5c5ea3e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsResolverTest.java @@ -1,6 +1,13 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + import io.github.giulong.spectrum.utils.js.Js; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -13,12 +20,6 @@ import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class JsResolverTest { private MockedStatic jsMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolverTest.java index 90ffffd4..e4c95575 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/JsWebElementProxyBuilderResolverTest.java @@ -1,8 +1,20 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; +import static io.github.giulong.spectrum.extensions.resolvers.JsWebElementProxyBuilderResolver.JS_WEB_ELEMENT_PROXY_BUILDER; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.lang.reflect.Method; +import java.util.Map; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.js.Js; import io.github.giulong.spectrum.utils.js.JsWebElementProxyBuilder; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -11,17 +23,6 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.mockito.*; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.JsResolver.JS; -import static io.github.giulong.spectrum.extensions.resolvers.JsWebElementProxyBuilderResolver.JS_WEB_ELEMENT_PROXY_BUILDER; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class JsWebElementProxyBuilderResolverTest { private static MockedStatic patternMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolverTest.java index 5c40b1ee..0e0d0092 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/PageLoadWaitResolverTest.java @@ -1,7 +1,15 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.time.Duration; + import io.github.giulong.spectrum.types.PageLoadWait; +import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -11,13 +19,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.time.Duration; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class PageLoadWaitResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolverTest.java index 2de25a4f..1215fee0 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/ScriptWaitResolverTest.java @@ -1,7 +1,15 @@ package io.github.giulong.spectrum.extensions.resolvers; -import io.github.giulong.spectrum.utils.Configuration; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.time.Duration; + import io.github.giulong.spectrum.types.ScriptWait; +import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -11,13 +19,6 @@ import org.mockito.MockedConstruction; import org.openqa.selenium.WebDriver; -import java.time.Duration; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class ScriptWaitResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolverTest.java index bcca8e67..6b52c7e0 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/StatefulExtentTestResolverTest.java @@ -1,9 +1,21 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.stream.Stream; + import com.aventstack.extentreports.ExtentTest; -import io.github.giulong.spectrum.utils.*; + import io.github.giulong.spectrum.types.TestData; +import io.github.giulong.spectrum.utils.*; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -17,16 +29,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.extensions.resolvers.ConfigurationResolver.CONFIGURATION; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class StatefulExtentTestResolverTest { private static MockedStatic extentReporterMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolverTest.java index 8d3cd1e1..ccca3ee2 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestContextResolverTest.java @@ -1,8 +1,13 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.TestContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -11,10 +16,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import static io.github.giulong.spectrum.extensions.resolvers.TestContextResolver.EXTENSION_CONTEXT; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class TestContextResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolverTest.java index 49b4485f..97a0c01b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/TestDataResolverTest.java @@ -1,9 +1,20 @@ package io.github.giulong.spectrum.extensions.resolvers; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; +import java.util.Optional; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.FileUtils; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,16 +23,6 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.mockito.*; -import java.io.IOException; -import java.nio.file.Path; -import java.util.List; -import java.util.Optional; - -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class TestDataResolverTest { private static MockedStatic testDataMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolverTest.java index 62283356..46e48bac 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BiDiTypeBasedParameterResolverTest.java @@ -1,8 +1,20 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.lang.reflect.Parameter; +import java.util.stream.Stream; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import lombok.Getter; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -16,16 +28,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.HasBiDi; -import java.lang.reflect.Parameter; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class BiDiTypeBasedParameterResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolverTest.java index 87a24be1..e2c1ea7d 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextInspectorResolverTest.java @@ -1,5 +1,8 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -8,9 +11,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.BrowsingContextInspector; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; - class BrowsingContextInspectorResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolverTest.java index 727e2d5d..b3a3e3ce 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/BrowsingContextResolverTest.java @@ -1,5 +1,9 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -8,10 +12,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.browsingcontext.BrowsingContext; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class BrowsingContextResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolverTest.java index 5e2ba51b..6aba7a8c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/LogInspectorResolverTest.java @@ -1,5 +1,8 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -8,9 +11,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.LogInspector; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; - class LogInspectorResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolverTest.java index 92670f40..81b9db8f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/resolvers/bidi/NetworkResolverTest.java @@ -1,5 +1,8 @@ package io.github.giulong.spectrum.extensions.resolvers.bidi; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -8,9 +11,6 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.bidi.module.Network; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; - class NetworkResolverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcherTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcherTest.java index 2e9079df..4ebfe784 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcherTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/extensions/watchers/EventsWatcherTest.java @@ -1,8 +1,19 @@ package io.github.giulong.spectrum.extensions.watchers; +import static io.github.giulong.spectrum.enums.Result.*; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.events.EventsDispatcher; + import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; @@ -12,16 +23,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.*; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class EventsWatcherTest { private static MockedStatic eventsDispatcherMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/interfaces/BiDiDriverTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/interfaces/BiDiDriverTest.java index d5ace2df..1a6d6ef8 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/interfaces/BiDiDriverTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/interfaces/BiDiDriverTest.java @@ -1,7 +1,13 @@ package io.github.giulong.spectrum.interfaces; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.stream.Stream; + import io.github.giulong.spectrum.drivers.Chrome; import io.github.giulong.spectrum.utils.Configuration; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -10,11 +16,6 @@ import org.mockito.Mock; import org.openqa.selenium.chrome.ChromeOptions; -import java.util.stream.Stream; - -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class BiDiDriverTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/AppiumLogTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/AppiumLogTest.java index 6b22b945..46bcd322 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/AppiumLogTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/AppiumLogTest.java @@ -1,6 +1,12 @@ package io.github.giulong.spectrum.internals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.util.List; + import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -10,11 +16,6 @@ import org.mockito.MockedConstruction; import org.slf4j.event.Level; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class AppiumLogTest { private static final String LOG_MESSAGE = "log message"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/ColoredConverterTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/ColoredConverterTest.java index 44eb6f60..31bb2ec2 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/ColoredConverterTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/ColoredConverterTest.java @@ -1,7 +1,16 @@ package io.github.giulong.spectrum.internals; +import static ch.qos.logback.classic.Level.*; +import static ch.qos.logback.core.pattern.color.ANSIConstants.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.util.stream.Stream; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -9,14 +18,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.stream.Stream; - -import static ch.qos.logback.classic.Level.*; -import static ch.qos.logback.core.pattern.color.ANSIConstants.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class ColoredConverterTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/DriverLogTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/DriverLogTest.java index 8f6792b8..f02b8f19 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/DriverLogTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/DriverLogTest.java @@ -1,6 +1,12 @@ package io.github.giulong.spectrum.internals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.util.List; + import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -10,11 +16,6 @@ import org.mockito.MockedConstruction; import org.slf4j.event.Level; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - class DriverLogTest { private static final String LOG_MESSAGE = "log message"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializerTest.java index dfc3d697..d005eb55 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/ClassDeserializerTest.java @@ -1,17 +1,18 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; - class ClassDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializerTest.java index fbb6534c..0ae9f065 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DriverDeserializerTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.stream.Stream; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.drivers.*; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -11,14 +21,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class DriverDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializerTest.java index 96c5f3f6..d484426b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DurationDeserializerTest.java @@ -1,19 +1,20 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.time.Duration; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.time.Duration; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.when; - class DurationDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializerTest.java index a0a4ad2e..2f0a4545 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/DynamicDeserializerTest.java @@ -1,10 +1,18 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; + import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.YamlUtils; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -13,12 +21,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - class DynamicDeserializerTest { private static MockedStatic yamlUtilsMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializerTest.java index e0f918b3..836dd838 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/EnvironmentDeserializerTest.java @@ -1,11 +1,21 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.stream.Stream; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.utils.environments.AppiumEnvironment; import io.github.giulong.spectrum.utils.environments.Environment; import io.github.giulong.spectrum.utils.environments.GridEnvironment; import io.github.giulong.spectrum.utils.environments.LocalEnvironment; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -14,14 +24,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class EnvironmentDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializerTest.java index 9982c5ce..49ac62e3 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedBooleanDeserializerTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.stream.Stream; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.utils.Vars; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; @@ -13,14 +23,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class InterpolatedBooleanDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializerTest.java index 41dcc4a8..b28cd614 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedObjectDeserializerTest.java @@ -1,12 +1,28 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static com.fasterxml.jackson.databind.node.JsonNodeType.*; +import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeType; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; + import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.Vars; + import org.junit.jupiter.api.*; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -17,20 +33,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import static com.fasterxml.jackson.databind.node.JsonNodeType.*; -import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - class InterpolatedObjectDeserializerTest { private static final String VAR_IN_ENV = "456"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializerTest.java index 79c16b18..95fbc9d1 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/InterpolatedStringDeserializerTest.java @@ -1,8 +1,20 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.stream.Stream; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import io.github.giulong.spectrum.utils.Vars; + import org.junit.jupiter.api.*; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -10,16 +22,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.util.stream.Stream; - -import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class InterpolatedStringDeserializerTest { private static final String VAR_IN_ENV = "varInEnv"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializerTest.java index 103720cf..10a910a3 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/LogbackLogLevelDeserializerTest.java @@ -1,8 +1,19 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static ch.qos.logback.classic.Level.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.stream.Stream; + import ch.qos.logback.classic.Level; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -11,15 +22,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.util.stream.Stream; - -import static ch.qos.logback.classic.Level.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class LogbackLogLevelDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializerTest.java index 68fa1a44..be7703d4 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/RandomDeserializerTest.java @@ -1,21 +1,22 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Random; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.io.IOException; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class RandomDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializerTest.java index d2ad93f9..db6a6464 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/jackson/deserializers/UtilLogLevelDeserializerTest.java @@ -1,19 +1,20 @@ package io.github.giulong.spectrum.internals.jackson.deserializers; +import static java.util.logging.Level.INFO; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.when; + +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; - -import static java.util.logging.Level.INFO; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.when; - class UtilLogLevelDeserializerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecoratorTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecoratorTest.java index 4c327044..9fb4e99b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecoratorTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumFieldDecoratorTest.java @@ -1,6 +1,13 @@ package io.github.giulong.spectrum.internals.page_factory; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import java.lang.reflect.*; +import java.util.List; + import io.github.giulong.spectrum.interfaces.Secured; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.*; @@ -12,12 +19,6 @@ import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; import org.openqa.selenium.support.pagefactory.internal.LocatingElementListHandler; -import java.lang.reflect.*; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - class SpectrumFieldDecoratorTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandlerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandlerTest.java index bcc695c1..896d5b61 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandlerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/page_factory/SpectrumLocatingElementHandlerTest.java @@ -1,6 +1,15 @@ package io.github.giulong.spectrum.internals.page_factory; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Method; + import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -13,14 +22,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.pagefactory.ElementLocator; -import java.lang.reflect.Method; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.when; - class SpectrumLocatingElementHandlerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListenerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListenerTest.java index 9ba04abf..21bd649c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListenerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/AutoWaitWebDriverListenerTest.java @@ -1,5 +1,11 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.support.ui.ExpectedConditions.*; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -18,12 +24,6 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.mockito.Mockito.*; -import static org.openqa.selenium.support.ui.ExpectedConditions.*; - class AutoWaitWebDriverListenerTest { private MockedStatic expectedConditionsMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListenerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListenerTest.java index e1b3161b..3ab25773 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListenerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/EventsWebDriverListenerTest.java @@ -1,12 +1,25 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; +import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import static org.slf4j.event.Level.*; + +import java.util.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; + import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Configuration.Drivers.Event; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.web_driver_events.WebDriverEvent; import io.github.giulong.spectrum.utils.web_driver_events.WebDriverEventConsumer; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -20,17 +33,6 @@ import org.openqa.selenium.WebElement; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; -import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; -import static org.slf4j.event.Level.*; - class EventsWebDriverListenerTest { private static MockedStatic webDriverEventMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListenerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListenerTest.java index bd921766..ce050748 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListenerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/internals/web_driver_listeners/SpectrumWebDriverListenerTest.java @@ -1,6 +1,15 @@ package io.github.giulong.spectrum.internals.web_driver_listeners; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; + import lombok.experimental.SuperBuilder; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -10,14 +19,6 @@ import org.mockito.Mock; import org.openqa.selenium.WebElement; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class SpectrumWebDriverListenerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ConfigurationTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ConfigurationTest.java index e981be08..1d243ff0 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ConfigurationTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ConfigurationTest.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertSame; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertSame; - class ConfigurationTest { @Test diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ContextManagerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ContextManagerTest.java index 6d2cb7c7..48ba9432 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ContextManagerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ContextManagerTest.java @@ -1,5 +1,13 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; @@ -7,14 +15,6 @@ import org.mockito.Mock; import org.mockito.MockedConstruction; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.*; - class ContextManagerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java index e84dac7c..72f72118 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java @@ -1,5 +1,26 @@ package io.github.giulong.spectrum.utils; +import static com.aventstack.extentreports.Status.*; +import static com.aventstack.extentreports.markuputils.ExtentColor.*; +import static com.aventstack.extentreports.markuputils.MarkupHelper.createLabel; +import static com.aventstack.extentreports.reporter.configuration.Theme.DARK; +import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Stream; + import com.aventstack.extentreports.ExtentReports; import com.aventstack.extentreports.ExtentTest; import com.aventstack.extentreports.Status; @@ -8,11 +29,14 @@ import com.aventstack.extentreports.model.Report; import com.aventstack.extentreports.reporter.ExtentSparkReporter; import com.aventstack.extentreports.reporter.configuration.ExtentSparkReporterConfig; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.tests_comparators.TestsComparator; import io.github.giulong.spectrum.utils.video.Video; + import lombok.SneakyThrows; + import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.ParameterizedTest; @@ -21,27 +45,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.*; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Stream; - -import static com.aventstack.extentreports.Status.*; -import static com.aventstack.extentreports.markuputils.ExtentColor.*; -import static com.aventstack.extentreports.markuputils.MarkupHelper.createLabel; -import static com.aventstack.extentreports.reporter.configuration.Theme.DARK; -import static io.github.giulong.spectrum.extensions.resolvers.StatefulExtentTestResolver.STATEFUL_EXTENT_TEST; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class ExtentReporterTest { private static final String REPORT_FOLDER = "reportFolder"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FileUtilsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FileUtilsTest.java index 9b9ce610..b1c66a3e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FileUtilsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FileUtilsTest.java @@ -1,5 +1,20 @@ package io.github.giulong.spectrum.utils; +import static java.lang.System.lineSeparator; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.FileTime; +import java.util.stream.Stream; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -11,21 +26,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.attribute.FileTime; -import java.util.stream.Stream; - -import static java.lang.System.lineSeparator; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class FileUtilsTest { private static MockedStatic filesMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FixedSizeQueueTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FixedSizeQueueTest.java index 0f98873f..dd1ac549 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FixedSizeQueueTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FixedSizeQueueTest.java @@ -1,5 +1,13 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.stream.Stream; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -8,14 +16,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; - class FixedSizeQueueTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FreeMarkerWrapperTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FreeMarkerWrapperTest.java index 5033ad96..974708f5 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/FreeMarkerWrapperTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/FreeMarkerWrapperTest.java @@ -1,14 +1,9 @@ package io.github.giulong.spectrum.utils; -import freemarker.template.Template; -import freemarker.template.TemplateException; -import freemarker.template.Version; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockedConstruction; +import static java.util.Locale.US; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.*; import java.io.IOException; import java.io.StringReader; @@ -16,10 +11,16 @@ import java.io.Writer; import java.util.Map; -import static java.util.Locale.US; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedConstruction; + +import freemarker.template.Template; +import freemarker.template.TemplateException; +import freemarker.template.Version; class FreeMarkerWrapperTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/HtmlUtilsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/HtmlUtilsTest.java index 2af33c8b..1ff68d16 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/HtmlUtilsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/HtmlUtilsTest.java @@ -1,18 +1,5 @@ package io.github.giulong.spectrum.utils; -import io.github.giulong.spectrum.types.TestData; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.*; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.matchesPattern; @@ -21,6 +8,20 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.Map; + +import io.github.giulong.spectrum.types.TestData; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.*; + class HtmlUtilsTest { private MockedStatic pathMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/JsonUtilsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/JsonUtilsTest.java index ca563191..d75be4b3 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/JsonUtilsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/JsonUtilsTest.java @@ -1,23 +1,24 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.File; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.json.JsonMapper; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.File; -import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - class JsonUtilsTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/MetadataManagerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/MetadataManagerTest.java index aac8b105..fd06549d 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/MetadataManagerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/MetadataManagerTest.java @@ -1,9 +1,20 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.*; + +import java.io.File; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import io.github.giulong.spectrum.types.ProjectProperties; import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.reporters.LogReporter; import io.github.giulong.spectrum.utils.testbook.TestBook; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -13,16 +24,6 @@ import org.mockito.MockedConstruction; import org.mockito.MockedStatic; -import java.io.File; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.*; - class MetadataManagerTest { private static MockedStatic pathMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ReflectionsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ReflectionsTest.java index 0f0bb856..01a2374b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ReflectionsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ReflectionsTest.java @@ -1,19 +1,21 @@ package io.github.giulong.spectrum.utils; -import io.github.giulong.spectrum.interfaces.Secured; -import lombok.NoArgsConstructor; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; +import io.github.giulong.spectrum.interfaces.Secured; + +import lombok.NoArgsConstructor; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.*; class ReflectionsTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/RetentionTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/RetentionTest.java index 8b36f3a2..686d436e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/RetentionTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/RetentionTest.java @@ -1,6 +1,22 @@ package io.github.giulong.spectrum.utils; +import static java.lang.Integer.MAX_VALUE; +import static java.time.ZoneId.systemDefault; +import static java.time.temporal.ChronoUnit.DAYS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.attribute.FileTime; +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Stream; + import lombok.SneakyThrows; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,21 +28,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.io.File; -import java.nio.file.Files; -import java.nio.file.attribute.FileTime; -import java.time.Instant; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Stream; - -import static java.lang.Integer.MAX_VALUE; -import static java.time.ZoneId.systemDefault; -import static java.time.temporal.ChronoUnit.DAYS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class RetentionTest { private static MockedStatic filesMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/StatefulExtentTestTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/StatefulExtentTestTest.java index d5ae7667..51dcdd3c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/StatefulExtentTestTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/StatefulExtentTestTest.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + import com.aventstack.extentreports.ExtentTest; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; - class StatefulExtentTestTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/StringUtilsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/StringUtilsTest.java index 7ebcb612..75cf379c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/StringUtilsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/StringUtilsTest.java @@ -1,11 +1,11 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.*; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import static org.junit.jupiter.api.Assertions.*; - @DisplayName("StringUtils") public class StringUtilsTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/SummaryTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/SummaryTest.java index 84c91110..015536e1 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/SummaryTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/SummaryTest.java @@ -1,9 +1,23 @@ package io.github.giulong.spectrum.utils; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.interfaces.reports.CanReportSummary; import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.reporters.Reporter; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -17,19 +31,6 @@ import org.mockito.*; import org.mvel2.MVEL; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class SummaryTest { private static MockedStatic mvelMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/TestContextTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/TestContextTest.java index 9173337f..ffc0c417 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/TestContextTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/TestContextTest.java @@ -1,18 +1,18 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Map; +import java.util.function.Function; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.Map; -import java.util.function.Function; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - class TestContextTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/VarsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/VarsTest.java index 5748239a..fa4f9795 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/VarsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/VarsTest.java @@ -1,10 +1,10 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.assertSame; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertSame; - class VarsTest { @Test diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/YamlUtilsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/YamlUtilsTest.java index ac0766ce..6c7547b5 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/YamlUtilsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/YamlUtilsTest.java @@ -1,13 +1,25 @@ package io.github.giulong.spectrum.utils; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Objects; +import java.util.Set; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; + import io.github.giulong.spectrum.TestYaml; import io.github.giulong.spectrum.utils.file_providers.FileProvider; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -15,16 +27,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.io.IOException; -import java.io.InputStream; -import java.util.Objects; -import java.util.Set; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - class YamlUtilsTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironmentTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironmentTest.java index edbf0e09..e5dc7b10 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironmentTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/AppiumEnvironmentTest.java @@ -1,5 +1,13 @@ package io.github.giulong.spectrum.utils.environments; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; +import static org.slf4j.event.Level.INFO; + +import java.io.IOException; +import java.net.*; +import java.util.Map; + import io.appium.java_client.AppiumDriver; import io.appium.java_client.service.local.AppiumDriverLocalService; import io.appium.java_client.service.local.AppiumServiceBuilder; @@ -7,6 +15,7 @@ import io.github.giulong.spectrum.internals.AppiumLog; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -17,14 +26,6 @@ import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.LocalFileDetector; -import java.io.IOException; -import java.net.*; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; -import static org.slf4j.event.Level.INFO; - class AppiumEnvironmentTest { private MockedStatic appiumDriverLocalServiceMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/GridEnvironmentTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/GridEnvironmentTest.java index d168f9ed..99f71b38 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/GridEnvironmentTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/GridEnvironmentTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.utils.environments; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.Map; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -15,15 +25,6 @@ import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.RemoteWebDriverBuilder; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - class GridEnvironmentTest { private MockedStatic remoteWebDriverMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/LocalEnvironmentTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/LocalEnvironmentTest.java index e221dd03..e0b7f1dc 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/LocalEnvironmentTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/environments/LocalEnvironmentTest.java @@ -1,10 +1,16 @@ package io.github.giulong.spectrum.utils.environments; +import static io.github.giulong.spectrum.utils.environments.LocalEnvironment.DRIVER_SERVICE_THREAD_LOCAL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; +import static org.slf4j.event.Level.DEBUG; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.internals.DriverLog; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Configuration.Drivers.Logs; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -17,11 +23,6 @@ import org.openqa.selenium.remote.RemoteWebDriverBuilder; import org.openqa.selenium.remote.service.DriverService; -import static io.github.giulong.spectrum.utils.environments.LocalEnvironment.DRIVER_SERVICE_THREAD_LOCAL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; -import static org.slf4j.event.Level.DEBUG; - class LocalEnvironmentTest { private MockedStatic remoteWebDriverMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/DriverConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/DriverConsumerTest.java index f2ada19a..2a4f11cd 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/DriverConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/DriverConsumerTest.java @@ -1,11 +1,23 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.*; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.BrowsingContextInspectorResolver.BROWSING_CONTEXT_INSPECTOR; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.LogInspectorResolver.LOG_INSPECTOR; +import static io.github.giulong.spectrum.extensions.resolvers.bidi.NetworkResolver.NETWORK; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.stream.Stream; + import io.github.giulong.spectrum.drivers.Driver; import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.environments.LocalEnvironment; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -19,17 +31,6 @@ import org.openqa.selenium.bidi.module.LogInspector; import org.openqa.selenium.bidi.module.Network; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.*; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.BrowsingContextInspectorResolver.BROWSING_CONTEXT_INSPECTOR; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.LogInspectorResolver.LOG_INSPECTOR; -import static io.github.giulong.spectrum.extensions.resolvers.bidi.NetworkResolver.NETWORK; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class DriverConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsConsumerTest.java index 7bea1f98..ca160459 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsConsumerTest.java @@ -1,8 +1,20 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -10,17 +22,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.InjectMocks; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class EventsConsumerTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsDispatcherTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsDispatcherTest.java index bff1ac2c..68515d08 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsDispatcherTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/EventsDispatcherTest.java @@ -1,10 +1,20 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.Summary; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -14,15 +24,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static io.github.giulong.spectrum.utils.events.EventsDispatcher.*; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Mockito.*; - class EventsDispatcherTest { private final String primaryId = "primaryId"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumerTest.java index 413c9471..ff1bf4d0 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/ExtentTestConsumerTest.java @@ -1,8 +1,12 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static org.mockito.Mockito.*; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.ExtentReporter; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,9 +16,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static org.mockito.Mockito.*; - class ExtentTestConsumerTest { private static MockedStatic extentReporterMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/LogConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/LogConsumerTest.java index 97ac7504..a70c032a 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/LogConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/LogConsumerTest.java @@ -1,18 +1,19 @@ package io.github.giulong.spectrum.utils.events; +import static org.mockito.Mockito.when; + +import java.util.Map; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.Map; - -import static org.mockito.Mockito.when; - class LogConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/MailConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/MailConsumerTest.java index 041a4953..c5ecfb8f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/MailConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/MailConsumerTest.java @@ -1,10 +1,16 @@ package io.github.giulong.spectrum.utils.events; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.Map; + import io.github.giulong.spectrum.pojos.events.Attachment; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.Reflections; -import jakarta.activation.FileDataSource; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -17,11 +23,7 @@ import org.simplejavamail.email.EmailBuilder; import org.simplejavamail.mailer.MailerBuilder; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; +import jakarta.activation.FileDataSource; class MailConsumerTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/SlackConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/SlackConsumerTest.java index d6ec3fb6..ae0b0f42 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/SlackConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/SlackConsumerTest.java @@ -1,12 +1,21 @@ package io.github.giulong.spectrum.utils.events; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.Mockito.*; + +import java.io.IOException; +import java.util.Map; + import com.slack.api.Slack; import com.slack.api.methods.MethodsClient; import com.slack.api.methods.SlackApiException; import com.slack.api.methods.request.chat.ChatPostMessageRequest; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -15,13 +24,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.io.IOException; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.*; - class SlackConsumerTest { private static MockedStatic slackMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/TestBookConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/TestBookConsumerTest.java index 717c60b1..0b6d2b0e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/TestBookConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/TestBookConsumerTest.java @@ -1,5 +1,10 @@ package io.github.giulong.spectrum.utils.events; +import static io.github.giulong.spectrum.enums.Result.FAILED; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; @@ -7,6 +12,7 @@ import io.github.giulong.spectrum.utils.ContextManager; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.testbook.TestBook; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,11 +20,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import static io.github.giulong.spectrum.enums.Result.FAILED; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - class TestBookConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumerTest.java index af7b5c2d..5c87f30f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoBaseConsumerTest.java @@ -1,11 +1,22 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.enums.Result.DISABLED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.when; + +import java.nio.file.Path; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -15,16 +26,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.nio.file.Path; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.DISABLED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.when; - class VideoBaseConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoConsumerTest.java index c338e1a0..6212fe08 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoConsumerTest.java @@ -1,10 +1,32 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.ORIGINAL_DRIVER; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.security.MessageDigest; +import java.util.Map; +import java.util.stream.Stream; + +import javax.imageio.ImageIO; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.video.Video; + import org.jcodec.api.awt.AWTSequenceEncoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -18,26 +40,6 @@ import org.openqa.selenium.Dimension; import org.openqa.selenium.WebDriver; -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.security.MessageDigest; -import java.util.Map; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.ORIGINAL_DRIVER; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; -import static java.awt.image.BufferedImage.TYPE_INT_RGB; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class VideoConsumerTest { private static final int WIDTH = 11; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumerTest.java index 79aed546..ad4a926f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicConsumerTest.java @@ -1,10 +1,22 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.enums.Result.DISABLED; +import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.security.MessageDigest; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Configuration; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,17 +26,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.nio.file.Path; -import java.security.MessageDigest; - -import static io.github.giulong.spectrum.enums.Result.DISABLED; -import static io.github.giulong.spectrum.enums.Result.SUCCESSFUL; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.*; - class VideoDynamicConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizerTest.java index 13d5cdc8..d3cdcd28 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicFinalizerTest.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.events.video; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +import java.nio.file.Path; + import io.github.giulong.spectrum.types.TestData; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.nio.file.Path; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; - class VideoDynamicFinalizerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumerTest.java index 9a91a929..72edc9f4 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoDynamicInitConsumerTest.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.events.video; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +import java.nio.file.Path; + import io.github.giulong.spectrum.types.TestData; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.nio.file.Path; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; - class VideoDynamicInitConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizerTest.java index 295c8139..88355431 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoFinalizerTest.java @@ -1,7 +1,22 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Path; +import java.util.Map; + +import javax.imageio.ImageIO; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; + import org.jcodec.api.awt.AWTSequenceEncoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -10,19 +25,6 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.mockito.*; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class VideoFinalizerTest { private MockedStatic imageIOMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumerTest.java index c25559c2..7ae280d7 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/events/video/VideoInitConsumerTest.java @@ -1,7 +1,15 @@ package io.github.giulong.spectrum.utils.events.video; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.util.Map; + import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.types.TestData; + import org.jcodec.api.awt.AWTSequenceEncoder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -12,13 +20,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.nio.file.Path; -import java.util.Map; - -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.Mockito.*; - class VideoInitConsumerTest { private MockedStatic awtSequenceEncoderMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProviderTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProviderTest.java index c82aafaf..e29d948c 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProviderTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/ClientFileProviderTest.java @@ -1,7 +1,20 @@ package io.github.giulong.spectrum.utils.file_providers; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Stream; + import com.fasterxml.jackson.databind.InjectableValues; + import io.github.giulong.spectrum.internals.jackson.views.Views; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -10,17 +23,6 @@ import org.mockito.InjectMocks; import org.mockito.MockedConstruction; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class ClientFileProviderTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/FileProviderTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/FileProviderTest.java index 92babc9f..c7797cba 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/FileProviderTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/FileProviderTest.java @@ -1,18 +1,21 @@ package io.github.giulong.spectrum.utils.file_providers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; + import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; + import io.github.giulong.spectrum.internals.jackson.views.Views; + import lombok.AllArgsConstructor; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; - class FileProviderTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProviderTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProviderTest.java index ce4f274a..8294c003 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProviderTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/file_providers/InternalFileProviderTest.java @@ -1,16 +1,18 @@ package io.github.giulong.spectrum.utils.file_providers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.when; + import com.fasterxml.jackson.databind.InjectableValues; + import io.github.giulong.spectrum.internals.jackson.views.Views; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.MockedConstruction; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mockConstruction; -import static org.mockito.Mockito.when; - class InternalFileProviderTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsTest.java index 7ff896d4..dc83f40f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsTest.java @@ -1,8 +1,15 @@ package io.github.giulong.spectrum.utils.js; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import java.util.Arrays; +import java.util.List; + import io.github.giulong.spectrum.interfaces.WebElementFinder; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.StringUtils; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -12,12 +19,6 @@ import org.mockito.Mock; import org.openqa.selenium.*; -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - class JsTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandlerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandlerTest.java index b01306c6..51543990 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandlerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementInvocationHandlerTest.java @@ -1,13 +1,9 @@ package io.github.giulong.spectrum.utils.js; -import io.github.giulong.spectrum.enums.LocatorType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.openqa.selenium.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.OutputType.BYTES; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -16,10 +12,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; -import static org.openqa.selenium.OutputType.BYTES; +import io.github.giulong.spectrum.enums.LocatorType; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.openqa.selenium.*; class JsWebElementInvocationHandlerTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandlerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandlerTest.java index b1bd3b83..7e51c1d4 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandlerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementListInvocationHandlerTest.java @@ -1,5 +1,14 @@ package io.github.giulong.spectrum.utils.js; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -8,15 +17,6 @@ import org.mockito.Mock; import org.openqa.selenium.WebElement; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - class JsWebElementListInvocationHandlerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilderTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilderTest.java index 48573eb0..5b3549d7 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilderTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/js/JsWebElementProxyBuilderTest.java @@ -1,21 +1,21 @@ package io.github.giulong.spectrum.utils.js; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.*; -import org.openqa.selenium.WebElement; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Map; import java.util.regex.Pattern; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.*; +import org.openqa.selenium.WebElement; class JsWebElementProxyBuilderTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/FileReporterTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/FileReporterTest.java index f7a09aaa..2a12ee78 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/FileReporterTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/FileReporterTest.java @@ -1,11 +1,7 @@ package io.github.giulong.spectrum.utils.reporters; -import io.github.giulong.spectrum.utils.*; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; import java.awt.*; import java.io.File; @@ -16,8 +12,13 @@ import java.util.List; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; +import io.github.giulong.spectrum.utils.*; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.*; class FileReporterTest { diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/ReporterTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/ReporterTest.java index f1c5f4de..92f12577 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/ReporterTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/reporters/ReporterTest.java @@ -1,20 +1,22 @@ package io.github.giulong.spectrum.utils.reporters; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import java.util.Map; + import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.testbook.TestBook; + import lombok.Getter; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; - class ReporterTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/TestBookUnitTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/TestBookUnitTest.java index bf6f2fc7..64037a64 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/TestBookUnitTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/TestBookUnitTest.java @@ -1,5 +1,15 @@ package io.github.giulong.spectrum.utils.testbook; +import static io.github.giulong.spectrum.enums.Result.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.*; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.interfaces.reports.CanReportTestBook; import io.github.giulong.spectrum.pojos.testbook.QualityGate; @@ -13,6 +23,7 @@ import io.github.giulong.spectrum.utils.reporters.FileReporter; import io.github.giulong.spectrum.utils.reporters.Reporter; import io.github.giulong.spectrum.utils.testbook.parsers.TestBookParser; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -24,16 +35,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.util.*; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class TestBookUnitTest { private MockedStatic freeMarkerWrapperMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/CsvTestBookParserTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/CsvTestBookParserTest.java index 8dbe69ef..51920757 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/CsvTestBookParserTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/CsvTestBookParserTest.java @@ -1,7 +1,12 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + import io.github.giulong.spectrum.utils.FileUtils; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -12,10 +17,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - class CsvTestBookParserTest { private MockedStatic fileUtilsMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParserTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParserTest.java index cbf25eb2..a461e4a9 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParserTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/SimpleTestBookParserTest.java @@ -1,15 +1,16 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; + import io.github.giulong.spectrum.pojos.testbook.TestBookTest; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - class SimpleTestBookParserTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/TxtTestBookParserTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/TxtTestBookParserTest.java index 0754f5d0..c397111f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/TxtTestBookParserTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/TxtTestBookParserTest.java @@ -1,7 +1,12 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + import io.github.giulong.spectrum.utils.FileUtils; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -12,10 +17,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - class TxtTestBookParserTest { private MockedStatic fileUtilsMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParserTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParserTest.java index 7cfe08c4..004abb8e 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParserTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/testbook/parsers/YamlTestBookParserTest.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.testbook.parsers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + import io.github.giulong.spectrum.pojos.testbook.TestBookTest; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - class YamlTestBookParserTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparatorTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparatorTest.java index 99ca4f66..50fb5b75 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparatorTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NameComparatorTest.java @@ -1,5 +1,11 @@ package io.github.giulong.spectrum.utils.tests_comparators; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.util.stream.Stream; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -7,12 +13,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class NameComparatorTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparatorTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparatorTest.java index 2359948d..ddebe84b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparatorTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/NoOpComparatorTest.java @@ -1,12 +1,12 @@ package io.github.giulong.spectrum.utils.tests_comparators; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.junit.jupiter.api.Assertions.assertEquals; - class NoOpComparatorTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparatorTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparatorTest.java index 148a1d67..7b7c638f 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparatorTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/tests_comparators/StatusComparatorTest.java @@ -1,6 +1,15 @@ package io.github.giulong.spectrum.utils.tests_comparators; +import static com.aventstack.extentreports.Status.FAIL; +import static com.aventstack.extentreports.Status.PASS; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.when; + +import java.util.stream.Stream; + import com.aventstack.extentreports.Status; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -8,14 +17,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.stream.Stream; - -import static com.aventstack.extentreports.Status.FAIL; -import static com.aventstack.extentreports.Status.PASS; -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.when; - class StatusComparatorTest { @InjectMocks diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/video/VideoTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/video/VideoTest.java index 1249ea9c..509a9d3d 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/video/VideoTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/video/VideoTest.java @@ -1,8 +1,18 @@ package io.github.giulong.spectrum.utils.video; +import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; +import static io.github.giulong.spectrum.enums.Frame.MANUAL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.util.List; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -10,15 +20,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; -import java.util.List; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; -import static io.github.giulong.spectrum.enums.Frame.MANUAL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class VideoTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumerTest.java index ef898642..56e7a125 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HighlightElementConsumerTest.java @@ -1,6 +1,12 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; + import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -8,11 +14,6 @@ import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import java.util.List; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - class HighlightElementConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumerTest.java index 39b2f29f..d2867cfd 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/HtmlReportConsumerTest.java @@ -1,11 +1,19 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static com.aventstack.extentreports.Status.INFO; +import static com.aventstack.extentreports.Status.WARNING; +import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; +import static org.mockito.Mockito.*; +import static org.slf4j.event.Level.WARN; + import com.aventstack.extentreports.ExtentTest; + import io.github.giulong.spectrum.types.TestData; import io.github.giulong.spectrum.utils.HtmlUtils; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.StatefulExtentTest; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -15,12 +23,6 @@ import org.mockito.Mock; import org.slf4j.event.Level; -import static com.aventstack.extentreports.Status.INFO; -import static com.aventstack.extentreports.Status.WARNING; -import static io.github.giulong.spectrum.enums.Frame.AUTO_BEFORE; -import static org.mockito.Mockito.*; -import static org.slf4j.event.Level.WARN; - class HtmlReportConsumerTest { private final String message = "message"; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/LogConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/LogConsumerTest.java index 132cd977..a7372823 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/LogConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/LogConsumerTest.java @@ -1,13 +1,13 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static org.mockito.Mockito.when; +import static org.slf4j.event.Level.INFO; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import static org.mockito.Mockito.when; -import static org.slf4j.event.Level.INFO; - class LogConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumerTest.java index 70279d97..0a850df9 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/ScreenshotConsumerTest.java @@ -1,10 +1,21 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; +import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; +import static org.openqa.selenium.OutputType.BYTES; + +import java.util.Map; + import io.github.giulong.spectrum.enums.Frame; import io.github.giulong.spectrum.utils.HtmlUtils; import io.github.giulong.spectrum.utils.Reflections; import io.github.giulong.spectrum.utils.events.EventsDispatcher; import io.github.giulong.spectrum.utils.video.Video; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -14,16 +25,6 @@ import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebDriver; -import java.util.Map; - -import static io.github.giulong.spectrum.enums.Frame.AUTO_AFTER; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.DRIVER; -import static io.github.giulong.spectrum.utils.web_driver_events.ScreenshotConsumer.SCREENSHOT; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; -import static org.openqa.selenium.OutputType.BYTES; - class ScreenshotConsumerTest { @Mock diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumerTest.java index 8d3bab7e..fe887453 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepBuilderConsumerTest.java @@ -1,7 +1,18 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static java.time.temporal.ChronoUnit.MILLIS; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Stream; + import io.github.giulong.spectrum.pojos.events.TestStep; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,16 +23,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.time.Duration; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Stream; - -import static java.time.temporal.ChronoUnit.MILLIS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class TestStepBuilderConsumerTest { private MockedStatic localDateTimeMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumerTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumerTest.java index 866a5d9b..925a8a5b 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumerTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/TestStepsConsumerTest.java @@ -1,5 +1,18 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static io.github.giulong.spectrum.enums.Result.*; +import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.TEST_STEP_BUILDER_CONSUMER; +import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.Mockito.*; + +import java.nio.file.Path; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import io.github.giulong.spectrum.enums.Result; import io.github.giulong.spectrum.pojos.events.Event; import io.github.giulong.spectrum.pojos.events.TestStep; @@ -7,6 +20,7 @@ import io.github.giulong.spectrum.utils.FileUtils; import io.github.giulong.spectrum.utils.FreeMarkerWrapper; import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -19,19 +33,6 @@ import org.mockito.Mock; import org.mockito.MockedStatic; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import static io.github.giulong.spectrum.enums.Result.*; -import static io.github.giulong.spectrum.extensions.resolvers.DriverResolver.TEST_STEP_BUILDER_CONSUMER; -import static io.github.giulong.spectrum.extensions.resolvers.TestDataResolver.TEST_DATA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; -import static org.junit.jupiter.params.provider.Arguments.arguments; -import static org.mockito.Mockito.*; - class TestStepsConsumerTest { private static MockedStatic pathMockedStatic; diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventTest.java index aee589b6..057007d7 100644 --- a/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventTest.java +++ b/spectrum/src/test/java/io/github/giulong/spectrum/utils/web_driver_events/WebDriverEventTest.java @@ -1,16 +1,17 @@ package io.github.giulong.spectrum.utils.web_driver_events; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; + import io.github.giulong.spectrum.utils.Reflections; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.openqa.selenium.WebElement; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - class WebDriverEventTest { @Mock diff --git a/verify-appium/src/test/java/io/github/giulong/spectrum/verify_appium/unit/ItAppiumVerifierTest.java b/verify-appium/src/test/java/io/github/giulong/spectrum/verify_appium/unit/ItAppiumVerifierTest.java index c12f5ea6..50f632ed 100644 --- a/verify-appium/src/test/java/io/github/giulong/spectrum/verify_appium/unit/ItAppiumVerifierTest.java +++ b/verify-appium/src/test/java/io/github/giulong/spectrum/verify_appium/unit/ItAppiumVerifierTest.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.verify_appium.unit; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - @DisplayName("It Appium Module Verifier") public class ItAppiumVerifierTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/data/Data.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/data/Data.java index 310a4c51..1c667bb0 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/data/Data.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/data/Data.java @@ -1,9 +1,9 @@ package io.github.giulong.spectrum.verify_browsers.data; -import lombok.Getter; - import java.util.Map; +import lombok.Getter; + @Getter @SuppressWarnings("unused") public class Data { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/BiDiExtentReportPage.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/BiDiExtentReportPage.java index a4016c43..be2f2c82 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/BiDiExtentReportPage.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/BiDiExtentReportPage.java @@ -1,13 +1,15 @@ package io.github.giulong.spectrum.verify_browsers.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @SuppressWarnings("unused") public class BiDiExtentReportPage extends SpectrumPage { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/ExtentReportPage.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/ExtentReportPage.java index 39c86ada..938c9971 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/ExtentReportPage.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/ExtentReportPage.java @@ -1,13 +1,15 @@ package io.github.giulong.spectrum.verify_browsers.pages; +import java.util.List; + import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.FindBys; -import java.util.List; - @Getter @SuppressWarnings("unused") public class ExtentReportPage extends SpectrumPage { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/SummaryPage.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/SummaryPage.java index 0b70ece6..67b5dce4 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/SummaryPage.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/SummaryPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.verify_browsers.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/TestBookPage.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/TestBookPage.java index 2971cb06..b6b2b1db 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/TestBookPage.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/pages/TestBookPage.java @@ -1,7 +1,9 @@ package io.github.giulong.spectrum.verify_browsers.pages; import io.github.giulong.spectrum.SpectrumPage; + import lombok.Getter; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/BiDiExtentReportVerifierIT.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/BiDiExtentReportVerifierIT.java index 30488720..6e9d7a55 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/BiDiExtentReportVerifierIT.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/BiDiExtentReportVerifierIT.java @@ -1,17 +1,18 @@ package io.github.giulong.spectrum.verify_browsers.tests; -import io.github.giulong.spectrum.SpectrumTest; -import io.github.giulong.spectrum.verify_browsers.data.Data; -import io.github.giulong.spectrum.verify_browsers.pages.BiDiExtentReportPage; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.github.giulong.spectrum.SpectrumTest; +import io.github.giulong.spectrum.verify_browsers.data.Data; +import io.github.giulong.spectrum.verify_browsers.pages.BiDiExtentReportPage; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; class BiDiExtentReportVerifierIT extends SpectrumTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/ExtentReportVerifierIT.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/ExtentReportVerifierIT.java index 39a1ecc6..3441ed08 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/ExtentReportVerifierIT.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/ExtentReportVerifierIT.java @@ -1,11 +1,8 @@ package io.github.giulong.spectrum.verify_browsers.tests; -import io.github.giulong.spectrum.SpectrumTest; -import io.github.giulong.spectrum.verify_browsers.data.Data; -import io.github.giulong.spectrum.verify_browsers.pages.ExtentReportPage; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.openqa.selenium.By; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.*; import java.nio.file.Path; import java.util.ArrayList; @@ -13,9 +10,13 @@ import java.util.Map; import java.util.Objects; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.*; +import io.github.giulong.spectrum.SpectrumTest; +import io.github.giulong.spectrum.verify_browsers.data.Data; +import io.github.giulong.spectrum.verify_browsers.pages.ExtentReportPage; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; class ExtentReportVerifierIT extends SpectrumTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/SummaryVerifierIT.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/SummaryVerifierIT.java index 4523c0b7..f0f1ac08 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/SummaryVerifierIT.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/SummaryVerifierIT.java @@ -1,18 +1,19 @@ package io.github.giulong.spectrum.verify_browsers.tests; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.matchesPattern; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.file.Path; +import java.util.regex.Pattern; + import io.github.giulong.spectrum.SpectrumTest; import io.github.giulong.spectrum.verify_browsers.data.Data; import io.github.giulong.spectrum.verify_browsers.pages.SummaryPage; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.nio.file.Path; -import java.util.regex.Pattern; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.jupiter.api.Assertions.assertEquals; - @SuppressWarnings("unused") class SummaryVerifierIT extends SpectrumTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/TestBookVerifierIT.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/TestBookVerifierIT.java index 005c8330..ef7989a9 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/TestBookVerifierIT.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/tests/TestBookVerifierIT.java @@ -1,21 +1,22 @@ package io.github.giulong.spectrum.verify_browsers.tests; -import io.github.giulong.spectrum.SpectrumTest; -import io.github.giulong.spectrum.verify_browsers.data.Data; -import io.github.giulong.spectrum.verify_browsers.pages.TestBookPage; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.nio.file.Path; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; - import static java.lang.Double.parseDouble; import static java.lang.Integer.parseInt; import static java.util.Locale.US; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.nio.file.Path; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; + +import io.github.giulong.spectrum.SpectrumTest; +import io.github.giulong.spectrum.verify_browsers.data.Data; +import io.github.giulong.spectrum.verify_browsers.pages.TestBookPage; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + @DisplayName("It TestBook Module Verifier") @SuppressWarnings("unused") class TestBookVerifierIT extends SpectrumTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItBiDiVerifierTest.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItBiDiVerifierTest.java index 6c257274..95a4da1f 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItBiDiVerifierTest.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItBiDiVerifierTest.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.verify_browsers.unit; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - @DisplayName("It Bidi Module Verifier") public class ItBiDiVerifierTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItGridVerifierTest.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItGridVerifierTest.java index d58ee1cc..e1264bcf 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItGridVerifierTest.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItGridVerifierTest.java @@ -1,11 +1,12 @@ package io.github.giulong.spectrum.verify_browsers.unit; +import static org.junit.jupiter.api.Assertions.assertTrue; + import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; - @DisplayName("It Grid Module Verifier") public class ItGridVerifierTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItTestStepsVerifierTest.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItTestStepsVerifierTest.java index 2a3cc19f..db5ea9b2 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItTestStepsVerifierTest.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItTestStepsVerifierTest.java @@ -1,9 +1,6 @@ package io.github.giulong.spectrum.verify_browsers.unit; -import io.github.giulong.spectrum.SpectrumTest; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException; @@ -12,7 +9,12 @@ import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.github.giulong.spectrum.SpectrumTest; + +import lombok.extern.slf4j.Slf4j; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; @Slf4j public class ItTestStepsVerifierTest extends SpectrumTest { diff --git a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItVerifierTest.java b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItVerifierTest.java index 8ba64302..3ea615c6 100644 --- a/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItVerifierTest.java +++ b/verify-browsers/src/test/java/io/github/giulong/spectrum/verify_browsers/unit/ItVerifierTest.java @@ -1,14 +1,15 @@ package io.github.giulong.spectrum.verify_browsers.unit; -import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileNotFoundException; import java.nio.file.Path; import java.util.Scanner; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; public class ItVerifierTest { diff --git a/verify-commons/src/main/java/io/github/giulong/spectrum/verify_commons/FailsafeReportsVerifier.java b/verify-commons/src/main/java/io/github/giulong/spectrum/verify_commons/FailsafeReportsVerifier.java index 95171c50..4aaa2c4f 100644 --- a/verify-commons/src/main/java/io/github/giulong/spectrum/verify_commons/FailsafeReportsVerifier.java +++ b/verify-commons/src/main/java/io/github/giulong/spectrum/verify_commons/FailsafeReportsVerifier.java @@ -1,19 +1,20 @@ package io.github.giulong.spectrum.verify_commons; +import static lombok.AccessLevel.PRIVATE; +import static org.slf4j.event.Level.ERROR; +import static org.slf4j.event.Level.INFO; + +import java.nio.file.Path; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import java.nio.file.Path; - -import static lombok.AccessLevel.PRIVATE; -import static org.slf4j.event.Level.ERROR; -import static org.slf4j.event.Level.INFO; - @NoArgsConstructor(access = PRIVATE) @Slf4j public class FailsafeReportsVerifier { diff --git a/verify-macos/src/test/java/io/github/giulong/spectrum/verify_macos/ItMacosVerifierTest.java b/verify-macos/src/test/java/io/github/giulong/spectrum/verify_macos/ItMacosVerifierTest.java index afa796c3..d160b62c 100644 --- a/verify-macos/src/test/java/io/github/giulong/spectrum/verify_macos/ItMacosVerifierTest.java +++ b/verify-macos/src/test/java/io/github/giulong/spectrum/verify_macos/ItMacosVerifierTest.java @@ -1,13 +1,14 @@ package io.github.giulong.spectrum.verify_macos; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.condition.OS.MAC; + import io.github.giulong.spectrum.verify_commons.FailsafeReportsVerifier; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.condition.OS.MAC; - @DisplayName("It macOS Module Verifier") @EnabledOnOs(MAC) public class ItMacosVerifierTest { From 977ed1cb789622379cc91f8a9d371a67ab916fc9 Mon Sep 17 00:00:00 2001 From: Giulio Longfils Date: Sun, 2 Nov 2025 17:47:13 +0100 Subject: [PATCH 5/8] chore: solving logback deprecation removing janino dependency --- pom.xml | 5 ----- spectrum/pom.xml | 4 ---- spectrum/src/main/resources/logback.xml | 6 +++++- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 76da4c8d..874f868c 100644 --- a/pom.xml +++ b/pom.xml @@ -197,11 +197,6 @@ logback-classic 1.5.20 - - org.codehaus.janino - janino - 3.1.12 - org.slf4j slf4j-api diff --git a/spectrum/pom.xml b/spectrum/pom.xml index 18496d78..37981619 100644 --- a/spectrum/pom.xml +++ b/spectrum/pom.xml @@ -102,10 +102,6 @@ ch.qos.logback logback-classic - - org.codehaus.janino - janino - org.slf4j slf4j-api diff --git a/spectrum/src/main/resources/logback.xml b/spectrum/src/main/resources/logback.xml index 56d2a84f..035988ed 100644 --- a/spectrum/src/main/resources/logback.xml +++ b/spectrum/src/main/resources/logback.xml @@ -9,7 +9,11 @@ true - + + spectrum.log.colors + false + + From 0f480e4fce9e5878f2340684f867c6257e1fbb06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:27:38 +0000 Subject: [PATCH 6/8] build(deps): bump jackson.version from 2.20.0 to 2.20.1 Bumps `jackson.version` from 2.20.0 to 2.20.1. Updates `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.20.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.20.0 to 2.20.1 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.20.0...jackson-dataformats-text-2.20.1) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.20.0 to 2.20.1 - [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.20.0...jackson-dataformat-xml-2.20.1) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.20.0 to 2.20.1 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.20.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-version: 2.20.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml dependency-version: 2.20.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-version: 2.20.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 874f868c..06270b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 6.0.0 5.20.0 - 2.20.0 + 2.20.1 8.12.6 4.38.0 2.0.17 From 1024ec5f6ebcc270e8ca823c25c8bd0b57f1450b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:28:03 +0000 Subject: [PATCH 7/8] build(deps): bump junit.version from 6.0.0 to 6.0.1 Bumps `junit.version` from 6.0.0 to 6.0.1. Updates `org.junit.jupiter:junit-jupiter-api` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r6.0.0...r6.0.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r6.0.0...r6.0.1) Updates `org.junit.jupiter:junit-jupiter-params` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r6.0.0...r6.0.1) Updates `org.junit.platform:junit-platform-launcher` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r6.0.0...r6.0.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.platform:junit-platform-launcher dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 874f868c..9098dab0 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ true true - 6.0.0 + 6.0.1 5.20.0 2.20.0 8.12.6 From 90d3506185bb890e9e6cf6fdc4de0b843148ad2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:28:24 +0000 Subject: [PATCH 8/8] build(deps): bump com.slack.api:slack-api-client from 1.45.4 to 1.46.0 Bumps [com.slack.api:slack-api-client](https://github.com/slackapi/java-slack-sdk) from 1.45.4 to 1.46.0. - [Release notes](https://github.com/slackapi/java-slack-sdk/releases) - [Changelog](https://github.com/slackapi/java-slack-sdk/blob/main/jSlack_changelog.md) - [Commits](https://github.com/slackapi/java-slack-sdk/compare/v1.45.4...v1.46.0) --- updated-dependencies: - dependency-name: com.slack.api:slack-api-client dependency-version: 1.46.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 874f868c..84ea1aa9 100644 --- a/pom.xml +++ b/pom.xml @@ -222,7 +222,7 @@ com.slack.api slack-api-client - 1.45.4 + 1.46.0