From 19ad2f8fb6afef33bbaab71be0ff1e3c00604264 Mon Sep 17 00:00:00 2001
From: Damian Jansen <djansen@redhat.com>
Date: Tue, 16 Sep 2014 14:14:27 +1000
Subject: [PATCH] Fix the broken validations test

The validation error box function was not searching the right place
for the appropriate component.
---
 .../org/zanata/page/webtrans/EditorPage.java  | 29 ++++++++++---------
 .../EditVersionValidationsTest.java           |  1 -
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
index 9a5f1ce911..5277e469e5 100644
--- a/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
+++ b/functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
@@ -342,16 +342,12 @@ public String getValidationMessageCurrentTarget() {
         waitForTenSec().until(new Function<WebDriver, Boolean>() {
             @Override
             public Boolean apply(WebDriver driver) {
-                WebElement webElement = getDriver()
-                        .findElement(By.className("selected"))
-                        .findElements(By.className("gwt-DisclosurePanel"))
-                        .get(2);
+                WebElement webElement = getTargetValidationBox();
                 return webElement.isDisplayed()
                         && !webElement.getText().isEmpty();
             }
         });
-        return getDriver().findElements(By.className("gwt-DisclosurePanel"))
-                .get(2).getText();
+        return getTargetValidationBox().getText();
     }
 
     /**
@@ -361,11 +357,7 @@ public Boolean apply(WebDriver driver) {
      */
     public boolean isValidationMessageCurrentTargetVisible() {
         log.info("Query is validation message panel displayed");
-        return getDriver()
-                .findElement(By.className("selected"))
-                .findElements(By.className("transUnitCol")).get(1) // Right column
-                .findElement(By.className("gwt-DisclosurePanel"))
-                .isDisplayed();
+        return getTargetValidationBox().isDisplayed();
     }
 
     /**
@@ -388,8 +380,7 @@ public Boolean apply(WebDriver driver) {
      */
     public EditorPage openValidationBox() {
         log.info("Click to open Validation panel");
-        getDriver().findElements(By.className("gwt-DisclosurePanel")).get(2)
-                .click();
+        getTargetValidationBox().click();
         waitForTenSec().until(new Function<WebDriver, Boolean>() {
             @Override
             public Boolean apply(WebDriver driver) {
@@ -507,9 +498,21 @@ public EditorPage inputFilterQuery(String query) {
         editorFilterField.sendKeys(query + Keys.ENTER);
         return this;
     }
+
     public String getFilterQuery() {
         log.info("Query filter text");
         return editorFilterField.getAttribute("value");
     }
 
+    private WebElement getTranslationTargetColumn() {
+        return getDriver().findElement(By.className("selected"))
+                .findElements(By.className("transUnitCol"))
+                .get(1); // Right column
+    }
+
+    private WebElement getTargetValidationBox() {
+        return getTranslationTargetColumn()
+                .findElement(By.className("gwt-DisclosurePanel"));
+    }
+
 }
diff --git a/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java b/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
index 5aead9020e..174e68b659 100644
--- a/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
+++ b/functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
@@ -86,7 +86,6 @@ public void setValidationOptions() throws Exception {
             "translation targets and displays them to the user",
             tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0)
     @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION)
-    @Ignore("broken test")
     public void verifyValidationsAreErrors() throws Exception {
         VersionTranslationTab versionTranslationTab = new LoginWorkFlow()
                 .signIn("admin", "admin")