Merge branch 'main' into get-started-docs

Author: nadvolod

java/main/pom.xml

@@ -125,17 +125,41 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.1.2</version>
-        <configuration>
-          <properties>
-            <configurationParameters>
-              junit.jupiter.execution.parallel.enabled = true
-              junit.jupiter.execution.parallel.mode.default = concurrent
-              junit.jupiter.execution.parallel.config.strategy = fixed
-              junit.jupiter.execution.parallel.config.fixed.parallelism = ${surefire.parallel}
-              junit.jupiter.execution.parallel.config.fixed.max-pool-size = ${surefire.parallel}
-            </configurationParameters>
-          </properties>
-        </configuration>
+        <executions>
+          <execution>
+            <id>parallel-tests</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <properties>
+                <configurationParameters>
+                  junit.jupiter.execution.parallel.enabled = true
+                  junit.jupiter.execution.parallel.mode.default = concurrent
+                  junit.jupiter.execution.parallel.config.strategy = fixed
+                  junit.jupiter.execution.parallel.config.fixed.parallelism = ${surefire.parallel}
+                  junit.jupiter.execution.parallel.config.fixed.max-pool-size = ${surefire.parallel}
+                </configurationParameters>
+              </properties>
+            </configuration>
+          </execution>
+          <execution>
+            <id>sequential-tests</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <includes>
+                <include>**/*Example.java</include>
+              </includes>
+              <properties>
+                <configurationParameters>
+                  junit.jupiter.execution.parallel.enabled = false
+                </configurationParameters>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

java/main/src/main/java/com/saucelabs/saucebindings/SauceSession.java

@@ -7,7 +7,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
-import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import org.openqa.selenium.Capabilities;
@@ -275,6 +274,11 @@ public void addTags(List<String> tags) {
     driver.executeScript("sauce:job-tags=" + tagString);
   }
 
+  public static boolean isDisabled() {
+    return Boolean.parseBoolean(System.getenv("SAUCE_DISABLED"))
+        || Boolean.getBoolean("sauce.disabled");
+  }
+
   /**
    * @deprecated Do not use magic strings, pass in boolean for whether test has passed.
    */
@@ -330,8 +334,4 @@ private void validateMac(String msg) {
       throw new InvalidArgumentException(error);
     }
   }
-
-  private boolean isDisabled() {
-    return Objects.equals(System.getProperty("saucelabs"), "false");
-  }
 }

java/main/src/test/java/com/saucelabs/saucebindings/examples/AccessibilityTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/AccessibilityExample.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class AccessibilityTest {
+public class AccessibilityExample {
 
   @Test
   public void startSession() {

java/main/src/test/java/com/saucelabs/saucebindings/examples/BrowserOptionsTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/BrowserOptionsExample.java

@@ -6,7 +6,7 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class BrowserOptionsTest {
+public class BrowserOptionsExample {
 
   @Test
   public void browserOptions() {

java/main/src/test/java/com/saucelabs/saucebindings/examples/CommonOptionsTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/CommonOptionsExample.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class CommonOptionsTest {
+public class CommonOptionsExample {
 
   @Test
   public void basicOptions() {

java/main/src/test/java/com/saucelabs/saucebindings/examples/DataCenterTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/DataCenterExample.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class DataCenterTest {
+public class DataCenterExample {
 
   @Test
   public void changeDataCenter() {

java/main/src/test/java/com/saucelabs/saucebindings/examples/DisableTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/DisableExample.java

@@ -7,12 +7,12 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebDriver;
 
-public class DisableTest {
+public class DisableExample {
 
   @Test
   public void startSession() {
     // 1. Toggle off sauce labs
-    System.setProperty("saucelabs", "false");
+    System.setProperty("sauce.disabled", "true");
 
     // 2. Create a Sauce Session
     SauceSession session = new SauceSession();
@@ -22,6 +22,7 @@ public void startSession() {
     Assertions.assertNull(driver);
 
     // 4. All session commands will be ignored
+    Assertions.assertNull(session.getDriver());
     Assertions.assertDoesNotThrow(
         () -> {
           session.annotate("This gets ignored");
@@ -35,6 +36,6 @@ public void startSession() {
 
   @AfterEach
   public void stopSession() {
-    System.clearProperty("saucelabs");
+    System.clearProperty("sauce.disabled");
   }
 }

java/main/src/test/java/com/saucelabs/saucebindings/examples/SauceLabsOptionsTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/SauceLabsOptionsExample.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class SauceLabsOptionsTest {
+public class SauceLabsOptionsExample {
 
   @Test
   public void sauceOptions() {

java/main/src/test/java/com/saucelabs/saucebindings/examples/SessionTest.java renamed to java/main/src/test/java/com/saucelabs/saucebindings/examples/SessionExample.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-public class SessionTest {
+public class SessionExample {
 
   @Test
   public void startSession() {