Breaking a circular build dependency in test code

SeleniumHQ · Jun 27, 2014 · 4c6f34e · 4c6f34e
1 parent 6b58d26
commit 4c6f34e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java b/java/client/test/org/openqa/selenium/testing/drivers/TestIgnorance.java
@@ -48,7 +48,6 @@
 import org.openqa.selenium.testing.JavascriptEnabled;
 import org.openqa.selenium.testing.NativeEventsRequired;
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
-import org.openqa.selenium.testing.TestUtilities;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -132,10 +131,18 @@ private boolean isIgnoredBecauseOfNativeEvents(NativeEventsRequired annotation)
     }
 
     // We only have native events on Linux and Windows.
-    Platform platform = TestUtilities.getEffectivePlatform();
+    Platform platform = getEffectivePlatform();
     return !(platform.is(LINUX) || platform.is(WINDOWS));
   }
 
+  private static Platform getEffectivePlatform() {
+    if (SauceDriver.shouldUseSauce()) {
+      return SauceDriver.getEffectivePlatform();
+    }
+
+    return Platform.getCurrent();
+  }
+
   private boolean isIgnoredDueToBeingOnSauce(FrameworkMethod method, Object test) {
     return SauceDriver.shouldUseSauce() &&
            (method.getMethod().getAnnotation(NeedsLocalEnvironment.class) != null ||