changeset 153:2285461bec0c v1-2014-04-15-before-thermostat-setup

fixing the method (resize) in GuiRobot.java, updating several icons
author Jana Fabrikova <jfabriko@redhat.com>
date Tue, 15 Apr 2014 13:47:47 +0200
parents 1191b3a92ad1
children 5abf85c4d3ba
files ChangeLog patterns/1.1.0/noAA/AboutDialog/close_button2.png patterns/1.1.0/noAA/AboutDialog/close_button3.png patterns/1.1.0/noAA/HostView/OverviewTab/ipv6_address_label.png src/org/thermostat/qa/framework/GuiRobot.java src/org/thermostat/qa/framework/Patterns.java
diffstat 6 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 01 15:42:00 2014 +0200
+++ b/ChangeLog	Tue Apr 15 13:47:47 2014 +0200
@@ -1,3 +1,16 @@
+2014-04-15  Jana Fabrikova  <jfabriko@redhat.com>
+	* src/org/thermostat/qa/framework/GuiRobot.java:
+	modification of method (resize) - fixing the resizing of thermostat gui
+	using xdotool in case of xvfb screenshots 
+	* patterns/1.1.0/noAA/AboutDialog/close_button2.png:
+	adding new version of this icon
+	* patterns/1.1.0/noAA/AboutDialog/close_button3.png:
+	adding new version of this icon
+	* patterns/1.1.0/noAA/HostView/OverviewTab/ipv6_address_label.png:
+	updating icon for the correctly resized window
+	* src/org/thermostat/qa/framework/Patterns.java:
+	updating the list of icons according to the above changes
+
 2014-04-01  Jana Fabrikova  <jfabriko@redhat.com>
 
 	* outputtexts/1.1.0/output_of_help_therm_shell.txt:
Binary file patterns/1.1.0/noAA/AboutDialog/close_button2.png has changed
Binary file patterns/1.1.0/noAA/AboutDialog/close_button3.png has changed
Binary file patterns/1.1.0/noAA/HostView/OverviewTab/ipv6_address_label.png has changed
--- a/src/org/thermostat/qa/framework/GuiRobot.java	Tue Apr 01 15:42:00 2014 +0200
+++ b/src/org/thermostat/qa/framework/GuiRobot.java	Tue Apr 15 13:47:47 2014 +0200
@@ -384,7 +384,8 @@
                 List<String> content = new LinkedList<String>();
                 content.add("export DISPLAY=:1");
                 //content.add("xdotool click "+(from.x + from.width<<1)+" "+(from.y + from.height<<1));
-                content.add("xdotool windowsize --usehints getactivewindow "+(from.width + xd)+" "+(from.height + yd));
+                content.add("win=`xdotool getactivewindow`");
+                content.add("xdotool windowsize $win "+(from.x + xd)+" "+(from.y + yd));
                 try
                 {
                     ThermostatUtilities.runBashScriptWithContent("xvfbResize.sh", content);
--- a/src/org/thermostat/qa/framework/Patterns.java	Tue Apr 01 15:42:00 2014 +0200
+++ b/src/org/thermostat/qa/framework/Patterns.java	Tue Apr 15 13:47:47 2014 +0200
@@ -89,7 +89,7 @@
 
     public static class AboutDialog
     {
-        public static final String CLOSE_BUTTON = "AboutDialog/close_button";
+        public static final String CLOSE_BUTTON[] = {"AboutDialog/close_button","AboutDialog/close_button2","AboutDialog/close_button3"};
         public static final String THERMOSTAT_LOGO = "AboutDialog/thermostat_logo";
         public static final String THERMOSTAT_TITLE = "AboutDialog/thermostat_title";
         public static final String UPPER_TEXT = "AboutDialog/about_text_upper_part";