Merge pull request #403 from sbtqa/migrate-to-native-wdm

Migrate to native wdm
sbtqa · Aug 30, 2023 · 9509fcb · 9509fcb
2 parents 6604859 + 2adedec
commit 9509fcb
Show file tree

Hide file tree

Showing 28 changed files with 145 additions and 275 deletions.
diff --git a/page-factory-api/pom.xml b/page-factory-api/pom.xml
@@ -6,7 +6,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>

diff --git a/page-factory-core/pom.xml b/page-factory-core/pom.xml
@@ -7,7 +7,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>

diff --git a/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/allure/CategoriesInjector.java b/page-factory-core/src/main/java/ru/sbtqa/tag/pagefactory/allure/CategoriesInjector.java
@@ -9,7 +9,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/page-factory-doc/pom.xml b/page-factory-doc/pom.xml
@@ -6,7 +6,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>

diff --git a/plugins/html-plugin/pom.xml b/plugins/html-plugin/pom.xml
@@ -6,7 +6,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>
@@ -17,7 +17,7 @@
 
  <properties>
  <renamed.war>test-web-app.war</renamed.war>
- <jetty.version>9.4.13.v20181111</jetty.version>
+ <jetty.version>9.4.27.v20200227</jetty.version>
  <skipTests>false</skipTests>
  </properties>
 

diff --git a/plugins/html-plugin/src/test/java/ru/sbtqa/tag/pagefactory/CucumberTest.java b/plugins/html-plugin/src/test/java/ru/sbtqa/tag/pagefactory/CucumberTest.java
@@ -2,11 +2,20 @@
 
 import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(monochrome = true, plugin = {"pretty"},
  glue = {"ru.sbtqa.tag.stepdefs", "setting"},
  features = {"src/test/resources/features"})
 public class CucumberTest {
+ @BeforeClass
+ public static void setup() {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
+ }
 }
diff --git a/plugins/html-plugin/src/test/java/ru/sbtqa/tag/pagefactory/JunitTest.java b/plugins/html-plugin/src/test/java/ru/sbtqa/tag/pagefactory/JunitTest.java
@@ -1,5 +1,8 @@
 package ru.sbtqa.tag.pagefactory;
 
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -20,6 +23,8 @@ public class JunitTest {
 
  @BeforeClass
  public static void before() throws Exception {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
  server.startJetty();
  }
 

diff --git a/plugins/html-plugin/src/test/resources/config/application.properties b/plugins/html-plugin/src/test/resources/config/application.properties
@@ -4,7 +4,12 @@ screenshot.strategy=driver
 webdriver.browser.name=Chrome
 webdriver.starting.url=http://localhost:8181
 
-# run chrome in headless mode
-webdriver.chrome.capability.options.args=headless,disable-gpu,no-sandbox,--remote-allow-origins=*
+# Run in headless mode
+webdriver.chrome.capability.options.args=headless,disable-gpu,no-sandbox,remote-allow-origins=*
+webdriver.edge.capability.options.args=headless,disable-gpu,no-sandbox,remote-allow-origins=*
+webdriver.firefox.capability.options.args=headless
+
+#Situable for headless firefox
+#webdriver.browser.size=10980x1080
 
 junit.lang = en
diff --git a/plugins/mobile-plugin/pom.xml b/plugins/mobile-plugin/pom.xml
@@ -8,7 +8,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>
@@ -27,11 +27,24 @@
  <artifactId>page-factory-core</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
  <dependency>
  <groupId>io.appium</groupId>
  <artifactId>java-client</artifactId>
  <version>8.3.0</version>
  <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
  <exclusion>
  <groupId>org.seleniumhq.selenium</groupId>
  <artifactId>selenium-remote-driver</artifactId>
@@ -63,6 +76,11 @@
  <artifactId>cglib</artifactId>
  <version>3.2.5</version>
  </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>7.2</version>
+ </dependency>
  </dependencies>
 
  <build>

diff --git a/plugins/mobile-plugin/src/test/java/pagefactory/mobile/CucumberTest.java b/plugins/mobile-plugin/src/test/java/pagefactory/mobile/CucumberTest.java
@@ -2,6 +2,10 @@
 
 import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 
@@ -13,4 +17,10 @@
 )
 public class CucumberTest {
 
+ @BeforeClass
+ public static void setup() {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
+ }
+
 }
