From b04506ed01f987fdf6e362ed1fdedbc20f5531b4 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 28 Jun 2019 12:06:38 +0100 Subject: [PATCH 1/6] Added and updated some plugins and dependencies --- pom.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 19ca297f..af6b9030 100755 --- a/pom.xml +++ b/pom.xml @@ -193,8 +193,40 @@ 2.6 test + + + + org.javassist + javassist + 3.23.1-GA + + + org.mockito + mockito-core + 2.20.0 + test + + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + javax.xml.bind + jaxb-api + 2.4.0-b180725.0427 + + + org.glassfish.jaxb + jaxb-runtime + 2.4.0-b180725.0644 + + + @@ -207,8 +239,10 @@ maven-compiler-plugin 3.8.0 - 1.8 - 1.8 + + 11 + + @@ -308,13 +342,19 @@ org.apache.maven.plugins maven-surefire-plugin 2.22.0 + - ${surefireArgLine} + + + --illegal-access=permit + + */*Spec.* + @@ -391,7 +431,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.1.0 attach-sources @@ -421,6 +461,18 @@ @{version} + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + false + + From 828e465e78b52fc50c746dbe37c81edb37515dde Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 1 Jul 2019 11:41:57 +0100 Subject: [PATCH 2/6] Full build with excess dependencies deleted --- pom.xml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/pom.xml b/pom.xml index af6b9030..7df19206 100755 --- a/pom.xml +++ b/pom.xml @@ -193,36 +193,6 @@ 2.6 test - - - - org.javassist - javassist - 3.23.1-GA - - - org.mockito - mockito-core - 2.20.0 - test - - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - javax.xml.bind - jaxb-api - 2.4.0-b180725.0427 - - - org.glassfish.jaxb - jaxb-runtime - 2.4.0-b180725.0644 - From 57289583c7b8a5cf6d61861fd16f98f3403cfeff Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 4 Jul 2019 12:04:39 +0100 Subject: [PATCH 3/6] Updates finished with comments --- pom.xml | 65 +++++++++---------- .../tests/TheInternetExampleTests.java | 12 +++- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 7df19206..d4c92a7a 100755 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,9 @@ 1 - 1.9.2 - 2.9.0 + 1.9.4 + 2.12.1 + 0.46 UTF-8 UTF-8 @@ -86,7 +87,7 @@ com.saucelabs saucerest - 1.0.39 + 1.0.42 @@ -105,12 +106,13 @@ com.google.truth truth - 0.42 + + 0.46 com.google.truth.extensions truth-java8-extension - 0.42 + 0.46 org.apache.logging.log4j log4j-api - 2.11.1 + 2.12.0 org.apache.logging.log4j log4j-core - 2.11.1 + 2.12.0 org.slf4j slf4j-simple - 1.7.25 + 1.7.26 io.rest-assured rest-assured - 3.2.0 + 4.0.0 org.codehaus.groovy @@ -159,7 +161,7 @@ org.apache.commons commons-lang3 - 3.8.1 + 3.9 org.json @@ -169,12 +171,12 @@ com.fasterxml.jackson.core jackson-annotations - 2.9.8 + 2.9.9 org.codehaus.groovy groovy-all - 2.5.5 + 2.5.7 pom @@ -182,7 +184,7 @@ org.spockframework spock-core - 1.2-groovy-2.5 + 1.3-groovy-2.5 test @@ -195,8 +197,6 @@ - - @@ -207,7 +207,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 11 @@ -220,11 +220,13 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + 3.1.0 com.puppycrawl.tools checkstyle + + 8.18 @@ -249,7 +251,7 @@ org.jacoco jacoco-maven-plugin - 0.8.2 + 0.8.4 @@ -297,7 +299,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.6.1 + 1.7.1 @@ -311,13 +313,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 - + 3.0.0-M3 + - - --illegal-access=permit + ${surefireArgLine} @@ -339,7 +340,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.0 + 3.0.0-M3 methods ${threads} @@ -382,18 +383,14 @@ + io.qameta.allure allure-maven - 2.9 + 2.10.0 ${allure.version} - - https://dl.bintray.com/qameta/maven/io/qameta/allure/allure-commandline/%s/allure-commandline-%s.zip @@ -415,7 +412,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.1.0 -Xdoclint:none @@ -433,12 +430,12 @@ org.codehaus.mojo versions-maven-plugin - 2.5 + 2.7 false diff --git a/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java b/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java index f7b87f61..76c2b4a0 100644 --- a/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java +++ b/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java @@ -12,6 +12,7 @@ import java.util.stream.Stream; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.Truth.assertWithMessage; @Feature("The Internet Example Feature") @Test @@ -40,9 +41,14 @@ public void dragAndDrop() { .dragAontoB() .getListOfHeadings(); - assertThat(headings) - .named("Order of headings") + // Method named() has been depreciated. Unsure if this is a viable fix + assertWithMessage("Order of headings") + .that(headings) .containsExactly("B", "A"); + +// assertThat(headings) +// .named("Order of headings") +// .containsExactly("B", "A"); } @Issue("INT-5") @@ -105,7 +111,7 @@ public void sortDataTable() { .collect(Collectors.toList()); assertThat(sortedLastNameColumn.get(0)).isEqualTo("Bach"); - assertThat(sortedLastNameColumn).isOrdered(); + assertThat(sortedLastNameColumn).isInOrder(); } } From f65f92fbbaa776fd0c350ea6baddf02e53bb53ee Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 4 Jul 2019 12:24:05 +0100 Subject: [PATCH 4/6] Fixed to Java 8 --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d4c92a7a..c5a23800 100755 --- a/pom.xml +++ b/pom.xml @@ -210,9 +210,9 @@ 3.8.1 - 11 - - + + 1.8 + 1.8 @@ -314,7 +314,6 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M3 - From b4059f50c8c59288f155944a65bcde16b7962978 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 4 Jul 2019 13:25:33 +0100 Subject: [PATCH 5/6] Checkstyle file changed --- doc/style/style.xml | 2 +- pom.xml | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/doc/style/style.xml b/doc/style/style.xml index 3562db20..2bd52c55 100644 --- a/doc/style/style.xml +++ b/doc/style/style.xml @@ -64,7 +64,7 @@ + value="CLASS_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> diff --git a/pom.xml b/pom.xml index c5a23800..8dc7068b 100755 --- a/pom.xml +++ b/pom.xml @@ -107,12 +107,12 @@ com.google.truth truth - 0.46 + ${truth.version} com.google.truth.extensions truth-java8-extension - 0.46 + ${truth.version} @@ -225,9 +226,7 @@ com.puppycrawl.tools checkstyle - - - 8.18 + 8.22 @@ -428,9 +427,7 @@ - + org.codehaus.mojo versions-maven-plugin @@ -442,4 +439,4 @@ - + \ No newline at end of file From 733af64413b49c3796e016f1f2f7a05b39c6a1a1 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 4 Jul 2019 13:58:26 +0100 Subject: [PATCH 6/6] Small changes --- .../theinternet/tests/TheInternetExampleTests.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java b/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java index 76c2b4a0..3e2e69b6 100644 --- a/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java +++ b/src/test/java/com/frameworkium/integration/theinternet/tests/TheInternetExampleTests.java @@ -41,14 +41,9 @@ public void dragAndDrop() { .dragAontoB() .getListOfHeadings(); - // Method named() has been depreciated. Unsure if this is a viable fix assertWithMessage("Order of headings") .that(headings) .containsExactly("B", "A"); - -// assertThat(headings) -// .named("Order of headings") -// .containsExactly("B", "A"); } @Issue("INT-5")