Release 1.8-RC2

Small fixes and changes for AWS Devicefarm execution
martinschneider · Feb 12, 2020 · 0515d9f · 0515d9f
1 parent de067f4
commit 0515d9f
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 26 deletions.
diff --git a/justtestlah-applitools/pom.xml b/justtestlah-applitools/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/justtestlah-awsdevicefarm/pom.xml b/justtestlah-awsdevicefarm/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>
@@ -98,7 +98,7 @@
         <!-- This is only used for the integration test. We use an old version 
           here to ensure it is in the Maven repository (the old version will definitely 
           be on Maven central). -->
-        <justtestlah.version>1.7-RC5</justtestlah.version>
+        <justtestlah.version>1.8-RC1</justtestlah.version>
       </properties>
       <build>
         <plugins>

diff --git a/...testlah-awsdevicefarm/src/test/java/qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java b/...testlah-awsdevicefarm/src/test/java/qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java
@@ -37,7 +37,9 @@ public void testCreateTestSpec() throws IOException, URISyntaxException {
             new File(new TestSpecFactory(properties).createTestSpec()), StandardCharsets.UTF_8);
 
     for (int i = 0; i < expected.size(); i++) {
-      assertThat(expected.get(i)).isEqualTo(actual.get(i));
+      assertThat(expected.get(i))
+          .as(String.format("check line %d", i + 1))
+          .isEqualTo(actual.get(i));
     }
   }
 }
diff --git a/justtestlah-awsdevicefarm/src/test/resources/aws-devicefarm-testspec-expected.yaml b/justtestlah-awsdevicefarm/src/test/resources/aws-devicefarm-testspec-expected.yaml
@@ -49,8 +49,6 @@ phases:
             fi;
         done;
 
-  test:
-    commands:
       # Prepare the test code
       - cd $DEVICEFARM_TEST_PACKAGE_PATH
       - echo "Extracting JAR files"
@@ -85,9 +83,11 @@ phases:
       - echo "cloudprovider=local" >> justtestlah.properties
       - cat justtestlah.properties
 
+  test:
+    commands:
       # Finally...
       - echo "Executing test scenarios"
-      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -Djusttestlah.properties=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
+      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -DjtlProps=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
 
   post_test:
     commands:

diff --git a/justtestlah-awsdevicefarm/src/test/resources/aws-devicefarm-testspec-template.yml b/justtestlah-awsdevicefarm/src/test/resources/aws-devicefarm-testspec-template.yml
@@ -49,8 +49,6 @@ phases:
             fi;
         done;
 
-  test:
-    commands:
       # Prepare the test code
       - cd $DEVICEFARM_TEST_PACKAGE_PATH
       - echo "Extracting JAR files"
@@ -85,9 +83,11 @@ phases:
       - echo "cloudprovider=local" >> justtestlah.properties
       - cat justtestlah.properties
 
+  test:
+    commands:
       # Finally...
       - echo "Executing test scenarios"
-      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -Djusttestlah.properties=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
+      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -DjtlProps=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
 
   post_test:
     commands:

diff --git a/justtestlah-browserstack/pom.xml b/justtestlah-browserstack/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/justtestlah-core/pom.xml b/justtestlah-core/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/justtestlah-demos/pom.xml b/justtestlah-demos/pom.xml
@@ -131,7 +131,7 @@
             <executions>
               <execution>
                 <id>copy-dependencies</id>
-                <phase>package</phase>
+                <phase>prepare-package</phase>
                 <goals>
                   <goal>copy-dependencies</goal>
                 </goals>

diff --git a/justtestlah-demos/src/test/java/TestRunner.java b/justtestlah-demos/src/test/java/TestRunner.java
@@ -0,0 +1,5 @@
+import qa.justtestlah.junit.JustTestLahTest;
+
+@SuppressWarnings("PMD.DefaultPackage")
+// this class uses the default package for convenient usage
+public class TestRunner extends JustTestLahTest {}
diff --git a/justtestlah-demos/src/test/java/qa/justtestlah/examples/runner/RunnerTest.java b/justtestlah-demos/src/test/java/qa/justtestlah/examples/runner/RunnerTest.java
diff --git a/justtestlah-demos/src/test/resources/aws-devicefarm-testspec-template.yml b/justtestlah-demos/src/test/resources/aws-devicefarm-testspec-template.yml
@@ -49,8 +49,6 @@ phases:
             fi;
         done;
 
-  test:
-    commands:
       # Prepare the test code
       - cd $DEVICEFARM_TEST_PACKAGE_PATH
       - echo "Extracting JAR files"
@@ -85,9 +83,11 @@ phases:
       - echo "cloudprovider=local" >> justtestlah.properties
       - cat justtestlah.properties
 
+  test:
+    commands:
       # Finally...
       - echo "Executing test scenarios"
-      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -Djusttestlah.properties=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
+      - java -Dappium.screenshots.dir=$DEVICEFARM_SCREENSHOT_PATH -DjtlProps=$(pwd)/justtestlah.properties -Dlogback.configurationFile=classes/logback-aws.xml -cp classes:dependency-jars/* org.junit.runner.JUnitCore TestRunner
 
   post_test:
     commands:

diff --git a/justtestlah-galen/pom.xml b/justtestlah-galen/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/justtestlah-mobile-tools/pom.xml b/justtestlah-mobile-tools/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/justtestlah-quickstart/pom.xml b/justtestlah-quickstart/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <artifactId>justtestlah-quickstart</artifactId>
   <name>JustTestLah! Quickstart</name>

diff --git a/justtestlah-visual/pom.xml b/justtestlah-visual/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>qa.justtestlah</groupId>
     <artifactId>justtestlah-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>1.8-RC2</version>
   </parent>
   <licenses>
     <license>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>qa.justtestlah</groupId>
   <artifactId>justtestlah-parent</artifactId>
-  <version>1.8-SNAPSHOT</version>
+  <version>1.8-RC2</version>
   <name>JustTestLah!</name>
   <packaging>pom</packaging>
   <description>JustTestLah! is a JAVA test framework targeting projects that support multiple platforms, in particular Web, Android and iOS. It follows a BDD approach and allows testing against all platforms using the same feature files. JustTestLah's main aim is to make the configuration and the actual test code as easy as possible.</description>