diff --git a/plugins/mobile-plugin/src/test/java/pagefactory/mobile/JunitTest.java b/plugins/mobile-plugin/src/test/java/pagefactory/mobile/JunitTest.java
@@ -1,5 +1,9 @@
 package pagefactory.mobile;
 
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import ru.sbtqa.tag.pagefactory.exceptions.PageException;
@@ -8,6 +12,12 @@
 @Ignore
 public class JunitTest {
 
+ @BeforeClass
+ public static void setupClass() {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
+ }
+
  @Test
  public void mobileTest() throws PageException {
  MobileSteps.getInstance()

diff --git a/plugins/mq-plugin/pom.xml b/plugins/mq-plugin/pom.xml
@@ -6,7 +6,7 @@
  <artifactId>page-factory-2</artifactId>
  <groupId>ru.sbtqa.tag</groupId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/mq-plugin/src/test/java/ru/sbtqa/tag/mq/ActiveMqTest.java b/plugins/mq-plugin/src/test/java/ru/sbtqa/tag/mq/ActiveMqTest.java
@@ -1,10 +1,9 @@
 package ru.sbtqa.tag.mq;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.junit.*;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.slf4j.Logger;
@@ -38,6 +37,12 @@ public class ActiveMqTest {
  private QueueConnection mQueueConnection;
  private Jms<TextMessage> mqService;
 
+ @BeforeClass
+ public static void setupClass() {
+ BasicConfigurator.configure();
+ org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
+ }
+
  @Before
  public void beforeTest() {
  mQueueConnection = null;

diff --git a/plugins/rest-plugin/pom.xml b/plugins/rest-plugin/pom.xml
@@ -8,7 +8,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>
@@ -31,7 +31,7 @@
  <dependency>
  <groupId>io.rest-assured</groupId>
  <artifactId>rest-assured</artifactId>
- <version>3.3.0</version>
+ <version>5.3.1</version>
  <exclusions>
  <exclusion>
  <artifactId>commons-lang3</artifactId>
@@ -47,7 +47,7 @@
  <dependency>
  <groupId>com.google.code.gson</groupId>
  <artifactId>gson</artifactId>
- <version>2.10</version>
+ <version>${gson.version}</version>
  </dependency>
 
  <!--TESTS-->
@@ -60,19 +60,7 @@
  <dependency>
  <groupId>org.eclipse.jetty</groupId>
  <artifactId>jetty-servlet</artifactId>
- <version>9.4.27.v20200227</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.2.11</version>
+ <version>11.0.15</version>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/CucumberTest.java b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/CucumberTest.java
@@ -2,6 +2,9 @@
 
 import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 import org.eclipse.jetty.server.Server;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -20,6 +23,8 @@ public class CucumberTest {
 
  @BeforeClass
  public static void setup() {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
  server = JettyServiceUtils.startJetty();
  }
 

diff --git a/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java b/plugins/rest-plugin/src/test/java/ru/sbtqa/tag/api/JunitTests.java
@@ -1,5 +1,8 @@
 package ru.sbtqa.tag.api;
 
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 import org.eclipse.jetty.server.Server;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -31,6 +34,8 @@ public class JunitTests {
 
  @BeforeClass
  public static void setupClass() {
+ BasicConfigurator.configure();
+ Logger.getRootLogger().setLevel(Level.INFO);
  server = JettyServiceUtils.startJetty();
  }
 

diff --git a/...gin/src/test/java/ru/sbtqa/tag/api/entries/fromfeature/SecondRequestFromFeatureEntry.java b/...gin/src/test/java/ru/sbtqa/tag/api/entries/fromfeature/SecondRequestFromFeatureEntry.java
@@ -17,7 +17,7 @@ public class SecondRequestFromFeatureEntry extends EndpointEntry {
  @Validation(title = "result")
  public void validate() {
  getResponse().body("result", equalTo("q1=" + Default.HEADER_PARAMETER_VALUE_1 + "|" + "q2=" + Default.QUERY_PARAMETER_VALUE_1
- + "|" + "h1=" + Default.HEADER_PARAMETER_VALUE_1 + "|" + "h2=application/json; charset=UTF-8|"
+ + "|" + "h1=" + Default.HEADER_PARAMETER_VALUE_1 + "|" + "h2=application/json|"
  + "id=" + Default.ID + "|" + "name=" + Default.NAME + "|" + "email=parameter-value|"));
  }
 }
diff --git a/plugins/web-plugin/pom.xml b/plugins/web-plugin/pom.xml
@@ -8,7 +8,7 @@
  <groupId>ru.sbtqa.tag</groupId>
  <artifactId>page-factory-2</artifactId>
  <version>17.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
  </parent>
 
  <groupId>ru.sbtqa.tag.pagefactory</groupId>
@@ -19,7 +19,7 @@
 
  <properties>
  <renamed.war>test-web-app.war</renamed.war>
- <jetty.version>9.4.13.v20181111</jetty.version>
+ <jetty.version>9.4.27.v20200227</jetty.version>
  <skipTests>false</skipTests>
  </properties>
 
@@ -30,9 +30,9 @@
  <version>${project.version}</version>
  </dependency>
  <dependency>
- <groupId>ru.sbtqa</groupId>
+ <groupId>io.github.bonigarcia</groupId>
  <artifactId>webdrivermanager</artifactId>
- <version>${tag.version.webdrivermanager}</version>
+ <version>${webdrivermanager.version}</version>
  </dependency>
  <dependency>
  <groupId>com.google.guava</groupId>