fixed object matching with multiline text elements

haavistoj · haavistoj · commit 435287ca9f6c · 2018-08-14T13:50:57.000+03:00
diff --git a/src/main/java/javafxlibrary/utils/HelperFunctions.java b/src/main/java/javafxlibrary/utils/HelperFunctions.java
@@ -90,7 +90,7 @@ public static Node waitUntilExists(String target, int timeout, String timeUnit)
                     + timeout + " " + timeUnit);
         } catch (Exception e) {
             RobotLog.trace("Exception in waitUntilExists: " + e + "\n" + e.getCause().toString());
-            throw new JavaFXLibraryNonFatalException("waitUntilExist failed: " + e);
+            throw new JavaFXLibraryNonFatalException("waitUntilExist failed: ", e);
         }
     }
 
@@ -150,7 +150,7 @@ public static Object mapObject(Object object) {
         if (object != null) {
             if (isCompatible(object))
                 return object;
-            String key = object.hashCode() + object.toString();
+            String key = (object.hashCode() + object.toString()).replaceAll("\r", "").replaceAll("\n", "");
             objectMap.put(key, object);
             return key;
         }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static Node waitUntilExists(String target, int timeout, String timeUnit)`
`90`	`90`	`+ timeout + " " + timeUnit);`
`91`	`91`	`} catch (Exception e) {`
`92`	`92`	`RobotLog.trace("Exception in waitUntilExists: " + e + "\n" + e.getCause().toString());`
`93`		`- throw new JavaFXLibraryNonFatalException("waitUntilExist failed: " + e);`
	`93`	`+ throw new JavaFXLibraryNonFatalException("waitUntilExist failed: ", e);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`@@ -150,7 +150,7 @@ public static Object mapObject(Object object) {`
`150`	`150`	`if (object != null) {`
`151`	`151`	`if (isCompatible(object))`
`152`	`152`	`return object;`
`153`		`- String key = object.hashCode() + object.toString();`
	`153`	`+ String key = (object.hashCode() + object.toString()).replaceAll("\r", "").replaceAll("\n", "");`
`154`	`154`	`objectMap.put(key, object);`
`155`	`155`	`return key;`
`156`	`156`	`}`