directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r888121 - in /directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots: ModificationLogsViewBot.java SearchLogsViewBot.java
Date Mon, 07 Dec 2009 20:23:04 GMT
Author: seelmann
Date: Mon Dec  7 20:23:03 2009
New Revision: 888121

URL: http://svn.apache.org/viewvc?rev=888121&view=rev
Log:
API change and bugfix in SWTBot build 433

Modified:
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ModificationLogsViewBot.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchLogsViewBot.java

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ModificationLogsViewBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ModificationLogsViewBot.java?rev=888121&r1=888120&r2=888121&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ModificationLogsViewBot.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ModificationLogsViewBot.java
Mon Dec  7 20:23:03 2009
@@ -20,17 +20,8 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.allOf;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withStyle;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withTooltip;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
-import org.hamcrest.Matcher;
 
 
 public class ModificationLogsViewBot
@@ -48,15 +39,7 @@
     public String getModificationLogsText()
     {
         view.show();
-
-        //view.toolbarButton( "Refresh" ).click();
-        // just a workaround till view.toolbarButton() is fixed
-        Matcher matcher = allOf( widgetOfType( ToolItem.class ), withTooltip( "Refresh" ),
withStyle( SWT.PUSH,
-            "SWT.PUSH" ) );
-        SWTBotToolbarButton button = new SWTBotToolbarButton( ( ToolItem ) new SWTWorkbenchBot().widget(
matcher, 0 ),
-            matcher );
-        button.click();
-
+        view.toolbarPushButton( "Refresh" ).click();
         return view.bot().styledText().getText();
     }
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchLogsViewBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchLogsViewBot.java?rev=888121&r1=888120&r2=888121&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchLogsViewBot.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchLogsViewBot.java
Mon Dec  7 20:23:03 2009
@@ -20,17 +20,8 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.allOf;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withStyle;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withTooltip;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
-import org.hamcrest.Matcher;
 
 
 public class SearchLogsViewBot
@@ -48,14 +39,7 @@
     public String getSearchLogsText()
     {
         view.show();
-
-        //view.toolbarButton( "Refresh" ).click();
-        // just a workaround till view.toolbarButton() is fixed
-        Matcher matcher = allOf( widgetOfType( ToolItem.class ), withTooltip( "Refresh" ),
withStyle( SWT.PUSH,
-            "SWT.PUSH" ) );
-        SWTBotToolbarButton button = new SWTBotToolbarButton( ( ToolItem ) new SWTWorkbenchBot().widget(
matcher, 0 ), matcher );
-        button.click();
-
+        view.toolbarPushButton( "Refresh" ).click();
         return view.bot().styledText().getText();
     }
 }



Mime
View raw message