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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,3 @@ jobs:
- name: Deploy GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

- name: Ping latest Javadocs page
uses: jtalk/url-health-check-action@v4
with:
url: https://javadoc.io/doc/io.github.giulong/spectrum/${{ env.NEW_VERSION }}/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.giulong.spectrum.extensions.resolvers;

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;
Expand All @@ -16,7 +17,7 @@ public class ActionsResolver extends TypeBasedParameterResolver<Actions> {
public static final String ACTIONS = "actions";

@Override
public Actions resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public Actions resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
log.debug("Resolving {}", ACTIONS);

final ExtensionContext.Store store = context.getStore(GLOBAL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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;
Expand All @@ -14,8 +15,8 @@ public class ConfigurationResolver extends TypeBasedParameterResolver<Configurat
public static final String CONFIGURATION = "configuration";

@Override
public Configuration resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).getOrComputeIfAbsent(CONFIGURATION, e -> {
public Configuration resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).computeIfAbsent(CONFIGURATION, e -> {
log.debug("Resolving {}", CONFIGURATION);

return Configuration.getInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
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;
Expand All @@ -21,12 +22,12 @@ public class DataResolver<Data> implements ParameterResolver {
private final YamlUtils yamlUtils = YamlUtils.getInstance();

@Override
public boolean supportsParameter(final ParameterContext parameterContext, final ExtensionContext extensionContext) {
public boolean supportsParameter(final ParameterContext parameterContext, @NonNull final ExtensionContext extensionContext) {
return parameterContext.getParameter().getParameterizedType().getTypeName().equals(DataResolver.class.getTypeParameters()[0].getName());
}

@Override
public Data resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public Data resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
final Type type = Reflections.getGenericSuperclassOf(context.getRequiredTestClass(), SpectrumTest.class).getActualTypeArguments()[0];

if (Void.class.equals(type)) {
Expand All @@ -37,7 +38,7 @@ public Data resolveParameter(final ParameterContext arg0, final ExtensionContext
@SuppressWarnings("unchecked") final Class<Data> dataClass = (Class<Data>) type;
final ExtensionContext.Store rootStore = context.getRoot().getStore(GLOBAL);

return rootStore.getOrComputeIfAbsent(DATA, e -> {
return rootStore.computeIfAbsent(DATA, e -> {
log.debug("Resolving {}", DATA);

final Configuration.Data dataConfiguration = rootStore.get(CONFIGURATION, Configuration.class).getData();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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;
import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver;
Expand Down Expand Up @@ -41,7 +42,7 @@ public class DriverResolver extends TypeBasedParameterResolver<WebDriver> {
private final FileUtils fileUtils = FileUtils.getInstance();

@Override
public WebDriver resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public WebDriver resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
log.debug("Resolving {}", DRIVER);

final ExtensionContext.Store store = context.getStore(GLOBAL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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;
Expand All @@ -14,8 +15,8 @@ public class EventsDispatcherResolver extends TypeBasedParameterResolver<EventsD
public static final String EVENTS_DISPATCHER = "eventsDispatcher";

@Override
public EventsDispatcher resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).getOrComputeIfAbsent(EVENTS_DISPATCHER, e -> {
public EventsDispatcher resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).computeIfAbsent(EVENTS_DISPATCHER, e -> {
log.debug("Resolving {}", EVENTS_DISPATCHER);

return EventsDispatcher.getInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
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;
Expand All @@ -17,8 +18,8 @@ public class ExtentReportsResolver extends TypeBasedParameterResolver<ExtentRepo
private final ExtentReporter extentReporter = ExtentReporter.getInstance();

@Override
public ExtentReports resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).getOrComputeIfAbsent(EXTENT_REPORTS, e -> {
public ExtentReports resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
return context.getRoot().getStore(GLOBAL).computeIfAbsent(EXTENT_REPORTS, e -> {
log.debug("Resolving {}", EXTENT_REPORTS);

return extentReporter.getExtentReports();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
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;
Expand All @@ -16,10 +17,10 @@ public class FakerResolver extends TypeBasedParameterResolver<Faker> {
public static final String FAKER = "faker";

@Override
public Faker resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public Faker resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
final ExtensionContext.Store rootStore = context.getRoot().getStore(GLOBAL);

return rootStore.getOrComputeIfAbsent(FAKER, e -> {
return rootStore.computeIfAbsent(FAKER, e -> {
log.debug("Resolving {}", FAKER);
final Configuration.Faker faker = rootStore.get(CONFIGURATION, Configuration.class).getFaker();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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;
import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver;
Expand All @@ -17,7 +18,7 @@ public class JsResolver extends TypeBasedParameterResolver<Js> {
public static final String JS = "js";

@Override
public Js resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public Js resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
log.debug("Resolving {}", JS);

final ExtensionContext.Store store = context.getStore(GLOBAL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
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;
Expand All @@ -24,7 +25,7 @@ public class JsWebElementProxyBuilderResolver extends TypeBasedParameterResolver
public static final String JS_WEB_ELEMENT_PROXY_BUILDER = "jsWebElementProxyBuilder";

@Override
public JsWebElementProxyBuilder resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public JsWebElementProxyBuilder resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
final ExtensionContext.Store rootStore = context.getRoot().getStore(GLOBAL);
final ExtensionContext.Store store = context.getStore(GLOBAL);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.github.giulong.spectrum.utils.ExtentReporter;
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;
Expand All @@ -25,7 +26,7 @@ public class StatefulExtentTestResolver extends TypeBasedParameterResolver<State
private final ContextManager contextManager = ContextManager.getInstance();

@Override
public StatefulExtentTest resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public StatefulExtentTest resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
log.debug("Resolving {}", STATEFUL_EXTENT_TEST);

final ExtensionContext.Store store = context.getStore(GLOBAL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
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;
import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver;
Expand All @@ -16,7 +17,7 @@ public class TestContextResolver extends TypeBasedParameterResolver<TestContext>
private final ContextManager contextManager = ContextManager.getInstance();

@Override
public TestContext resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public TestContext resolveParameter(@NonNull final ParameterContext parameterContext, @NonNull final ExtensionContext context) {
log.debug("Resolving {}", TEST_CONTEXT);

final TestContext testContext = contextManager.initFor(context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
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;
Expand All @@ -24,7 +25,7 @@ public class TestDataResolver extends TypeBasedParameterResolver<TestData> {
private final ContextManager contextManager = ContextManager.getInstance();

@Override
public TestData resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public TestData resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
log.debug("Resolving {}", TEST_DATA);

final Class<?> clazz = context.getRequiredTestClass();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.giulong.spectrum.extensions.resolvers.bidi;

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;
Expand All @@ -20,12 +21,12 @@ public abstract class BiDiTypeBasedParameterResolver<T> implements ParameterReso
abstract T resolveParameterFor(WebDriver driver);

@Override
public boolean supportsParameter(final ParameterContext parameterContext, final ExtensionContext context) {
public boolean supportsParameter(final ParameterContext parameterContext, @NonNull final ExtensionContext context) {
return parameterContext.getParameter().getType().equals(getType());
}

@Override
public final T resolveParameter(final ParameterContext arg0, final ExtensionContext context) {
public final T resolveParameter(@NonNull final ParameterContext parameterContext, final ExtensionContext context) {
final ExtensionContext.Store store = context.getStore(GLOBAL);
final WebDriver driver = store.get(DRIVER, WebDriver.class);
final String key = getKey();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void testResolveParameter() {

when(extensionContext.getRoot()).thenReturn(rootContext);
when(rootContext.getStore(GLOBAL)).thenReturn(rootStore);
when(rootStore.getOrComputeIfAbsent(eq(CONFIGURATION), functionArgumentCaptor.capture(), eq(Configuration.class))).thenReturn(configuration);
when(rootStore.computeIfAbsent(eq(CONFIGURATION), functionArgumentCaptor.capture(), eq(Configuration.class))).thenReturn(configuration);

final Configuration actual = configurationResolver.resolveParameter(parameterContext, extensionContext);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void resolveParameter(final Class<?> clazz) {

dataResolver.resolveParameter(parameterContext, extensionContext);

verify(rootStore).getOrComputeIfAbsent(eq(DATA), runnableArgumentCaptor.capture(), any());
verify(rootStore).computeIfAbsent(eq(DATA), runnableArgumentCaptor.capture(), any());
Function<String, TestYaml> function = runnableArgumentCaptor.getValue();
TestYaml actual = function.apply("value");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void testResolveParameter() {
final EventsDispatcherResolver eventsDispatcherResolver = new EventsDispatcherResolver();
eventsDispatcherResolver.resolveParameter(parameterContext, extensionContext);

verify(rootStore).getOrComputeIfAbsent(eq(EVENTS_DISPATCHER), functionArgumentCaptor.capture(), eq(EventsDispatcher.class));
verify(rootStore).computeIfAbsent(eq(EVENTS_DISPATCHER), functionArgumentCaptor.capture(), eq(EventsDispatcher.class));
Function<String, EventsDispatcher> function = functionArgumentCaptor.getValue();
final EventsDispatcher actual = function.apply("value");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void resolveParameter() {

extentReportsResolver.resolveParameter(parameterContext, extensionContext);

verify(rootStore).getOrComputeIfAbsent(eq(EXTENT_REPORTS), functionArgumentCaptor.capture(), eq(ExtentReports.class));
verify(rootStore).computeIfAbsent(eq(EXTENT_REPORTS), functionArgumentCaptor.capture(), eq(ExtentReports.class));
Function<String, ExtentReports> function = functionArgumentCaptor.getValue();
final ExtentReports actual = function.apply("value");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void testResolveParameter() {

fakerResolver.resolveParameter(parameterContext, extensionContext);

verify(rootStore).getOrComputeIfAbsent(eq(FAKER), functionArgumentCaptor.capture(), eq(Faker.class));
verify(rootStore).computeIfAbsent(eq(FAKER), functionArgumentCaptor.capture(), eq(Faker.class));
final Function<String, Faker> function = functionArgumentCaptor.getValue();
final Faker actual = function.apply("value");

Expand Down
Loading