Remove test-specific debug class

SeleniumHQ · Jul 6, 2021 · 2d817e5 · 2d817e5
1 parent 86eeec2
commit 2d817e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 45 deletions.
diff --git a/java/client/src/org/openqa/selenium/internal/Debug.java b/java/client/src/org/openqa/selenium/internal/Debug.java
@@ -26,11 +26,16 @@
  */
 public class Debug {
 
-  private static final boolean IS_DEBUG;
+  private static boolean IS_DEBUG;
   static {
-    IS_DEBUG = Boolean.getBoolean("selenium.webdriver.verbose") ||
-      // Thanks https://stackoverflow.com/a/6865049
-      ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("-agentlib:jdwp");
+    boolean debugFlag = ManagementFactory.getRuntimeMXBean().getInputArguments().stream()
+      .map(str -> str.contains("-agentlib:jdwp"))
+      .reduce(Boolean::logicalOr)
+      .orElse(false);
+    boolean simpleProperty = Boolean.getBoolean("selenium.debug");
+    boolean longerProperty = Boolean.getBoolean("selenium.webdriver.verbose");
+
+    IS_DEBUG = debugFlag || simpleProperty || longerProperty;
   }
 
   private Debug() {

diff --git a/java/client/test/org/openqa/selenium/build/Debug.java b/java/client/test/org/openqa/selenium/build/Debug.java
diff --git a/java/client/test/org/openqa/selenium/testing/CaptureLoggingRule.java b/java/client/test/org/openqa/selenium/testing/CaptureLoggingRule.java
@@ -39,7 +39,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
-import static org.openqa.selenium.build.Debug.isDebug;
+import static org.openqa.selenium.internal.Debug.isDebugging;
 
 public class CaptureLoggingRule implements TestRule {
   @Override
@@ -71,7 +71,7 @@ public void evaluate() throws Throwable {
     }
 
     private List<Handler> beginLogCapture() {
-      if (isDebug()) {
+      if (isDebugging()) {
         return emptyList();
       }
 
@@ -92,7 +92,7 @@ private List<Handler> beginLogCapture() {
     }
 
     private void writeCapturedLogs() {
-      if (isDebug()) {
+      if (isDebugging()) {
         return;
       }
 
@@ -104,7 +104,7 @@ private void writeCapturedLogs() {
     }
 
     private void endLogCapture(List<Handler> handlers) {
-      if (isDebug()) {
+      if (isDebugging()) {
         return;
       }