rik/jlibwinapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed WaitForVisible commands, and changed silverlight windows tag to "silver"

Browse Source 
Fixed WaitForVisible command was incorrectly displaying errors when it
couldn't find a window.
Changed the tag used for Silverlight Windows to "silver".
This commit is contained in:
Edward Jakubowski
2014-04-09 19:27:13 -04:00
parent 7fa68a9309
commit be44a8e38b
8 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/synthuse/SynthuseDlg.java
View File

@@ -71,7 +71,7 @@ public class SynthuseDlg extends JFrame {
/** /**
* *
*/ */
public static String VERSION_STR = "1.0.9"; public static String VERSION_STR = "1.1.0";
public static String RES_STR_MAIN_ICON = "/org/synthuse/img/gnome-robots.png"; public static String RES_STR_MAIN_ICON = "/org/synthuse/img/gnome-robots.png";
public static String RES_STR_REFRESH_IMG = "/org/synthuse/img/rapidsvn.png"; public static String RES_STR_REFRESH_IMG = "/org/synthuse/img/rapidsvn.png";

4
src/org/synthuse/WindowsEnumeratedXml.java
View File

@@ -138,8 +138,10 @@ public class WindowsEnumeratedXml implements Runnable{
Element win = null; Element win = null;
if (w.framework.equals("win32")) if (w.framework.equals("win32"))
win = doc.createElement("win"); win = doc.createElement("win");
else else if (w.framework.equals("WPF"))
win = doc.createElement("wpf"); win = doc.createElement("wpf");
else if (w.framework.equals("Silverlight"))
win = doc.createElement("silver");
win.setAttribute("hwnd", w.hwndStr); win.setAttribute("hwnd", w.hwndStr);
win.setAttribute("text", w.text); win.setAttribute("text", w.text);
if (w.value != "" && w.value != null) if (w.value != "" && w.value != null)

2
src/org/synthuse/XpathManager.java
View File

@@ -95,7 +95,7 @@ public class XpathManager implements Runnable{
if (!winValueOrig.isEmpty()) //if value attribute exists then use it too if (!winValueOrig.isEmpty()) //if value attribute exists then use it too
valueStr = " and starts-with(@value,'" + compareLongTextString(winValueOrig) + "')"; valueStr = " and starts-with(@value,'" + compareLongTextString(winValueOrig) + "')";
builtXpath = "//wpf[@class='" + classStr + "' and starts-with(@text,'" + txtStr + "')" + valueStr + "]"; builtXpath = "//*[@class='" + classStr + "' and starts-with(@text,'" + txtStr + "')" + valueStr + "]";
//builtXpath = "//*[@hwnd='" + runtimeId + "']"; //builtXpath = "//*[@hwnd='" + runtimeId + "']";
//System.out.println("evaluateXpathGetValues: " + builtXpath); //System.out.println("evaluateXpathGetValues: " + builtXpath);

11
src/org/synthuse/commands/BaseCommand.java
View File

@@ -116,15 +116,16 @@ public class BaseCommand {
resultStr = item; resultStr = item;
break; break;
} }
if (WinPtr.isWpfRuntimeIdFormat(resultStr)) if (WinPtr.isWpfRuntimeIdFormat(resultStr)) {
result.runtimeId = resultStr; result.runtimeId = resultStr;
if (!ignoreFailedFind && result.isEmpty())
appendError("Error: Failed to find window handle matching: " + xpath);
}
else { else {
result.hWnd = Api.GetHandleFromString(resultStr); result.hWnd = Api.GetHandleFromString(resultStr);
if (!api.user32.IsWindow(result.hWnd)) if (!ignoreFailedFind && !api.user32.IsWindow(result.hWnd))
appendError("Error: Failed to located HWND(" + resultStr + ") from : " + xpath); appendError("Error: Failed to locate window HWND(" + resultStr + ") from : " + xpath);
} }
if (result.isEmpty())
appendError("Error: Failed to find window handle matching: " + xpath);
return result; return result;
} }

2
src/org/synthuse/test/Silverlight.js Normal file
View File

File diff suppressed because one or more lines are too long

BIN
src/org/synthuse/test/SilverlightMockTestApp.xap Normal file
View File

Binary file not shown.

73
src/org/synthuse/test/SilverlightMockTestAppTestPage.html Normal file
View File

@@ -0,0 +1,73 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
<title>SilverlightMockTestApp</title>
<style type="text/css">
html, body {
height: 100%;
overflow: auto;
}
body {
padding: 0;
margin: 0;
}
#silverlightControlHost {
height: 100%;
text-align:center;
}
</style>
<script type="text/javascript" src="Silverlight.js"></script>
<script type="text/javascript">
function onSilverlightError(sender, args) {
var appSource = "";
if (sender != null && sender != 0) {
appSource = sender.getHost().Source;
}
var errorType = args.ErrorType;
var iErrorCode = args.ErrorCode;
if (errorType == "ImageError" || errorType == "MediaError") {
return;
}
var errMsg = "Unhandled Error in Silverlight Application " + appSource + "\n" ;
errMsg += "Code: "+ iErrorCode + " \n";
errMsg += "Category: " + errorType + " \n";
errMsg += "Message: " + args.ErrorMessage + " \n";
if (errorType == "ParserError") {
errMsg += "File: " + args.xamlFile + " \n";
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
else if (errorType == "RuntimeError") {
if (args.lineNumber != 0) {
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
errMsg += "MethodName: " + args.methodName + " \n";
}
throw new Error(errMsg);
}
</script>
</head>
<body>
<form id="form1" runat="server" style="height:100%">
<div id="silverlightControlHost">
<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" width="100%" height="100%">
<param name="source" value="SilverlightMockTestApp.xap"/>
<param name="onError" value="onSilverlightError" />
<param name="background" value="white" />
<param name="minRuntimeVersion" value="4.0.50826.0" />
<param name="autoUpgrade" value="true" />
<a href="http://go.microsoft.com/fwlink/?LinkID=149156&v=4.0.50826.0" style="text-decoration:none">
<img src="http://go.microsoft.com/fwlink/?LinkId=161376" alt="Get Microsoft Silverlight" style="border-style:none"/>
</a>
</object><iframe id="_sl_historyFrame" style="visibility:hidden;height:0px;width:0px;border:0px"></iframe></div>
</form>
</body>
</html>

BIN
src/org/synthuse/test/WpfMockTestApp.exe Normal file
View File

Binary file not shown.