SWE-2 / SP-263: Fix Hudson run

SVN: 26826

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/infra/webdriver/WidgetContext.java

@@ -43,6 +43,11 @@ public class WidgetContext
         element.click();
     }
 
+    public boolean isInteractable()
+    {
+        return element.isDisplayed() && element.isEnabled();
+    }
+
     public String getAttribute(String key)
     {
         return element.getAttribute(key);

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SampleTypeTest.java

@@ -57,7 +57,7 @@ public class SampleTypeTest extends SeleniumTest
         assertThat(sampleBrowser(), doesNotShowInToolBar(sampleType));
     }
 
-    @Test(enabled = false)
+    @Test
     public void changingSampleTypeToBeListableMakesItVisibleInSampleBrowserDropDownMenu()
     {
         SampleType sampleType = create(aSampleType().thatIsNotListable());

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/suite/SeleniumTest.java

@@ -18,12 +18,14 @@ package ch.systemsx.cisd.openbis.uitest.suite;
 
 import static org.hamcrest.CoreMatchers.not;
 
+import java.awt.Toolkit;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
 import org.hamcrest.Matcher;
+import org.openqa.selenium.Dimension;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
@@ -89,7 +91,7 @@ import ch.systemsx.cisd.openbis.uitest.type.VocabularyBuilder;
 
 public abstract class SeleniumTest
 {
-    public static int IMPLICIT_WAIT = 20;
+    public static int IMPLICIT_WAIT = 30;
 
     public static String ADMIN_USER = "selenium";
 
@@ -105,7 +107,7 @@ public abstract class SeleniumTest
 
     protected GuiApplicationRunner openbis;
 
-    private ApplicationRunner openbisApi;
+    private static ApplicationRunner openbisApi;
 
     @BeforeSuite
     public void initWebDriver() throws Exception
@@ -144,6 +146,13 @@ public abstract class SeleniumTest
         setImplicitWaitToDefault();
         delete(new File("targets/dist"));
         driver.manage().deleteAllCookies();
+
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        Dimension screenResolution =
+                new Dimension((int) toolkit.getScreenSize().getWidth(), (int) toolkit
+                        .getScreenSize().getHeight());
+        driver.manage().window().setSize(screenResolution);
+
         driver.get(startPage);
 
         uid = new DictionaryUidGenerator(new File("resource/corncob_lowercase.txt"));

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/widget/DropDown.java

@@ -74,7 +74,14 @@ public class DropDown implements AtomicWidget, Fillable
     private List<WebElement> getChoiceElements()
     {
         context.click();
-        return SeleniumTest.driver.findElements(By.className("x-combo-list-item"));
+        List<WebElement> wlist =
+                SeleniumTest.driver.findElements(By.className("x-combo-list-item"));
+        if (wlist.size() == 0)
+        {
+            System.out.println("dropdown retry");
+            return getChoiceElements();
+        }
+        return wlist;
     }
 
     @Override

ui-test/source/java/ch/systemsx/cisd/openbis/uitest/widget/Text.java

@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.uitest.widget;
 
 import ch.systemsx.cisd.openbis.uitest.infra.webdriver.WidgetContext;
 
-
 /**
  * @author anttil
  */
@@ -39,6 +38,20 @@ public class Text implements AtomicWidget, Fillable
 
     public void append(String text)
     {
+        if (context.isInteractable() == false)
+        {
+            System.out.println("text retry");
+            try
+            {
+                Thread.sleep(500);
+            } catch (InterruptedException ex)
+            {
+                // TODO Auto-generated catch block
+                ex.printStackTrace();
+            }
+            append(text);
+            return;
+        }
         context.sendKeys(text);
     }