Merge remote-tracking branch 'origin/master'

# Conflicts:
#	azure-pipelines.yml

Author: mialeska

azure-pipelines.yml

@@ -53,7 +53,7 @@ jobs:
 
   variables:
     ANDROID_EMU_NAME: test
-    ANDROID_SDK_ID: system-images;android-30;google_apis_playstore;x86
+    ANDROID_SDK_ID: system-images;android-30;google_apis_playstore;x86_64
 
   steps:
     - task: CmdLine@2
@@ -78,12 +78,19 @@ jobs:
           echo "Starting emulator"
           nohup $ANDROID_HOME/emulator/emulator -avd "$(ANDROID_EMU_NAME)" -gpu swiftshader_indirect -noaudio -no-boot-anim -no-snapshot -verbose > /dev/null 2>&1 &
           $ANDROID_HOME/platform-tools/adb wait-for-device
-          while [[ $? -ne 0 ]]; do sleep 1; $ANDROID_HOME/platform-tools/adb shell pm list packages; done;
+          for i in {1..300}; do
+            $ANDROID_HOME/platform-tools/adb shell pm list packages >/dev/null 2>&1 && break
+            sleep 2
+          done
+          if [[ $i -eq 300 ]]; then
+            echo "Emulator failed to boot in time" >&2
+            exit 1
+          fi
           $ANDROID_HOME/platform-tools/adb devices
           echo "Emulator started"
 
           echo "Installing Appium"
-          npm install -g appium@latest
+          npm install -g appium@2
           ln -fs /usr/local/lib/node_modules/appium/build/lib/main.js /usr/local/bin/appium
           chmod +x /usr/local/bin/appium
           export PATH=$PATH:/usr/local/bin/appium

pom.xml

@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <id>pre-unit-test</id>
@@ -111,7 +111,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
                         <configuration>
@@ -125,7 +125,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.7</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -174,7 +174,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.13</version>
+                <version>1.7.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>

src/test/java/samples/android/ITestRadioButton.java

@@ -11,12 +11,12 @@ public interface ITestRadioButton {
 
     default void testRadioButton() {
         openRadioButtonsScreen();
-        IRadioButton button1 = getRadioButton(1);
-        Assert.assertFalse(button1.isChecked(), "RadioButton should not be checked initially");
-        button1.click();
-        Assert.assertTrue(button1.isChecked(), "RadioButton should be checked after click on it");
-        getRadioButton(2).click();
-        Assert.assertFalse(button1.isChecked(),
-                String.format("RadioButton %s should not be checked after click on another option", button1.getName()));
+        IRadioButton button2 = getRadioButton(2);
+        Assert.assertFalse(button2.isChecked(), "RadioButton should not be checked initially");
+        button2.click();
+        Assert.assertTrue(button2.isChecked(), "RadioButton should be checked after click on it");
+        getRadioButton(1).click();
+        Assert.assertFalse(button2.isChecked(),
+                String.format("RadioButton %s should not be checked after click on another option", button2.getName()));
     }
 }

src/test/java/samples/android/web/WebRadioButtonTest.java

@@ -10,7 +10,7 @@ public class WebRadioButtonTest extends AndroidWebTest implements ITestRadioButt
 
     @Override
     public void openRadioButtonsScreen() {
-        AqualityServices.getApplication().getDriver().get("http://www.echoecho.com/htmlforms10.htm");
+        AqualityServices.getApplication().getDriver().get("https://formy-project.herokuapp.com/radiobutton");
     }
 
     @Override