From 0515d9f60fc38ce63f1bea7f64996de0262d41c6 Mon Sep 17 00:00:00 2001 From: Martin Schneider Date: Wed, 12 Feb 2020 14:58:20 +0800 Subject: [PATCH] Release 1.8-RC2 Small fixes and changes for AWS Devicefarm execution --- justtestlah-applitools/pom.xml | 2 +- justtestlah-awsdevicefarm/pom.xml | 4 ++-- .../qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java | 4 +++- .../test/resources/aws-devicefarm-testspec-expected.yaml | 6 +++--- .../src/test/resources/aws-devicefarm-testspec-template.yml | 6 +++--- justtestlah-browserstack/pom.xml | 2 +- justtestlah-core/pom.xml | 2 +- justtestlah-demos/pom.xml | 2 +- justtestlah-demos/src/test/java/TestRunner.java | 5 +++++ .../java/qa/justtestlah/examples/runner/RunnerTest.java | 5 ----- .../src/test/resources/aws-devicefarm-testspec-template.yml | 6 +++--- justtestlah-galen/pom.xml | 2 +- justtestlah-mobile-tools/pom.xml | 2 +- justtestlah-quickstart/pom.xml | 2 +- justtestlah-visual/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 justtestlah-demos/src/test/java/TestRunner.java delete mode 100644 justtestlah-demos/src/test/java/qa/justtestlah/examples/runner/RunnerTest.java diff --git a/justtestlah-applitools/pom.xml b/justtestlah-applitools/pom.xml index 16285054..fd935636 100644 --- a/justtestlah-applitools/pom.xml +++ b/justtestlah-applitools/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/justtestlah-awsdevicefarm/pom.xml b/justtestlah-awsdevicefarm/pom.xml index f6dcdf03..35e6fab7 100644 --- a/justtestlah-awsdevicefarm/pom.xml +++ b/justtestlah-awsdevicefarm/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 @@ -98,7 +98,7 @@ - 1.7-RC5 + 1.8-RC1 diff --git a/justtestlah-awsdevicefarm/src/test/java/qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java b/justtestlah-awsdevicefarm/src/test/java/qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java index f7cbbeb7..236c83fe 100644 --- a/justtestlah-awsdevicefarm/src/test/java/qa/justtestlah/awsdevicefarm/TestSpecFactoryTest.java +++ b/justtestlah-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 index 9ed596f5..191b96d4 100644 --- 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 index 118cc017..3dac23c7 100644 --- 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 index 41c998a7..3250e028 100644 --- a/justtestlah-browserstack/pom.xml +++ b/justtestlah-browserstack/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/justtestlah-core/pom.xml b/justtestlah-core/pom.xml index cffb52be..72ea0a2c 100644 --- a/justtestlah-core/pom.xml +++ b/justtestlah-core/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/justtestlah-demos/pom.xml b/justtestlah-demos/pom.xml index 114f3462..2290d16d 100644 --- a/justtestlah-demos/pom.xml +++ b/justtestlah-demos/pom.xml @@ -131,7 +131,7 @@ copy-dependencies - package + prepare-package copy-dependencies diff --git a/justtestlah-demos/src/test/java/TestRunner.java b/justtestlah-demos/src/test/java/TestRunner.java new file mode 100644 index 00000000..f354c850 --- /dev/null +++ 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 deleted file mode 100644 index d16c78f4..00000000 --- a/justtestlah-demos/src/test/java/qa/justtestlah/examples/runner/RunnerTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package qa.justtestlah.examples.runner; - -import qa.justtestlah.junit.JustTestLahTest; - -public class RunnerTest extends JustTestLahTest {} diff --git a/justtestlah-demos/src/test/resources/aws-devicefarm-testspec-template.yml b/justtestlah-demos/src/test/resources/aws-devicefarm-testspec-template.yml index 118cc017..3dac23c7 100644 --- 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 index f8625058..96a64c3e 100644 --- a/justtestlah-galen/pom.xml +++ b/justtestlah-galen/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/justtestlah-mobile-tools/pom.xml b/justtestlah-mobile-tools/pom.xml index 04de3e4d..92fc4459 100644 --- a/justtestlah-mobile-tools/pom.xml +++ b/justtestlah-mobile-tools/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/justtestlah-quickstart/pom.xml b/justtestlah-quickstart/pom.xml index 747b4fc6..7c999343 100644 --- a/justtestlah-quickstart/pom.xml +++ b/justtestlah-quickstart/pom.xml @@ -5,7 +5,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 justtestlah-quickstart JustTestLah! Quickstart diff --git a/justtestlah-visual/pom.xml b/justtestlah-visual/pom.xml index f724ec4d..56828d9d 100644 --- a/justtestlah-visual/pom.xml +++ b/justtestlah-visual/pom.xml @@ -9,7 +9,7 @@ qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 diff --git a/pom.xml b/pom.xml index e62df332..6850a000 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 qa.justtestlah justtestlah-parent - 1.8-SNAPSHOT + 1.8-RC2 JustTestLah! pom 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.