Shortening string representation of capabilities in exceptions thrown…

… by grid
SeleniumHQ · Dec 20, 2013 · 8135e70 · 8135e70
1 parent e0bdd6b
commit 8135e70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/java/server/src/org/openqa/grid/common/exception/CapabilityNotPresentOnTheGridException.java b/java/server/src/org/openqa/grid/common/exception/CapabilityNotPresentOnTheGridException.java
@@ -17,6 +17,8 @@
 
 package org.openqa.grid.common.exception;
 
+import org.openqa.selenium.remote.DesiredCapabilities;
+
 import java.util.Map;
 
 public class CapabilityNotPresentOnTheGridException extends GridException {
@@ -28,6 +30,6 @@ public CapabilityNotPresentOnTheGridException(String msg) {
   }
 
   public CapabilityNotPresentOnTheGridException(Map<String, Object> capabilities) {
-    super("cannot find : " + capabilities);
+    super("cannot find : " + new DesiredCapabilities(capabilities));
   }
 }
diff --git a/java/server/src/org/openqa/grid/internal/ProxySet.java b/java/server/src/org/openqa/grid/internal/ProxySet.java
@@ -21,6 +21,7 @@
 
 import org.openqa.grid.common.exception.CapabilityNotPresentOnTheGridException;
 import org.openqa.grid.common.exception.GridException;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -152,7 +153,8 @@ public int size() {
   public void verifyAbilityToHandleDesiredCapabilities(Map<String, Object> desiredCapabilities) {
     if (proxies.isEmpty()) {
       if (throwOnCapabilityNotPresent) {
-        throw new GridException("Empty pool of VM for setup " + desiredCapabilities);
+        throw new GridException("Empty pool of VM for setup "
+                                + new DesiredCapabilities(desiredCapabilities));
       } else {
         log.warning("Empty pool of nodes.");
       }
@@ -162,7 +164,7 @@ public void verifyAbilityToHandleDesiredCapabilities(Map<String, Object> desired
       if (throwOnCapabilityNotPresent) {
         throw new CapabilityNotPresentOnTheGridException(desiredCapabilities);
       } else {
-        log.warning("grid doesn't contain " + desiredCapabilities +
+        log.warning("grid doesn't contain " + new DesiredCapabilities(desiredCapabilities) +
                     " at the moment.");
       }