* the type of output
- *
+ *
* @author Adrian Herscu
*
*/
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DbUnitExModule.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DbUnitExModule.java
index ffc536f727..8364c26ea6 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DbUnitExModule.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DbUnitExModule.java
@@ -26,7 +26,7 @@
/**
* Provides data insertion method using the default dataset factory.
- *
+ *
*
* In order to use this class during runtime, the {@code unitils.properties}
* file of the project shall contain
@@ -69,7 +69,7 @@ public DbUnitExModule() {
/**
* Creates a multi-schema data-set from given DbUnit dataset file.
- *
+ *
* @param dataSetFile
* The test data set, not null
* @return the data-set
@@ -81,7 +81,7 @@ public MultiSchemaDataSet createDataSet(final File dataSetFile) {
/**
* Loads the given dataset into the default schema of the database, using
* the default load strategy.
- *
+ *
* @param dataSet
* dataset that is inserted in the database
*/
@@ -92,7 +92,7 @@ public void insertDataSet(final IDataSet dataSet) {
/**
* Loads the given dataset into the default schema of the database, using a
* specified load strategy.
- *
+ *
* @param dataSet
* dataset that is inserted in the database
* @param dataSetLoadStrategy
@@ -115,7 +115,7 @@ public void insertDataSet(
/**
* Loads the given dataset into the default schema of the database, using
* the default load strategy.
- *
+ *
* @param multiSchemaDataSet
* multi-schema dataset that is inserted in the database
*/
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DesiredCapabilitiesEx.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DesiredCapabilitiesEx.java
index b17c5dc6e6..86a74e5eb2 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DesiredCapabilitiesEx.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/DesiredCapabilitiesEx.java
@@ -67,7 +67,7 @@ public DesiredCapabilitiesEx with(
/**
* Chains a {@code true} capability.
- *
+ *
* @param key
* the capability to chain
* @return chained capabilities, on new set of capabilities
@@ -113,7 +113,7 @@ public DesiredCapabilitiesEx withAdded(
return with(key,
requireNonNull(getCapability(key),
"capability does not exist")
- .toString()
+ .toString()
+ value);
}
}
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/FunctionWithDescription.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/FunctionWithDescription.java
index 1e5374ed0d..18bb32f9bd 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/FunctionWithDescription.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/FunctionWithDescription.java
@@ -22,13 +22,13 @@
/**
* Wraps a {@link Function} with a description.
- *
+ *
* @param
* the type of input
*
* @param
* the type of output
- *
+ *
* @author Adrian Herscu
*
*/
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/HikariPoolingDataSourceFactory.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/HikariPoolingDataSourceFactory.java
index 625575f264..c978544330 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/HikariPoolingDataSourceFactory.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/HikariPoolingDataSourceFactory.java
@@ -31,13 +31,13 @@
* pooling used by
* Unitils'
* {@link DatabaseModule}.
- *
+ *
*
* This implementation uses
* HikariCP as its
* connection pooling library.
*
- *
+ *
*
* Adapted from {@link PropertiesDataSourceFactory}.
*
@@ -72,7 +72,7 @@ public final DataSource createDataSource() {
/**
* Override to customize the connection timeout.
- *
+ *
* @return the configured connection timeout; by default 30,000 ms
* @see HikariConfig#setConnectionTimeout(long)
*/
@@ -83,7 +83,7 @@ protected long connectionTimeout() {
/**
* Override to customize the idle timeout.
- *
+ *
* @return the configured idle timeout; by default 600,000 ms (10 minutes)
* @see HikariConfig#setIdleTimeout(long)
*/
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/LoggingAspect.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/LoggingAspect.java
index fdf86f8921..dea970ff43 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/LoggingAspect.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/LoggingAspect.java
@@ -59,8 +59,8 @@ public Object aroundStepMethod(
stream(isNull(thisJoinPoint.getArgs())
? new Object[] {}
: thisJoinPoint.getArgs())
- .map(arg -> Objects.toString(arg, "null"))
- .collect(joining(COMMA, "[", "]")));
+ .map(arg -> Objects.toString(arg, "null"))
+ .collect(joining(COMMA, "[", "]")));
val retval = thisJoinPoint.proceed(thisJoinPoint.getArgs());
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MayAttachScreenshots.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MayAttachScreenshots.java
index 6fcbd122ed..9ddd249789 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MayAttachScreenshots.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MayAttachScreenshots.java
@@ -20,12 +20,12 @@
/**
* Use to mark a JGiven stage that may attach screenshots.
- *
+ *
* @param
* type of JGiven stage
*
* @see AttachesScreenshot
- *
+ *
* @author Adrian Herscu
*
*/
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MetricReporterSuiteListener.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MetricReporterSuiteListener.java
index b08685fc5e..5474c34c0c 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MetricReporterSuiteListener.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/MetricReporterSuiteListener.java
@@ -43,12 +43,12 @@
* CSV files are written to directory as specified via {@code target-directory}
* parameter. If this parameter is not specified, then {@code target} is
* assumed.
- *
+ *
*
* If {@code metric-report-interval-ms} parameter is specified, then plots the
* accumulated metrics to console every so milliseconds.
*
- *
+ *
*
* To be used via {@code testng.xml}; see
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.~java
similarity index 99%
rename from qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.java
rename to qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.~java
index f3d45f9e0c..fc713b9a25 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/RemoteWebDriverHttpClientAspect.~java
@@ -50,7 +50,7 @@ public class RemoteWebDriverHttpClientAspect implements ISuiteListener {
*
* @param thisJoinPoint
* the execution
- *
+ *
* @return the {@link HttpResponse}
* @throws Throwable
* any of below
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/Root.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/Root.java
index ea26033eb5..fc0f3449b2 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/Root.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/Root.java
@@ -22,11 +22,11 @@
/**
* Annotation bound to {@link Locale#ROOT} locale.
- *
+ *
* @see
* Storing translations in source code
- *
+ *
* @author aherscu
*/
@Target(ElementType.METHOD)
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestEx.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestEx.java
index 13c9bb7d23..8cc1619c52 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestEx.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestEx.java
@@ -29,7 +29,7 @@
* This is a complete replacement of
* {@link com.tngtech.jgiven.testng.ScenarioTest} in order to use
* {@link ScenarioTestListenerEx}.
- *
+ *
* @param
* type of given stage
* @param
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerEx.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerEx.java
index 8814289e09..8eadfe8c5a 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerEx.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerEx.java
@@ -18,9 +18,11 @@
import static dev.aherscu.qa.jgiven.commons.utils.WebDriverEx.*;
import static dev.aherscu.qa.testing.utils.StringUtilsExtensions.*;
-import static io.appium.java_client.remote.MobileCapabilityType.*;
+import static io.appium.java_client.remote.options.SupportsDeviceNameOption.*;
+import static io.appium.java_client.remote.options.SupportsPlatformVersionOption.*;
import static java.util.Objects.*;
import static lombok.AccessLevel.*;
+import static org.openqa.selenium.remote.CapabilityType.*;
import java.util.*;
import java.util.stream.*;
@@ -71,14 +73,14 @@ private static Stream> reportModelsFor(
final ITestContext context) {
return ((Map) context
.getAttribute(REPORT_MODELS_ATTRIBUTE))
- .entrySet()
+ .entrySet()
+ .stream()
+ .filter(reportModelEntry -> ((TestRunner) context)
+ .getTestClasses()
.stream()
- .filter(reportModelEntry -> ((TestRunner) context)
- .getTestClasses()
- .stream()
- .map(IClass::getName)
- .anyMatch(testClassName -> testClassName.equals(
- reportModelEntry.getKey())));
+ .map(IClass::getName)
+ .anyMatch(testClassName -> testClassName.equals(
+ reportModelEntry.getKey())));
}
private static void reportRetries(
@@ -95,7 +97,7 @@ private static void reportRetries(
TestRetryAnalyzer.retryCounters
.get(qualifiedMethodName)
.toString())
- .setPrependType(true);
+ .setPrependType(true);
reportModel.addTag(retriesTag);
scenario.addTag(retriesTag);
@@ -108,22 +110,22 @@ private static void reportSession(
final WebDriverSessionInfo session,
final ScenarioModel scenario) {
scenario.addTag(new Tag(DEVICE_NAME_TAG, DEVICE_NAME_TAG,
- session.capabilities.getCapability(DEVICE_NAME)));
+ session.capabilities.getCapability(DEVICE_NAME_OPTION)));
scenario.addTag(new Tag(PLATFORM_NAME_TAG, PLATFORM_NAME_TAG,
session.capabilities.getCapability(PLATFORM_NAME)));
scenario.addTag(new Tag(PLATFORM_VERSION_TAG, PLATFORM_VERSION_TAG,
- session.capabilities.getCapability(PLATFORM_VERSION)));
+ session.capabilities.getCapability(PLATFORM_VERSION_OPTION)));
}
private static void reportSession(
final WebDriverSessionInfo session,
final ReportModel reportModel) {
reportModel.addTag(new Tag(DEVICE_NAME_TAG, DEVICE_NAME_TAG,
- session.capabilities.getCapability(DEVICE_NAME)));
+ session.capabilities.getCapability(DEVICE_NAME_OPTION)));
reportModel.addTag(new Tag(PLATFORM_NAME_TAG, PLATFORM_NAME_TAG,
session.capabilities.getCapability(PLATFORM_NAME)));
reportModel.addTag(new Tag(PLATFORM_VERSION_TAG, PLATFORM_VERSION_TAG,
- session.capabilities.getCapability(PLATFORM_VERSION)));
+ session.capabilities.getCapability(PLATFORM_VERSION_OPTION)));
}
@Override
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StageEx.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StageEx.java
index 13e9235733..15196f40e0 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StageEx.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StageEx.java
@@ -143,7 +143,7 @@ protected final void attachScreenshot(
/**
* Attaches specified text. Useful for attaching JSON, XML, or just plain
* text. Override to customize, e.g. to shorten or format the text.
- *
+ *
* @param text
* the text to attach
* @return the attached text
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StepModelPatchAspect.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StepModelPatchAspect.java
index bc99d29502..7b7e966258 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StepModelPatchAspect.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/StepModelPatchAspect.java
@@ -44,7 +44,7 @@ public class StepModelPatchAspect {
/**
* Monitors attempts to set step method's duration. If the duration is
* already set, then overrides to do nothing.
- *
+ *
* @param thisJoinPoint
* this join-point
* @param stepModel
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/TestRetryAnalyzer.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/TestRetryAnalyzer.java
index ca5c531c89..3393fdb9bd 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/TestRetryAnalyzer.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/TestRetryAnalyzer.java
@@ -38,7 +38,7 @@
*
* Had an issue with JGiven: https://github.com/TNG/JGiven/issues/312
*
- *
+ *
*
* Can be added as a listener, in this case the retry mechanism will get applied
* to all test methods covered by.
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/UnitilsScenarioTest.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/UnitilsScenarioTest.java
index 24532a88b3..3d647c5d5b 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/UnitilsScenarioTest.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/UnitilsScenarioTest.java
@@ -116,8 +116,8 @@ public void configure() {
try {
val typesAnnotatedWithBeanUtilsConverter = new Reflections(
"dev.aherscu.qa.jgiven.commons.scenarios") //$NON-NLS-1$
- .getTypesAnnotatedWith(
- BeanUtilsConverter.class);
+ .getTypesAnnotatedWith(
+ BeanUtilsConverter.class);
for (val clazz : typesAnnotatedWithBeanUtilsConverter) {
val annotation = clazz
.getAnnotation(BeanUtilsConverter.class);
diff --git a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/WebDriverEx.java b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/WebDriverEx.java
index 21909b7171..2bafcf940d 100644
--- a/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/WebDriverEx.java
+++ b/qa-jgiven-commons/src/main/java/dev/aherscu/qa/jgiven/commons/utils/WebDriverEx.java
@@ -28,7 +28,6 @@
import org.openqa.selenium.chrome.*;
import org.openqa.selenium.edge.*;
import org.openqa.selenium.firefox.*;
-import org.openqa.selenium.opera.*;
import org.openqa.selenium.remote.*;
import org.openqa.selenium.safari.*;
@@ -36,7 +35,6 @@
import com.google.gson.*;
import dev.aherscu.qa.jgiven.commons.*;
-import io.appium.java_client.*;
import io.appium.java_client.android.*;
import io.appium.java_client.ios.*;
import io.appium.java_client.windows.*;
@@ -58,6 +56,132 @@
@Slf4j
@ToString
public class WebDriverEx {
+ /**
+ * Represents a DOM
+ * Event.
+ */
+ @AllArgsConstructor
+ public static class Event {
+ /**
+ * Represents an event type.
+ *
+ * @author Adrian Herscu
+ */
+ public interface Type {
+ // marker interface
+ }
+
+ /**
+ * The type of this Pointer Event.
+ */
+ public final Type type;
+ /**
+ * Event
+ * Initialization Dictionary
+ */
+ public final Map eventInitDict;
+
+ /**
+ * @return JavaScript literal representation of this Event
+ */
+ @Override
+ public String toString() {
+ return MessageFormat.format("new {0}(\"{1}\",{2})",
+ getClass().getSimpleName(),
+ type,
+ new Gson().toJson(eventInitDict, Map.class));
+ }
+ }
+
+ /**
+ * Represents a DOM
+ * MouseEvent.
+ *
+ *
+ * see also MouseEvent
+ * Working Draft
+ *
+ */
+ public static class MouseEvent extends UIEvent {
+ /**
+ * @param type
+ * type of event
+ * @param eventInitDict
+ * initialization data
+ */
+ public MouseEvent(
+ final Type type,
+ final Map eventInitDict) {
+ super(type, eventInitDict);
+ }
+ }
+
+ /**
+ * Represents a
+ * DOM
+ * Pointer Event.
+ */
+ public static class PointerEvent extends MouseEvent {
+ /**
+ * Types of Pointer
+ * Events
+ */
+ public enum PointerEventType implements Type {
+ pointerover,
+ pointerenter,
+ pointerdown,
+ pointermove,
+ pointerup,
+ pointercancel,
+ pointerout,
+ pointerleave,
+ gotpointercapture,
+ lostpointercapture
+ }
+
+ /**
+ * @param type
+ * type of event
+ * @param eventInitDict
+ * initialization data
+ */
+ public PointerEvent(
+ final PointerEventType type,
+ final Map eventInitDict) {
+ super(type, eventInitDict);
+ }
+ }
+
+ /**
+ * Represents a DOM
+ * UIEvent.
+ *
+ *
+ * see also UIEvent
+ * Working Draft
+ *
+ */
+ public static class UIEvent extends Event {
+ /**
+ * @param type
+ * type of event
+ * @param eventInitDict
+ * initialization data
+ */
+ public UIEvent(
+ final Type type,
+ final Map eventInitDict) {
+ super(type, eventInitDict);
+ }
+ }
+
/**
* The application native context id.
*/
@@ -133,7 +257,7 @@ public static String descriptionOf(final WebElement element) {
*/
public static WebDriverEx from(final Capabilities capabilities) {
log.debug("connecting session {} with {}",
- capabilities.getCapability("name"), capabilities);
+ capabilities.getCapability("sauce:name"), capabilities);
return DryRunAspect.dryRun
? null
@@ -158,7 +282,7 @@ public static WebDriverEx from(final Capabilities capabilities) {
}
private static void registerSession(final WebDriverEx driver) {
- val name = driver.originalCapabilities.getCapability("name");
+ val name = driver.originalCapabilities.getCapability("sauce:name");
if (isNull(name)) {
log.warn("session name missing from capabilities"
@@ -197,8 +321,8 @@ public static Iterable sessionInfos() {
private static Class webDriverClassFor(
final Capabilities capabilities) {
val driverClass = Class.forName(requireNonNull(capabilities
- .getCapability("class"), "must have a class capability")
- .toString())
+ .getCapability("-x:class"), "must have a class capability")
+ .toString())
.asSubclass(WebDriver.class);
if (driverClass.isAssignableFrom(ChromeDriver.class))
@@ -217,8 +341,8 @@ private static Class webDriverClassFor(
if (driverClass.isAssignableFrom(SafariDriver.class))
WebDriverManager.safaridriver().setup();
- if (driverClass.isAssignableFrom(OperaDriver.class))
- WebDriverManager.operadriver().setup();
+ // if (driverClass.isAssignableFrom(OperaDriver.class))
+ // WebDriverManager.operadriver().setup();
// NOTE there are drivers, like WinAppDriver, that are not supported
// by WebDriverManager -- in this case we just return the class
@@ -235,17 +359,18 @@ private static Class webDriverClassFor(
@SneakyThrows
public static WebDriver webDriverFor(final Capabilities capabilities) {
try {
- return nonNull(capabilities.getCapability("url"))
+ return nonNull(capabilities.getCapability("-x:url"))
? webDriverClassFor(capabilities)
.getConstructor(URL.class, Capabilities.class)
.newInstance(new URL(
- capabilities.getCapability("url")
+ capabilities.getCapability("-x:url")
.toString()),
capabilities)
: webDriverClassFor(capabilities)
- .getConstructor(Capabilities.class)
- .newInstance(capabilities);
+ .getDeclaredConstructor()
+ .newInstance();
} catch (final InvocationTargetException e) {
+ log.error("remote selenium connection failed");
throw e.getCause();
}
}
@@ -262,8 +387,8 @@ public static WebDriver webDriverFor(final Capabilities capabilities) {
@SuppressWarnings("unchecked")
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "BC_UNCONFIRMED_CAST")
- public AndroidDriver asAndroid() {
- return (AndroidDriver) driver;
+ public AndroidDriver asAndroid() {
+ return (AndroidDriver) driver;
}
public WebDriver asGeneric() {
@@ -271,8 +396,8 @@ public WebDriver asGeneric() {
}
@SuppressWarnings("unchecked")
- public IOSDriver asIOS() {
- return (IOSDriver) driver;
+ public IOSDriver asIOS() {
+ return (IOSDriver) driver;
}
/**
@@ -289,26 +414,21 @@ public JavascriptExecutor asJavaScriptExecutor() {
}
/**
- * Casts an WebDriver into a MobileDriver.
+ * Casts an WebDriver into a RemoteWebDriver.
*
- * @param
- * type of WebElement
- * @return the MobileDriver interface
+ * @return the RemoteWebDriver interface
* @throws ClassCastException
- * if the driver is not of MobileDriver type
+ * if the driver is not of RemoteWebDriver type
*/
- @SuppressWarnings("unchecked")
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "BC_UNCONFIRMED_CAST")
- public MobileDriver asMobile() {
- return (MobileDriver) driver;
+ public RemoteWebDriver asRemote() {
+ return (RemoteWebDriver) driver;
}
/**
* Casts an WebDriver into a WindowsDriver.
*
- * @param
- * type of WebElement
* @return the WindowsDriver interface
* @throws ClassCastException
* if the driver is not of WindowsDriver type
@@ -316,21 +436,8 @@ public MobileDriver asMobile() {
@SuppressWarnings("unchecked")
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "BC_UNCONFIRMED_CAST")
- public WindowsDriver asWindows() {
- return (WindowsDriver) driver;
- }
-
- /**
- * Casts an WebDriver into a RemoteWebDriver.
- *
- * @return the RemoteWebDriver interface
- * @throws ClassCastException
- * if the driver is not of RemoteWebDriver type
- */
- @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
- value = "BC_UNCONFIRMED_CAST")
- public RemoteWebDriver asRemote() {
- return (RemoteWebDriver) driver;
+ public WindowsDriver asWindows() {
+ return (WindowsDriver) driver;
}
/**
@@ -436,7 +543,7 @@ public String webContextIdentifier() {
e.getFailure())))
.onSuccess(e -> log
.debug("found web view context {}", e.getResult()))
- .get(() -> asMobile()
+ .get(() -> ((ContextAware) driver)
.getContextHandles()
.stream()
.peek(contextId -> log.trace("found context {}", contextId))
@@ -445,130 +552,4 @@ public String webContextIdentifier() {
.orElseThrow(
() -> new TestRuntimeException("no webview available")));
}
-
- /**
- * Represents a DOM
- * Event.
- */
- @AllArgsConstructor
- public static class Event {
- /**
- * The type of this Pointer Event.
- */
- public final Type type;
- /**
- * Event
- * Initialization Dictionary
- */
- public final Map eventInitDict;
-
- /**
- * @return JavaScript literal representation of this Event
- */
- @Override
- public String toString() {
- return MessageFormat.format("new {0}(\"{1}\",{2})",
- getClass().getSimpleName(),
- type,
- new Gson().toJson(eventInitDict, Map.class));
- }
-
- /**
- * Represents an event type.
- *
- * @author Adrian Herscu
- */
- public interface Type {
- // marker interface
- }
- }
-
- /**
- * Represents a DOM
- * MouseEvent.
- *
- *
- * see also MouseEvent
- * Working Draft
- *
- */
- public static class MouseEvent extends UIEvent {
- /**
- * @param type
- * type of event
- * @param eventInitDict
- * initialization data
- */
- public MouseEvent(
- final Type type,
- final Map eventInitDict) {
- super(type, eventInitDict);
- }
- }
-
- /**
- * Represents a
- * DOM
- * Pointer Event.
- */
- public static class PointerEvent extends MouseEvent {
- /**
- * @param type
- * type of event
- * @param eventInitDict
- * initialization data
- */
- public PointerEvent(
- final PointerEventType type,
- final Map eventInitDict) {
- super(type, eventInitDict);
- }
-
- /**
- * Types of Pointer
- * Events
- */
- public enum PointerEventType implements Type {
- pointerover,
- pointerenter,
- pointerdown,
- pointermove,
- pointerup,
- pointercancel,
- pointerout,
- pointerleave,
- gotpointercapture,
- lostpointercapture
- }
- }
-
- /**
- * Represents a DOM
- * UIEvent.
- *
- *
- * see also UIEvent
- * Working Draft
- *
- */
- public static class UIEvent extends Event {
- /**
- * @param type
- * type of event
- * @param eventInitDict
- * initialization data
- */
- public UIEvent(
- final Type type,
- final Map eventInitDict) {
- super(type, eventInitDict);
- }
- }
}
diff --git a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/GenericTest.java b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/GenericTest.~java
similarity index 100%
rename from qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/GenericTest.java
rename to qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/GenericTest.~java
diff --git a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgParallelDataProviderTests.java b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgParallelDataProviderTests.java
new file mode 100644
index 0000000000..e6038615a8
--- /dev/null
+++ b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgParallelDataProviderTests.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2023 Adrian Herscu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.aherscu.qa.jgiven.commons.scenarios;
+
+import static dev.aherscu.qa.jgiven.commons.utils.UnitilsScenarioTest.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+
+import java.util.*;
+import java.util.stream.*;
+
+import org.hamcrest.*;
+import org.testng.annotations.*;
+
+import com.tngtech.jgiven.*;
+import com.tngtech.jgiven.annotation.*;
+import com.tngtech.jgiven.testng.*;
+
+import dev.aherscu.qa.jgiven.commons.utils.*;
+
+/**
+ * Seems that parallel data providers are not supported.
+ *
+ * see https://github.com/TNG/JGiven/issues/829
+ */
+@Listeners({ ScenarioTestListenerEx.class })
+public class JGivenTestNgParallelDataProviderTests extends
+ ScenarioTest, JGivenTestNgParallelDataProviderTests.SomeWhen, JGivenTestNgParallelDataProviderTests.SomeThen> {
+
+ public static class OtherGiven>
+ extends Stage {
+ @ProvidedScenarioState
+ protected final ThreadLocal aValue = new ThreadLocal<>();
+
+ public SELF with(final Integer value) {
+ aValue.set(value);
+ return self();
+ }
+ }
+
+ public static class OtherThen>
+ extends Stage {
+ @ExpectedScenarioState
+ protected ThreadLocal aValue;
+
+ public SELF the_value(final Matcher rule) {
+ // ISSUE: when running with enough parallelism aValue is null
+ assertThat(aValue.get(), rule);
+ return self();
+ }
+ }
+
+ public static class OtherWhen>
+ extends Stage {
+ // empty
+ }
+
+ public static class SomeGiven>
+ extends Stage {
+ // empty
+ }
+
+ public static class SomeThen>
+ extends Stage {
+
+ }
+
+ public static class SomeWhen>
+ extends Stage {
+ // empty
+ }
+
+ @ScenarioStage
+ protected OtherGiven otherGiven;
+ @ScenarioStage
+ protected OtherThen otherThen;
+ @ScenarioStage
+ protected OtherWhen otherWhen;
+
+ @DataProvider(parallel = true)
+ private static Iterator data() {
+ // ISSUE up to 10 it seems working... with 100 it does not
+ return IntStream.range(0, 100).iterator();
+ }
+
+ @Test(dataProvider = INTERNAL_DATA_PROVIDER)
+ public void shouldRunWithParallelDataProvider(final Integer aValue) {
+ otherGiven.with(aValue);
+ otherThen.the_value(is(aValue));
+ }
+}
diff --git a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenSelfTests.java b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgRetryTests.java
similarity index 92%
rename from qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenSelfTests.java
rename to qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgRetryTests.java
index 22838170a6..d2369f405c 100644
--- a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenSelfTests.java
+++ b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/scenarios/JGivenTestNgRetryTests.java
@@ -32,21 +32,8 @@
* https://github.com/TNG/JGiven/pull/422
*/
@Listeners({ ScenarioTestListenerEx.class })
-public class JGivenSelfTests extends
- ScenarioTest, JGivenSelfTests.SomeWhen, JGivenSelfTests.SomeThen> {
-
- @Test(retryAnalyzer = TestRetryAnalyzer.class)
- @TestRetryAnalyzer.Config(retries = 129, intervalMs = 13)
- public void shouldFinallySucceed() {
- then().should_fail_sometimes();
- }
-
- @Ignore // fails after retries as expected
- @Test(retryAnalyzer = TestRetryAnalyzer.class)
- @TestRetryAnalyzer.Config(retries = 129, intervalMs = 13)
- public void shouldNeverSucceed() {
- then().should_fail();
- }
+public class JGivenTestNgRetryTests extends
+ ScenarioTest, JGivenTestNgRetryTests.SomeWhen, JGivenTestNgRetryTests.SomeThen> {
public static class SomeGiven>
extends Stage {
@@ -70,4 +57,17 @@ public static class SomeWhen>
extends Stage {
// empty
}
+
+ @Test(retryAnalyzer = TestRetryAnalyzer.class)
+ @TestRetryAnalyzer.Config(retries = 129, intervalMs = 13)
+ public void shouldFinallySucceed() {
+ then().should_fail_sometimes();
+ }
+
+ @Ignore // fails after retries as expected
+ @Test(retryAnalyzer = TestRetryAnalyzer.class)
+ @TestRetryAnalyzer.Config(retries = 129, intervalMs = 13)
+ public void shouldNeverSucceed() {
+ then().should_fail();
+ }
}
diff --git a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerExTest.java b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerExTest.java
index 33a96dece7..829e05229b 100644
--- a/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerExTest.java
+++ b/qa-jgiven-commons/src/test/java/dev/aherscu/qa/jgiven/commons/utils/ScenarioTestListenerExTest.java
@@ -18,13 +18,15 @@
import static dev.aherscu.qa.jgiven.commons.utils.ScenarioTestListenerEx.*;
import static dev.aherscu.qa.testing.utils.StringUtilsExtensions.*;
-import static io.appium.java_client.remote.MobileCapabilityType.*;
+import static io.appium.java_client.remote.options.SupportsDeviceNameOption.DEVICE_NAME_OPTION;
+import static io.appium.java_client.remote.options.SupportsPlatformVersionOption.PLATFORM_VERSION_OPTION;
import static java.util.Arrays.*;
import static java.util.Collections.*;
import static java.util.stream.Collectors.*;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
import static org.mockito.Mockito.*;
+import static org.openqa.selenium.remote.CapabilityType.*;
import java.util.*;
@@ -151,24 +153,24 @@ ImmutableMultimap. builder()
// NOTE a method can zero or more WebDriver sessions
WebDriverSessionInfo.builder()
.capabilities(new DesiredCapabilitiesEx()
- .with(DEVICE_NAME, T_DEVICE_2)
+ .with(DEVICE_NAME_OPTION, T_DEVICE_2)
.with(PLATFORM_NAME, T_PLATFORM_2)
- .with(PLATFORM_VERSION, T_VERSION_2))
+ .with(PLATFORM_VERSION_OPTION, T_VERSION_2))
.build(),
WebDriverSessionInfo.builder()
.capabilities(new DesiredCapabilitiesEx()
- .with(DEVICE_NAME, T_DEVICE_1)
+ .with(DEVICE_NAME_OPTION, T_DEVICE_1)
.with(PLATFORM_NAME, T_PLATFORM_1)
- .with(PLATFORM_VERSION, T_VERSION_1))
+ .with(PLATFORM_VERSION_OPTION, T_VERSION_1))
.build())
.putAll(SessionName.builder()
.className(CLASS_INCLUDED)
.methodName(METHOD_WITH_ONE_SESSION).build(),
WebDriverSessionInfo.builder()
.capabilities(new DesiredCapabilitiesEx()
- .with(DEVICE_NAME, T_DEVICE_1)
+ .with(DEVICE_NAME_OPTION, T_DEVICE_1)
.with(PLATFORM_NAME, T_PLATFORM_1)
- .with(PLATFORM_VERSION, T_VERSION_1))
+ .with(PLATFORM_VERSION_OPTION, T_VERSION_1))
.build())
.build())
.onFinish(mockedTestContext);
diff --git a/qa-jgiven-commons/src/test/resources/configuration-sources.xml b/qa-jgiven-commons/src/test/resources/configuration-sources.xml
index 5c543de3e2..4c978b5de5 100644
--- a/qa-jgiven-commons/src/test/resources/configuration-sources.xml
+++ b/qa-jgiven-commons/src/test/resources/configuration-sources.xml
@@ -20,9 +20,4 @@
-
-
-
-
-
diff --git a/qa-jgiven-commons/src/test/resources/logback-test.xml b/qa-jgiven-commons/src/test/resources/logback-test.xml
index 9c74463cef..deceef0881 100644
--- a/qa-jgiven-commons/src/test/resources/logback-test.xml
+++ b/qa-jgiven-commons/src/test/resources/logback-test.xml
@@ -58,7 +58,7 @@
-
+
target/per-thread-logs/test-${threadId}.log
false
diff --git a/qa-jgiven-elasticsearch/.classpath b/qa-jgiven-elasticsearch/.classpath
index 464f70b3be..c361731681 100644
--- a/qa-jgiven-elasticsearch/.classpath
+++ b/qa-jgiven-elasticsearch/.classpath
@@ -6,13 +6,15 @@
+
+
-
+
diff --git a/qa-jgiven-elasticsearch/pom.xml b/qa-jgiven-elasticsearch/pom.xml
index 0321371854..974506351b 100644
--- a/qa-jgiven-elasticsearch/pom.xml
+++ b/qa-jgiven-elasticsearch/pom.xml
@@ -20,7 +20,7 @@
dev.aherscu.qa
qa-automation
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
qa-jgiven-elasticsearch
@@ -37,7 +37,7 @@
dev.aherscu.qa
qa-jgiven-commons
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
org.projectlombok
diff --git a/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/model/ElasticSearchScenarioType.java b/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/model/ElasticSearchScenarioType.java
index e8491ddd35..6a72ed3922 100644
--- a/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/model/ElasticSearchScenarioType.java
+++ b/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/model/ElasticSearchScenarioType.java
@@ -19,7 +19,7 @@
/**
* Elastic Search client type of scenario.
- *
+ *
* @author aherscu
*
*/
diff --git a/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/steps/ElasticSearchVerifications.java b/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/steps/ElasticSearchVerifications.java
index 5e7803b0eb..86222505ec 100644
--- a/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/steps/ElasticSearchVerifications.java
+++ b/qa-jgiven-elasticsearch/src/main/java/dev/aherscu/qa/jgiven/elasticsearch/steps/ElasticSearchVerifications.java
@@ -52,8 +52,6 @@ public class ElasticSearchVerifications> hits = new ThreadLocal<>();
-
public SELF the_document(
final String id,
final Matcher matcher) {
@@ -73,7 +71,6 @@ public SELF the_index(
query.apply(new Query.Builder()).build().toString(),
index.get(),
documentType.get());
- hits.set(new LinkedList<>());
return eventually_assert_that(Unchecked
.supplier(() -> elasticsearchClient
.search(s -> s.index(index.get()).query(query),
@@ -82,18 +79,9 @@ public SELF the_index(
.hits()
.stream()
.map(Hit::source)
+ .filter(Objects::nonNull)
.peek(tDocument -> log.debug("received document {}", tDocument))
- .peek(hits.get()::add)),
+ .peek(tDocument -> attach(tDocument.toString()))),
matcher);
}
-
- @AfterStage
- protected void attachActualResponse() {
- attach(hits.get().isEmpty()
- ? null
- : hits.get()
- .stream()
- .map(Object::toString)
- .collect(Collectors.joining(LF)));
- }
}
diff --git a/qa-jgiven-elasticsearch/src/test/resources/logback-test.xml b/qa-jgiven-elasticsearch/src/test/resources/logback-test.xml
index 81c001e66d..904534a6db 100644
--- a/qa-jgiven-elasticsearch/src/test/resources/logback-test.xml
+++ b/qa-jgiven-elasticsearch/src/test/resources/logback-test.xml
@@ -56,7 +56,7 @@
-
+
target/per-thread-logs/test-${threadId}.log
false
diff --git a/qa-jgiven-rabbitmq/.classpath b/qa-jgiven-rabbitmq/.classpath
index 464f70b3be..19cd20ff75 100644
--- a/qa-jgiven-rabbitmq/.classpath
+++ b/qa-jgiven-rabbitmq/.classpath
@@ -6,13 +6,15 @@
+
+
-
+
diff --git a/qa-jgiven-rabbitmq/pom.xml b/qa-jgiven-rabbitmq/pom.xml
index 90ff90ede5..87df53e0f7 100644
--- a/qa-jgiven-rabbitmq/pom.xml
+++ b/qa-jgiven-rabbitmq/pom.xml
@@ -20,7 +20,7 @@
dev.aherscu.qa
qa-automation
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
qa-jgiven-rabbitmq
@@ -35,7 +35,7 @@
dev.aherscu.qa
qa-jgiven-commons
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
org.projectlombok
@@ -44,7 +44,7 @@
com.rabbitmq
amqp-client
- 5.17.0
+ 5.19.0
diff --git a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/model/RabbitMqScenarioType.java b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/model/RabbitMqScenarioType.java
index f21a2cc2c6..03b7a093d6 100644
--- a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/model/RabbitMqScenarioType.java
+++ b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/model/RabbitMqScenarioType.java
@@ -19,7 +19,7 @@
/**
* Rest client type of scenario.
- *
+ *
* @author aherscu
*
*/
diff --git a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqFixtures.java b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqFixtures.java
index a2269a5615..3bd8c76e5b 100644
--- a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqFixtures.java
+++ b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqFixtures.java
@@ -21,7 +21,9 @@
import dev.aherscu.qa.jgiven.commons.steps.*;
import dev.aherscu.qa.jgiven.rabbitmq.model.*;
import dev.aherscu.qa.jgiven.rabbitmq.utils.*;
+import lombok.extern.slf4j.*;
+@Slf4j
public class RabbitMqFixtures>
extends GenericFixtures {
@@ -31,6 +33,7 @@ public class RabbitMqFixtures>
public SELF a_queue(@SuppressWarnings("hiding") @POJOFormat(
includeFields = { "queue",
"channel" }) final QueueHandler queueHandler) {
+ log.debug("setting queue handler {}", queueHandler);
this.queueHandler = queueHandler;
return self();
}
diff --git a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqVerifications.java b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqVerifications.java
index f8876e550f..4bbaaf1ef9 100644
--- a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqVerifications.java
+++ b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/steps/RabbitMqVerifications.java
@@ -25,7 +25,9 @@
import dev.aherscu.qa.jgiven.commons.steps.*;
import dev.aherscu.qa.jgiven.rabbitmq.model.*;
import dev.aherscu.qa.jgiven.rabbitmq.utils.*;
+import lombok.extern.slf4j.*;
+@Slf4j
public class RabbitMqVerifications>
extends GenericVerifications {
@ExpectedScenarioState
@@ -33,6 +35,7 @@ public class RabbitMqVerifications>> matcher) {
+ log.debug("retrieving all messages");
return eventually_assert_that(
() -> queueHandler.recievedMessages().values().stream(),
matcher);
@@ -41,6 +44,7 @@ public SELF the_retrieved_messages(
public SELF the_message_with_$_key(
final K key,
final Matcher> matcher) {
+ log.debug("retrieving message by {}", key);
return eventually_assert_that(
() -> queueHandler.recievedMessages().get(key),
matcher);
diff --git a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/utils/QueueHandler.java b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/utils/QueueHandler.java
index 4ae29b487c..0af4ff6803 100644
--- a/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/utils/QueueHandler.java
+++ b/qa-jgiven-rabbitmq/src/main/java/dev/aherscu/qa/jgiven/rabbitmq/utils/QueueHandler.java
@@ -73,7 +73,7 @@ public class QueueHandler implements AutoCloseable {
*
*
* Build it:
- *
+ *
*
* private final Supplier> queueHandlerSupplier =
* QueueHandler.Singleton. builder()
@@ -98,12 +98,12 @@ public class QueueHandler implements AutoCloseable {
* It is guaranteed that calling {@code queueHandler()} from any
* thread, will supply the same QueueHandler instance.
*
- *
+ *
*
* The connection is internally managed and closed via a runtime shutdown
* hook.
*
- *
+ *
* @param
* type of message-key; it should have a proper hash function in
* order to get O(1) access time, otherwise it may degrade to
diff --git a/qa-jgiven-rabbitmq/src/test/resources/logback-test.xml b/qa-jgiven-rabbitmq/src/test/resources/logback-test.xml
index cee6329f21..a1748d7dd7 100644
--- a/qa-jgiven-rabbitmq/src/test/resources/logback-test.xml
+++ b/qa-jgiven-rabbitmq/src/test/resources/logback-test.xml
@@ -56,7 +56,7 @@
-
+
target/per-thread-logs/test-${threadId}.log
false
diff --git a/qa-jgiven-reporter-maven-plugin/.classpath b/qa-jgiven-reporter-maven-plugin/.classpath
index 67e7e3ffcd..f04414371e 100644
--- a/qa-jgiven-reporter-maven-plugin/.classpath
+++ b/qa-jgiven-reporter-maven-plugin/.classpath
@@ -6,12 +6,14 @@
+
+
-
+
diff --git a/qa-jgiven-reporter-maven-plugin/pom.xml b/qa-jgiven-reporter-maven-plugin/pom.xml
index 6d1226915c..c3e8665f98 100644
--- a/qa-jgiven-reporter-maven-plugin/pom.xml
+++ b/qa-jgiven-reporter-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
dev.aherscu.qa
qa-automation
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
qa-jgiven-reporter-maven-plugin
@@ -34,6 +34,11 @@
JSON Report files.
+
+
+ true
+
+
org.projectlombok
@@ -79,7 +84,7 @@
dev.aherscu.qa
qa-jgiven-reporter
- 0.0.35-SNAPSHOT
+ 1.0.0-SNAPSHOT
@@ -95,7 +100,7 @@
junit
- 3.8.1
+ 3.8.2
test
@@ -171,23 +176,5 @@
true
-
-
- platform-jdk11
-
- [11,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- --add-opens java.base/java.io=ALL-UNNAMED
-
-
-
-
-