falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject [1/2] incubator-falcon git commit: FALCON-684 Fix problems found by checkstyle in non-test files in falcon-regression. Contributed by Ruslan Ostafiychuk
Date Thu, 27 Nov 2014 15:23:57 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master abf17649e -> cc9909ae5


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java
index cf95107..d32e8ed 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java
@@ -136,7 +136,7 @@ public class BaseRequest {
     }
 
     private HttpResponse execute(HttpRequest request)
-            throws IOException, AuthenticationException, InterruptedException {
+        throws IOException, AuthenticationException, InterruptedException {
         // add headers to the request
         if (null != headers && headers.size() > 0) {
             for (Header header : headers) {
@@ -157,7 +157,7 @@ public class BaseRequest {
             SchemeRegistry schemeRegistry = new SchemeRegistry();
             schemeRegistry.register(new Scheme("https", uri.getPort(), SSL_SOCKET_FACTORY));
             BasicClientConnectionManager cm = new BasicClientConnectionManager(schemeRegistry);
-                client = new DefaultHttpClient(cm);
+            client = new DefaultHttpClient(cm);
         } else {
             client = new DefaultHttpClient();
         }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java
index fa2caf9..0dfdd9b 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java
@@ -31,7 +31,6 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSession;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.PrivilegedExceptionAction;
 import java.util.concurrent.ConcurrentHashMap;
@@ -57,9 +56,8 @@ public final class FalconAuthorizationToken {
         }
     };
 
-    private static void authenticate(String user, String protocol, String host,
-                                    int port)
-            throws IOException, AuthenticationException, InterruptedException {
+    private static void authenticate(String user, String protocol, String host, int port)
+        throws IOException, AuthenticationException, InterruptedException {
         final URL url = new URL(String.format("%s://%s:%d/%s", protocol, host, port,
             AUTH_URL + "?" + PseudoAuthenticator.USER_NAME + "=" + user));
         LOGGER.info("Authorize using url: " + url.toString());
@@ -92,7 +90,7 @@ public final class FalconAuthorizationToken {
 
     public static AuthenticatedURL.Token getToken(String user, String protocol, String host,
                                                   int port, boolean overWrite)
-            throws IOException, AuthenticationException, InterruptedException {
+        throws IOException, AuthenticationException, InterruptedException {
         String key = getKey(user, protocol, host, port);
 
         /*if the tokens are null or if token is not found then we will go ahead and authenticate
@@ -105,7 +103,7 @@ public final class FalconAuthorizationToken {
 
     public static AuthenticatedURL.Token getToken(String user, String protocol, String host,
                                                   int port)
-            throws IOException, AuthenticationException, InterruptedException {
+        throws IOException, AuthenticationException, InterruptedException {
         return getToken(user, protocol, host, port, false);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
index 91d8e67..7bb5a36 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,6 @@ import org.apache.falcon.regression.core.enumsAndConstants.MerlinConstants;
 import org.apache.falcon.regression.core.helpers.ColoHelper;
 import org.apache.falcon.regression.core.util.Config;
 import org.apache.falcon.regression.core.util.HadoopUtil;
-import org.apache.falcon.regression.core.util.KerberosHelper;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.Logger;
 import org.apache.oozie.client.OozieClient;
@@ -32,24 +31,27 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Base class for test classes.
+ */
 public class BaseTestClass {
     private static String[] serverNames;
-    private static final Logger logger = Logger.getLogger(BaseTestClass.class);
+    private static final Logger LOGGER = Logger.getLogger(BaseTestClass.class);
 
     static {
         try {
             prepareProperties();
         } catch (Exception e) {
-            logger.error(e.getMessage());  //To change body of catch statement use
+            LOGGER.error(e.getMessage());  //To change body of catch statement use
             System.exit(1);
         }
     }
 
-    public ColoHelper prism;
-    public List<ColoHelper> servers;
-    public List<FileSystem> serverFS;
-    public List<OozieClient> serverOC;
-    public String baseHDFSDir = "/tmp/falcon-regression";
+    protected ColoHelper prism;
+    protected List<ColoHelper> servers;
+    protected List<FileSystem> serverFS;
+    protected List<OozieClient> serverOC;
+    protected String baseHDFSDir = "/tmp/falcon-regression";
     public static final String PRISM_PREFIX = "prism";
     protected Bundle[] bundles;
     public static final String MINUTE_DATE_PATTERN = "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
@@ -76,8 +78,9 @@ public class BaseTestClass {
     private static void prepareProperties() {
 
         serverNames = Config.getStringArray("servers");
-        for (int i = 0; i < serverNames.length; i++)
+        for (int i = 0; i < serverNames.length; i++) {
             serverNames[i] = serverNames[i].trim();
+        }
     }
 
     private List<ColoHelper> getServers() {
@@ -90,20 +93,20 @@ public class BaseTestClass {
 
     public void uploadDirToClusters(final String dstHdfsDir, final String localLocation)
         throws IOException {
-        logger.info(String.format("Uploading local dir: %s to all the clusters at: %s",
+        LOGGER.info(String.format("Uploading local dir: %s to all the clusters at: %s",
             localLocation, dstHdfsDir));
         for (FileSystem fs : serverFS) {
             HadoopUtil.uploadDir(fs, dstHdfsDir, localLocation);
         }
     }
 
-    public final void removeBundles(Bundle... bundles) {
-        for (Bundle bundle : bundles) {
+    public final void removeBundles(Bundle... bundlesForDeletion) {
+        for (Bundle bundle : bundlesForDeletion) {
             if (bundle != null) {
                 bundle.deleteBundle(prism);
             }
         }
-        if (bundles != this.bundles) {
+        if (bundlesForDeletion != this.bundles) {
             for (Bundle bundle : this.bundles) {
                 if (bundle != null) {
                     bundle.deleteBundle(prism);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseUITestClass.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseUITestClass.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseUITestClass.java
index aab3415..96514c2 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseUITestClass.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseUITestClass.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,12 +22,15 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxProfile;
 
+/**
+ * Base class for UI test classes.
+ */
 public class BaseUITestClass extends BaseTestClass{
 
-    protected static WebDriver DRIVER;
+    protected static WebDriver driver;
 
-    public static WebDriver getDRIVER() {
-        return DRIVER;
+    public static WebDriver getDriver() {
+        return driver;
     }
 
     protected void openBrowser() {
@@ -35,17 +38,17 @@ public class BaseUITestClass extends BaseTestClass{
         FirefoxProfile profile = new FirefoxProfile();
         profile.setPreference("network.negotiate-auth.trusted-uris", "http://, https://");
 
-        DRIVER = new FirefoxDriver(profile);
-        DRIVER.manage().window().maximize();
+        driver = new FirefoxDriver(profile);
+        driver.manage().window().maximize();
 
     }
 
 
     public void closeBrowser() {
-        if (DRIVER != null) {
-            DRIVER.close();
-            DRIVER.quit();
-            DRIVER = null;
+        if (driver != null) {
+            driver.close();
+            driver.quit();
+            driver = null;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java
index 4dbe070..b4f3f38 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java
@@ -32,26 +32,27 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * Page with list of entities.
+ */
 public class EntitiesPage extends Page {
 
-    private static final Logger logger = Logger.getLogger(EntitiesPage.class);
+    protected static final String ENTITIES_TABLE = "//table[@id='entity-list']/tbody/tr";
 
-    private final static String ACTIVE_NXT_BTN
-            = "//ul/li[not(@class)]/a[contains(text(),'»')]";
-    protected final static String ENTITIES_TABLE
-            = "//table[@id='entity-list']/tbody/tr";
-    private final static String PAGE_NUMBER = "//ul[@class='pagination']/li[@class='active']/a";
+    private static final Logger LOGGER = Logger.getLogger(EntitiesPage.class);
+    private static final String ACTIVE_NXT_BTN = "//ul/li[not(@class)]/a[contains(text(),'»')]";
+    private static final String PAGE_NUMBER = "//ul[@class='pagination']/li[@class='active']/a";
 
     public EntitiesPage(WebDriver driver, ColoHelper helper, EntityType type) {
         super(driver, helper);
-        URL += "/index.html?type=" + type.toString().toLowerCase();
+        url += "/index.html?type=" + type.toString().toLowerCase();
 
         expectedElement = ENTITIES_TABLE;
         notFoundMsg = String.format("No entities on %sS page", type);
     }
 
     /**
-     * Returns status of defined entity
+     * Returns status of defined entity.
      * @param entityName name of entity
      * @return status of defined entity
      */
@@ -59,7 +60,9 @@ public class EntitiesPage extends Page {
         navigateTo();
         while (true) {
             String status = getEntitiesOnPage().get(entityName);
-            if (status != null) return EntityStatus.valueOf(status);
+            if (status != null) {
+                return EntityStatus.valueOf(status);
+            }
             if (nextPagePresent()) {
                 goNextPage();
             } else {
@@ -70,10 +73,10 @@ public class EntitiesPage extends Page {
     }
 
     /**
-     * Loads next page
+     * Loads next page.
      */
     private void goNextPage() {
-        logger.info("Navigating to next page...");
+        LOGGER.info("Navigating to next page...");
         WebElement nextButton = driver.findElement(By.xpath(ACTIVE_NXT_BTN));
         nextButton.click();
         waitForElement(expectedElement, DEFAULT_TIMEOUT, "Next page didn't load");
@@ -81,12 +84,12 @@ public class EntitiesPage extends Page {
 
 
     /**
-     * Checks if next page is present
+     * Checks if next page is present.
      * @return true if next page is present
      */
 
     private boolean nextPagePresent() {
-        logger.info("Checking if next page is present...");
+        LOGGER.info("Checking if next page is present...");
         try {
             new WebDriverWait(driver, DEFAULT_TIMEOUT).until(new Condition(ACTIVE_NXT_BTN, true));
             return true;
@@ -96,7 +99,7 @@ public class EntitiesPage extends Page {
     }
 
     /**
-     * Returns page number
+     * Returns page number.
      * @return page number
      */
     public int getPageNumber() {
@@ -104,8 +107,8 @@ public class EntitiesPage extends Page {
         return Integer.parseInt(number);
     }
 
-    private Map<String,String> getEntitiesOnPage() {
-        logger.info("Reading all entities on page...");
+    private Map<String, String> getEntitiesOnPage() {
+        LOGGER.info("Reading all entities on page...");
         List<WebElement> lines = driver.findElements(By.xpath(ENTITIES_TABLE));
         Map<String, String> entities = new HashMap<String, String>();
         for (WebElement line : lines) {
@@ -117,7 +120,7 @@ public class EntitiesPage extends Page {
     }
 
     /**
-     * Status of entity that can be shown on Falcon UI
+     * Status of entity that can be shown on Falcon UI.
      */
     public enum EntityStatus {
         UNKNOWN, SUBMITTED, RUNNING, SUSPENDED

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java
index 3b2d5d1..88a744b 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java
@@ -31,20 +31,24 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import java.io.StringReader;
 
+/**
+ * Page of entity (feed or process or cluster).
+ * @param <T> type of entity
+ */
 public class EntityPage<T> extends Page {
 
     private Class<T> type;
 
     protected EntityPage(WebDriver driver, ColoHelper helper, EntityType type, Class<T> entity, String entityName) {
         super(driver, helper);
-        URL += String.format("/entity.html?type=%s&id=%s", type.toString().toLowerCase(), entityName);
+        url += String.format("/entity.html?type=%s&id=%s", type.toString().toLowerCase(), entityName);
         this.type = entity;
         expectedElement = "//textarea[@id='entity-def-textarea' and contains(text(), 'xml')]";
         notFoundMsg = String.format(" %s '%s' not found!", type, entityName);
     }
 
     /**
-     * Returns page of defined CLUSTER entity
+     * Returns page of defined CLUSTER entity.
      * @param entityName name of defined entity
      * @return page of defined CLUSTER entity
      */
@@ -53,7 +57,7 @@ public class EntityPage<T> extends Page {
     }
 
     /**
-     * Returns page of defined FEED entity
+     * Returns page of defined FEED entity.
      * @param entityName name of defined entity
      * @return page of defined FEED entity
      */
@@ -62,7 +66,7 @@ public class EntityPage<T> extends Page {
     }
 
     /**
-     * Returns entity object
+     * Returns entity object.
      * @return entity object
      * @throws JAXBException
      */

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java
index d6b55d4..3e6534a 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/Page.java
@@ -30,35 +30,38 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 
+/**
+ * Abstract page of Falcon UI.
+ */
 public abstract class Page {
-    protected final static int DEFAULT_TIMEOUT = 10;
-    protected String URL;
+    protected static final int DEFAULT_TIMEOUT = 10;
+    protected String url;
     protected WebDriver driver;
 
     protected String expectedElement;
     protected String notFoundMsg;
 
-    private static final Logger logger = Logger.getLogger(Page.class);
+    private static final Logger LOGGER = Logger.getLogger(Page.class);
 
     Page(WebDriver driver, ColoHelper helper) {
         this.driver = driver;
-        URL = helper.getClusterHelper().getHostname();
+        url = helper.getClusterHelper().getHostname();
     }
 
     /**
-     * Go to page in browser
+     * Go to page in browser.
      */
     public void navigateTo() {
-        logger.info("Navigating to " + URL);
-        driver.get(URL);
+        LOGGER.info("Navigating to " + url);
+        driver.get(url);
         waitForElement(expectedElement, DEFAULT_TIMEOUT, notFoundMsg);
     }
 
     /**
-     * Refresh page
+     * Refresh page.
      */
     public void refresh() {
-        logger.info("Refreshing page " + URL);
+        LOGGER.info("Refreshing page " + url);
         driver.navigate().refresh();
     }
 
@@ -95,7 +98,7 @@ public abstract class Page {
     }
 
     /**
-     * Wait until WebElement became visible
+     * Wait until WebElement became visible.
      * @param xpath xpath of expected WebElement
      * @param timeoutSeconds how many seconds we should wait for visibility
      * @param errMessage message for TimeoutException
@@ -104,7 +107,9 @@ public abstract class Page {
         waitForElement(xpath, timeoutSeconds, errMessage);
         WebElement element = driver.findElement(By.xpath(xpath));
         for (int i = 0; i < timeoutSeconds * 10; i++) {
-            if (element.isDisplayed()) return;
+            if (element.isDisplayed()) {
+                return;
+            }
             TimeUtil.sleepSeconds(0.1);
         }
         throw new TimeoutException(errMessage);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java
index 9dd5be2..c66fea6 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java
@@ -33,14 +33,17 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * Page of a process entity.
+ */
 public class ProcessPage extends EntityPage<Process> {
 
-    private static final Logger logger = Logger.getLogger(ProcessPage.class);
+    private static final Logger LOGGER = Logger.getLogger(ProcessPage.class);
     private boolean isLineageOpened = false;
 
-    private final static String INSTANCES_PANEL = "//div[@id='panel-instance']//span";
-    private final static String INSTANCE_STATUS_TEMPLATE = INSTANCES_PANEL + "[contains(..,'%s')]";
-    private final static String LINEAGE_LINK_TEMPLATE =
+    private static final String INSTANCES_PANEL = "//div[@id='panel-instance']//span";
+    private static final String INSTANCE_STATUS_TEMPLATE = INSTANCES_PANEL + "[contains(..,'%s')]";
+    private static final String LINEAGE_LINK_TEMPLATE =
         "//a[@class='lineage-href' and @data-instance-name='%s']";
 
     //Lineage information xpaths
@@ -49,21 +52,21 @@ public class ProcessPage extends EntityPage<Process> {
     private static final String LINEAGE_MODAL = "//div[@id='lineage-modal']";
     private static final String SVG_ELEMENT = "//*[name() = 'svg']/*[name()='g']/*[name()='g']";
     private static final String VERTICES_BLOCKS = SVG_ELEMENT + "[not(@class='lineage-link')]";
-    private static final String VERTICES_TEXT = VERTICES_BLOCKS +
-        "//div[@class='lineage-node-text']";
+    private static final String VERTICES_TEXT = VERTICES_BLOCKS
+        + "//div[@class='lineage-node-text']";
     private static final String EDGE = SVG_ELEMENT + "[@class='lineage-link']//*[name()='path']";
     private static final String CIRCLE = "//*[name() = 'circle']";
     private static final String VERTICES = VERTICES_BLOCKS + CIRCLE;
     private static final String VERTEX_BLOCK_TEMPLATE = VERTICES_BLOCKS + "[contains(., '%s')]";
     private static final String VERTEX_TEMPLATE = VERTEX_BLOCK_TEMPLATE + CIRCLE;
 
-    private static final String LINEAGE_INFO_PANEL_LIST = "//div[@id='lineage-info-panel']" +
-        "//div[@class='col-md-3']";
+    private static final String LINEAGE_INFO_PANEL_LIST = "//div[@id='lineage-info-panel']"
+        + "//div[@class='col-md-3']";
 
     private static final String LINEAGE_TITLE = LINEAGE_MODAL + "//div[@class='modal-header']/h4";
 
-    private static final String LINEAGE_LEGENDS_BLOCK = LINEAGE_MODAL +
-        "//div[@class='modal-body']/div[ul[@class='lineage-legend']]";
+    private static final String LINEAGE_LEGENDS_BLOCK = LINEAGE_MODAL
+        + "//div[@class='modal-body']/div[ul[@class='lineage-legend']]";
     private static final String LINEAGE_LEGENDS_TITLE = LINEAGE_LEGENDS_BLOCK + "/h4";
     private static final String LINEAGE_LEGENDS_ELEMENTS = LINEAGE_LEGENDS_BLOCK + "/ul/li";
 
@@ -77,10 +80,10 @@ public class ProcessPage extends EntityPage<Process> {
     public void openLineage(String nominalTime) {
         waitForElement(String.format(LINEAGE_LINK_TEMPLATE, nominalTime), DEFAULT_TIMEOUT,
             "Lineage button didn't appear");
-        logger.info("Working with instance: " + nominalTime);
+        LOGGER.info("Working with instance: " + nominalTime);
         WebElement lineage =
             driver.findElement(By.xpath(String.format(LINEAGE_LINK_TEMPLATE, nominalTime)));
-        logger.info("Opening lineage...");
+        LOGGER.info("Opening lineage...");
         lineage.click();
         waitForElement(VERTICES, DEFAULT_TIMEOUT, "Circles not found");
         waitForDisplayed(LINEAGE_TITLE, DEFAULT_TIMEOUT, "Lineage title not found");
@@ -88,7 +91,7 @@ public class ProcessPage extends EntityPage<Process> {
     }
 
     public void closeLineage() {
-        logger.info("Closing lineage...");
+        LOGGER.info("Closing lineage...");
         if (isLineageOpened) {
             WebElement close = driver.findElement(By.xpath(CLOSE_LINEAGE_LINK_TEMPLATE));
             close.click();
@@ -108,19 +111,19 @@ public class ProcessPage extends EntityPage<Process> {
      * @return map with instances names and their nominal start time
      */
     public HashMap<String, List<String>> getAllVertices() {
-        logger.info("Getting all vertices from lineage graph...");
+        LOGGER.info("Getting all vertices from lineage graph...");
         HashMap<String, List<String>> map = null;
         if (isLineageOpened) {
             waitForElement(VERTICES_TEXT, DEFAULT_TIMEOUT,
                 "Vertices blocks with names not found");
             List<WebElement> blocks = driver.findElements(By.xpath(VERTICES_TEXT));
-            logger.info(blocks.size() + " elements found");
+            LOGGER.info(blocks.size() + " elements found");
             map = new HashMap<String, List<String>>();
             for (WebElement block : blocks) {
                 waitForElement(block, ".[contains(.,'/')]", DEFAULT_TIMEOUT,
                     "Expecting text to contain '/' :" + block.getText());
                 String text = block.getText();
-                logger.info("Vertex: " + text);
+                LOGGER.info("Vertex: " + text);
                 String[] separate = text.split("/");
                 String name = separate[0];
                 String nominalTime = separate[1];
@@ -140,7 +143,7 @@ public class ProcessPage extends EntityPage<Process> {
      * @return list of all vertices names
      */
     public List<String> getAllVerticesNames() {
-        logger.info("Getting all vertices names from lineage graph...");
+        LOGGER.info("Getting all vertices names from lineage graph...");
         List<String> list = new ArrayList<String>();
         if (isLineageOpened) {
             waitForElement(CLOSE_LINEAGE_LINK_TEMPLATE, DEFAULT_TIMEOUT,
@@ -148,20 +151,20 @@ public class ProcessPage extends EntityPage<Process> {
             waitForElement(VERTICES_BLOCKS, DEFAULT_TIMEOUT,
                 "Vertices not found");
             List<WebElement> blocks = driver.findElements(By.xpath(VERTICES_BLOCKS));
-            logger.info(blocks.size() + " elements found");
+            LOGGER.info(blocks.size() + " elements found");
             for (WebElement block : blocks) {
                 list.add(block.getText());
             }
         }
-        logger.info("Vertices: " + list);
+        LOGGER.info("Vertices: " + list);
         return list;
     }
 
     /**
-     * Vertex is defined by it's entity name and particular time of it's creation
+     * Vertex is defined by it's entity name and particular time of it's creation.
      */
     public void clickOnVertex(String entityName, String nominalTime) {
-        logger.info("Clicking on vertex " + entityName + '/' + nominalTime);
+        LOGGER.info("Clicking on vertex " + entityName + '/' + nominalTime);
         if (isLineageOpened) {
             WebElement circle = driver.findElement(By.xpath(String.format(VERTEX_TEMPLATE,
                 entityName + '/' + nominalTime)));
@@ -175,13 +178,13 @@ public class ProcessPage extends EntityPage<Process> {
      * @return map of parameters from info panel and their values
      */
     public HashMap<String, String> getPanelInfo() {
-        logger.info("Getting info panel values...");
+        LOGGER.info("Getting info panel values...");
         HashMap<String, String> map = null;
         if (isLineageOpened) {
             //check if vertex was clicked
             waitForElement(LINEAGE_INFO_PANEL_LIST, DEFAULT_TIMEOUT, "Info panel not found");
             List<WebElement> infoBlocks = driver.findElements(By.xpath(LINEAGE_INFO_PANEL_LIST));
-            logger.info(infoBlocks.size() + " values found");
+            LOGGER.info(infoBlocks.size() + " values found");
             map = new HashMap<String, String>();
             for (WebElement infoBlock : infoBlocks) {
                 String text = infoBlock.getText();
@@ -189,7 +192,7 @@ public class ProcessPage extends EntityPage<Process> {
                 map.put(values[0], values[1]);
             }
         }
-        logger.info("Values: " + map);
+        LOGGER.info("Values: " + map);
         return map;
     }
 
@@ -214,20 +217,24 @@ public class ProcessPage extends EntityPage<Process> {
      * @return the main title of Lineage UI
      */
     public String getLineageTitle() {
-        logger.info("Getting Lineage title...");
+        LOGGER.info("Getting Lineage title...");
         if (isLineageOpened) {
             return driver.findElement(By.xpath(LINEAGE_TITLE)).getText();
-        } else return null;
+        } else {
+            return null;
+        }
     }
 
     /**
      * @return the name of legends block
      */
     public String getLegendsTitle() {
-        logger.info("Getting Legends title...");
+        LOGGER.info("Getting Legends title...");
         if (isLineageOpened) {
             return driver.findElement(By.xpath(LINEAGE_LEGENDS_TITLE)).getText();
-        } else return null;
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -236,11 +243,11 @@ public class ProcessPage extends EntityPage<Process> {
      */
     public List<Point[]> getEdgesFromGraph() {
         List<Point[]> pathsEndpoints = null;
-        logger.info("Getting edges from lineage graph...");
+        LOGGER.info("Getting edges from lineage graph...");
         if (isLineageOpened) {
             pathsEndpoints = new ArrayList<Point[]>();
             List<WebElement> paths = driver.findElements(By.xpath(EDGE));
-            logger.info(paths.size() + " edges found");
+            LOGGER.info(paths.size() + " edges found");
             for (WebElement path : paths) {
                 String[] coordinates = path.getAttribute("d").split("[MLC,]");
                 int x = 0, y, i = 0;
@@ -257,7 +264,7 @@ public class ProcessPage extends EntityPage<Process> {
                 x = (int) Math.round(Double.parseDouble(coordinates[coordinates.length - 2]));
                 y = (int) Math.round(Double.parseDouble(coordinates[coordinates.length - 1]));
                 Point endPoint = new Point(x, y);
-                logger.info("Edge " + startPoint + '→' + endPoint);
+                LOGGER.info("Edge " + startPoint + '→' + endPoint);
                 pathsEndpoints.add(new Point[]{startPoint, endPoint});
             }
         }
@@ -268,19 +275,19 @@ public class ProcessPage extends EntityPage<Process> {
      * @return common value for radius of every vertex (circle) on the graph
      */
     public int getCircleRadius() {
-        logger.info("Getting value of vertex radius...");
+        LOGGER.info("Getting value of vertex radius...");
         WebElement circle = driver.findElements(By.xpath(VERTICES)).get(0);
         return Integer.parseInt(circle.getAttribute("r"));
     }
 
     /**
-     * Finds vertex on the graph by its name and evaluates its coordinates as 2d point
+     * Finds vertex on the graph by its name and evaluates its coordinates as 2d point.
      * @param vertex the name of vertex which point is needed
      * @return Point(x,y) object
      */
     public Point getVertexEndpoint(String vertex) {
         /** get circle of start vertex */
-        logger.info("Getting vertex coordinates...");
+        LOGGER.info("Getting vertex coordinates...");
         WebElement block = driver.findElement(By.xpath(String.format(VERTEX_BLOCK_TEMPLATE, vertex)));
         String attribute = block.getAttribute("transform");
         attribute = attribute.replaceAll("[a-zA-Z]", "");
@@ -289,13 +296,13 @@ public class ProcessPage extends EntityPage<Process> {
     }
 
     /**
-     * Returns status of instance from instances panel
+     * Returns status of instance from instances panel.
      * @param instanceDate date stamp of instance
      * @return status of instance from instances panel
      */
     public String getInstanceStatus(String instanceDate) {
         waitForInstancesPanel();
-        logger.info("Getting status of " + instanceDate + " instance");
+        LOGGER.info("Getting status of " + instanceDate + " instance");
         List<WebElement> status =
             driver.findElements(By.xpath(String.format(INSTANCE_STATUS_TEMPLATE, instanceDate)));
         if (status.isEmpty()) {
@@ -306,13 +313,13 @@ public class ProcessPage extends EntityPage<Process> {
     }
 
     /**
-     * Checks if 'Lineage' link is present on instances panel
+     * Checks if 'Lineage' link is present on instances panel.
      * @param instanceDate date stamp of instance
      * @return true if link is present
      */
     public boolean isLineageLinkPresent(String instanceDate) {
         waitForInstancesPanel();
-        logger.info("Checking if 'Lineage' link is present for " + instanceDate);
+        LOGGER.info("Checking if 'Lineage' link is present for " + instanceDate);
         List<WebElement> lineage =
             driver.findElements(By.xpath(String.format(LINEAGE_LINK_TEMPLATE, instanceDate)));
         return !lineage.isEmpty();
@@ -323,12 +330,12 @@ public class ProcessPage extends EntityPage<Process> {
     }
 
     /**
-     * Checks whether vertex is terminal or not
+     * Checks whether vertex is terminal or not.
      * @param vertexName name of vertex
      * @return whether it is terminal or not
      */
     public boolean isTerminal(String vertexName) {
-        logger.info("Checking if " + vertexName + " is 'terminal' instance");
+        LOGGER.info("Checking if " + vertexName + " is 'terminal' instance");
         waitForElement(String.format(VERTEX_TEMPLATE, vertexName), DEFAULT_TIMEOUT,
             "Vertex not found");
         WebElement vertex = driver.findElement(By.xpath(String.format(VERTEX_TEMPLATE, vertexName)));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TestngListener.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TestngListener.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TestngListener.java
index e3af96d..9de179b 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TestngListener.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TestngListener.java
@@ -68,9 +68,9 @@ public class TestngListener implements ITestListener, IExecutionListener {
     @Override
     public void onTestFailure(ITestResult result) {
         logEndOfTest(result, "FAILED");
-        if (BaseUITestClass.getDRIVER() != null) {
-            byte[] scrFile = ((TakesScreenshot)BaseUITestClass.getDRIVER()).getScreenshotAs
-                    (OutputType.BYTES);
+        if (BaseUITestClass.getDriver() != null) {
+            byte[] scrFile = ((TakesScreenshot)BaseUITestClass.getDriver())
+                .getScreenshotAs(OutputType.BYTES);
             try {
                 String filename = OSUtil.getPath("target", "surefire-reports", "screenshots", String.format("%s.%s.png",
                         result.getTestClass().getRealClass().getSimpleName(), result.getName()));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
index 2fa7740..8213cd9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
@@ -131,7 +131,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
         GraphAssert.assertVertexSanity(processResult);
         Vertex processVertex = processResult.getResults().get(0);
         final VerticesResult processIncoming =
-            lineageHelper.getVerticesByDirection(processVertex.get_id(), Direction.inComingVertices);
+            lineageHelper.getVerticesByDirection(processVertex.getId(), Direction.inComingVertices);
         GraphAssert.assertVertexSanity(processIncoming);
         final List<Vertex> processInstanceVertices =
             processIncoming.filterByType(Vertex.VERTEX_TYPE.PROCESS_INSTANCE);
@@ -154,7 +154,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
         GraphAssert.assertVertexSanity(processResult);
         Vertex processVertex = processResult.getResults().get(0);
         final VerticesResult processIncoming =
-            lineageHelper.getVerticesByDirection(processVertex.get_id(), Direction.inComingVertices);
+            lineageHelper.getVerticesByDirection(processVertex.getId(), Direction.inComingVertices);
         GraphAssert.assertVertexSanity(processIncoming);
         // fetching process instance vertex
         final List<Vertex> piVertices =
@@ -182,7 +182,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
                 "Unexpected processInstanceTime: " + processInstanceTime +
                     "it should have been be in the list " + allowedPITimes);
 
-            VerticesResult piIncoming = lineageHelper.getVerticesByDirection(piVertex.get_id(),
+            VerticesResult piIncoming = lineageHelper.getVerticesByDirection(piVertex.getId(),
                 Direction.inComingVertices);
             GraphAssert.assertVertexSanity(piIncoming);
             //process input start="now(0,-20) and end is "now(0,0)"
@@ -207,7 +207,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
             }
 
             VerticesResult piOutgoing = lineageHelper.getVerticesByDirection(
-                piVertex.get_id(), Direction.outgoingVertices);
+                piVertex.getId(), Direction.outgoingVertices);
             GraphAssert.assertVertexSanity(piOutgoing);
             Assert.assertEquals(piOutgoing.filterByType(Vertex.VERTEX_TYPE.FEED_INSTANCE).size(),
                 1, "Expected only one output feed instance.");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
index 143789f..6e02822 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
@@ -164,7 +164,7 @@ public class LineageApiTest extends BaseTestClass {
         final VerticesResult userResult =
             lineageHelper.getVerticesByName(MerlinConstants.CURRENT_USER_NAME);
         GraphAssert.assertVertexSanity(userResult);
-        final int vertexId = userResult.getResults().get(0).get_id();
+        final int vertexId = userResult.getResults().get(0).getId();
         final VertexResult userVertex =
             lineageHelper.getVertexById(vertexId);
         Assert.assertEquals(userResult.getResults().get(0), userVertex.getResults(),
@@ -198,8 +198,8 @@ public class LineageApiTest extends BaseTestClass {
         GraphAssert.assertVertexSanity(allVerticesResult);
         int invalidVertexId = -1;
         for (Vertex vertex : allVerticesResult.getResults()) {
-            if(invalidVertexId <= vertex.get_id()) {
-                invalidVertexId = vertex.get_id() + 1;
+            if(invalidVertexId <= vertex.getId()) {
+                invalidVertexId = vertex.getId() + 1;
             }
         }
 
@@ -224,7 +224,7 @@ public class LineageApiTest extends BaseTestClass {
         final VerticesResult coloResult = lineageHelper.getVerticesByType(vertexType);
         GraphAssert.assertVertexSanity(coloResult);
         for (Vertex coloVertex : coloResult.getResults()) {
-            final int coloVertexId = coloVertex.get_id();
+            final int coloVertexId = coloVertex.getId();
             final VertexResult coloProperties = lineageHelper.getVertexProperties(coloVertexId);
             Assert.assertNotNull(coloProperties.getResults().getName(),
                 "name should not be null");
@@ -281,8 +281,8 @@ public class LineageApiTest extends BaseTestClass {
 
         int invalidVertexId = -1;
         for (Vertex vertex : allVerticesResult.getResults()) {
-            if(invalidVertexId <= vertex.get_id()) {
-                invalidVertexId = vertex.get_id() + 1;
+            if(invalidVertexId <= vertex.getId()) {
+                invalidVertexId = vertex.getId() + 1;
             }
         }
 
@@ -402,7 +402,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testVertexDirectionFetchEdges() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
 
         final EdgesResult bothEdges =
             lineageHelper.getEdgesByDirection(clusterVertexId, Direction.bothEdges);
@@ -439,7 +439,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testVertexCountsFetchVertices() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
 
         final VerticesResult bothVertices =
             lineageHelper.getVerticesByDirection(clusterVertexId, Direction.bothVertices);
@@ -478,7 +478,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testVertexDirectionFetchCounts() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
 
         final VerticesResult bothCount =
             lineageHelper.getVerticesByDirection(clusterVertexId, Direction.bothCount);
@@ -502,7 +502,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testVertexDirectionFetchVertexIds() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
 
         final VertexIdsResult bothVerticesIds =
             lineageHelper.getVertexIdsByDirection(clusterVertexId, Direction.bothVerticesIds);
@@ -536,7 +536,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testVertexBadDirection() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
 
         HttpResponse response = lineageHelper
             .runGetRequest(lineageHelper.getUrl(LineageHelper.URL.VERTICES,
@@ -565,7 +565,7 @@ public class LineageApiTest extends BaseTestClass {
 
     @Test
     public void testEdge() throws Exception {
-        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).get_id();
+        final int clusterVertexId = lineageHelper.getVertex(clusterMerlin.getName()).getId();
         final EdgesResult outGoingEdges =
             lineageHelper.getEdgesByDirection(clusterVertexId, Direction.outGoingEdges);
         GraphAssert.assertEdgeSanity(outGoingEdges);
@@ -573,7 +573,7 @@ public class LineageApiTest extends BaseTestClass {
             1, "There should be an edge from the cluster to colo");
 
         final String clusterColoEdgeId =
-            outGoingEdges.filterByType(Edge.LEBEL_TYPE.CLUSTER_COLO).get(0).get_id();
+            outGoingEdges.filterByType(Edge.LEBEL_TYPE.CLUSTER_COLO).get(0).getId();
         final Edge clusterColoEdge =
             lineageHelper.getEdgeById(clusterColoEdgeId).getResults();
         GraphAssert.assertEdgeSanity(clusterColoEdge);
@@ -613,7 +613,7 @@ public class LineageApiTest extends BaseTestClass {
         Vertex coloVertex = colo1Vertex.get(0);
         logger.info("coloVertex: " + coloVertex);
         final VerticesResult verticesByDirection =
-            lineageHelper.getVerticesByDirection(coloVertex.get_id(), Direction.inComingVertices);
+            lineageHelper.getVerticesByDirection(coloVertex.getId(), Direction.inComingVertices);
         AssertUtil.checkForListSize(
             verticesByDirection.filterByName(clusterMerlin.getName()), 1);
     }
@@ -625,7 +625,7 @@ public class LineageApiTest extends BaseTestClass {
         GraphAssert.assertVertexSanity(clusterResult);
         Vertex clusterVertex = clusterResult.getResults().get(0);
         final VerticesResult clusterIncoming =
-            lineageHelper.getVerticesByDirection(clusterVertex.get_id(), Direction.inComingVertices);
+            lineageHelper.getVerticesByDirection(clusterVertex.getId(), Direction.inComingVertices);
         GraphAssert.assertVertexSanity(clusterIncoming);
         for(FeedMerlin feed : inputFeeds) {
             AssertUtil.checkForListSize(clusterIncoming.filterByName(feed.getName()), 1);
@@ -642,7 +642,7 @@ public class LineageApiTest extends BaseTestClass {
         GraphAssert.assertVertexSanity(userResult);
         Vertex clusterVertex = userResult.getResults().get(0);
         final VerticesResult userIncoming =
-            lineageHelper.getVerticesByDirection(clusterVertex.get_id(), Direction.inComingVertices);
+            lineageHelper.getVerticesByDirection(clusterVertex.getId(), Direction.inComingVertices);
         GraphAssert.assertVertexSanity(userIncoming);
         for(FeedMerlin feed : inputFeeds) {
             AssertUtil.checkForListSize(userIncoming.filterByName(feed.getName()), 1);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
index 164caa5..5cbe321 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
@@ -116,7 +116,7 @@ public class LineageGraphTest extends BaseUITestClass {
             CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS);
         /**get process instances*/
         Vertex processVertex = lineageHelper.getVerticesByName(processName).getResults().get(0);
-        piVertices = lineageHelper.getVerticesByDirection(processVertex.get_id(),
+        piVertices = lineageHelper.getVerticesByDirection(processVertex.getId(),
             Direction.inComingVertices).filterByType(Vertex.VERTEX_TYPE.PROCESS_INSTANCE);
         openBrowser();
     }
@@ -135,16 +135,16 @@ public class LineageGraphTest extends BaseUITestClass {
     @Test
     public void testGraphVertices() {
 
-        ProcessPage processPage = new ProcessPage(DRIVER, cluster, processName);
+        ProcessPage processPage = new ProcessPage(driver, cluster, processName);
         processPage.navigateTo();
         for (Vertex piVertex : piVertices) {
             String nominalTime = piVertex.getNominalTime();
             /* get expected feed instances */
             /* input feed instances */
-            List<Vertex> inpInstancesAPI = lineageHelper.getVerticesByDirection(piVertex.get_id(),
+            List<Vertex> inpInstancesAPI = lineageHelper.getVerticesByDirection(piVertex.getId(),
                 Direction.inComingVertices).getResults();
             /* output feed instance */
-            List<Vertex> outInstancesAPI = lineageHelper.getVerticesByDirection(piVertex.get_id(),
+            List<Vertex> outInstancesAPI = lineageHelper.getVerticesByDirection(piVertex.getId(),
                 Direction.outgoingVertices).filterByType(Vertex.VERTEX_TYPE.FEED_INSTANCE);
             /* open lineage for particular process instance */
             processPage.openLineage(nominalTime);
@@ -183,7 +183,7 @@ public class LineageGraphTest extends BaseUITestClass {
     public void testVerticesInfo()
         throws JAXBException, URISyntaxException, AuthenticationException, IOException {
         String clusterName = Util.readEntityName(bundles[0].getClusters().get(0));
-        ProcessPage processPage = new ProcessPage(DRIVER, cluster, processName);
+        ProcessPage processPage = new ProcessPage(driver, cluster, processName);
         processPage.navigateTo();
         for (Vertex piVertex : piVertices) {
             String nominalTime = piVertex.getNominalTime();
@@ -227,7 +227,7 @@ public class LineageGraphTest extends BaseUITestClass {
         expectedDescriptions.put("lineage-legend-feed-inst", "Feed instance");
         expectedDescriptions.put("lineage-legend-feed-inst lineage-legend-terminal",
             "Feed instance (terminal)");
-        ProcessPage processPage = new ProcessPage(DRIVER, prism, processName);
+        ProcessPage processPage = new ProcessPage(driver, prism, processName);
         processPage.navigateTo();
         for (Vertex piVertex : piVertices) {
             String nominalTime = piVertex.getNominalTime();
@@ -252,20 +252,20 @@ public class LineageGraphTest extends BaseUITestClass {
      */
     @Test
     public void testTerminals() {
-        ProcessPage processPage = new ProcessPage(DRIVER, prism, processName);
+        ProcessPage processPage = new ProcessPage(driver, prism, processName);
         processPage.navigateTo();
         lineageHelper = new LineageHelper(prism);
         VerticesResult processResult = lineageHelper.getVerticesByName(processName);
         Vertex processVertex = processResult.getResults().get(0);
         List<Vertex> piVertices =
-            lineageHelper.getVerticesByDirection(processVertex.get_id(),
+            lineageHelper.getVerticesByDirection(processVertex.getId(),
                 Direction.inComingVertices).filterByType(Vertex.VERTEX_TYPE.PROCESS_INSTANCE);
         for (Vertex piVertex : piVertices) {
             String nominalTime = piVertex.getNominalTime();
             processPage.openLineage(nominalTime);
-            List<Vertex> inVertices = lineageHelper.getVerticesByDirection(piVertex.get_id(),
+            List<Vertex> inVertices = lineageHelper.getVerticesByDirection(piVertex.getId(),
                 Direction.inComingVertices).getResults();
-            List<Vertex> outVertices = lineageHelper.getVerticesByDirection(piVertex.get_id(),
+            List<Vertex> outVertices = lineageHelper.getVerticesByDirection(piVertex.getId(),
                 Direction.outgoingVertices).filterByType(Vertex.VERTEX_TYPE.FEED_INSTANCE);
             for (Vertex inVertex : inVertices) {
                 Assert.assertTrue(processPage.isTerminal(inVertex.getName()),
@@ -290,16 +290,16 @@ public class LineageGraphTest extends BaseUITestClass {
      */
     @Test
     public void testEdges() {
-        ProcessPage processPage = new ProcessPage(DRIVER, prism, processName);
+        ProcessPage processPage = new ProcessPage(driver, prism, processName);
         processPage.navigateTo();
         for (Vertex piVertex : piVertices) {
             String nominalTime = piVertex.getNominalTime();
             processPage.openLineage(nominalTime);
             /**get expected edges */
             List<Edge> expectedEdgesAPI = new ArrayList<Edge>();
-            List<Edge> incEdges = lineageHelper.getEdgesByDirection(piVertex.get_id(),
+            List<Edge> incEdges = lineageHelper.getEdgesByDirection(piVertex.getId(),
                 Direction.inComingEdges).getResults();
-            List<Edge> outcEdges = lineageHelper.getEdgesByDirection(piVertex.get_id(),
+            List<Edge> outcEdges = lineageHelper.getEdgesByDirection(piVertex.getId(),
                 Direction.outGoingEdges).filterByType(Edge.LEBEL_TYPE.OUTPUT);
             assert expectedEdgesAPI.addAll(incEdges);
             assert expectedEdgesAPI.addAll(outcEdges);
@@ -312,10 +312,10 @@ public class LineageGraphTest extends BaseUITestClass {
             boolean isEdgePresent = false;
             int vertexRadius = processPage.getCircleRadius();
             for (Edge expEdgeAPI : expectedEdgesAPI) {
-                Vertex startVertexAPI = lineageHelper.getVertexById(expEdgeAPI.get_outV())
+                Vertex startVertexAPI = lineageHelper.getVertexById(expEdgeAPI.getOutV())
                     .getResults();
                 Point startPointAPI = processPage.getVertexEndpoint(startVertexAPI.getName());
-                Vertex endVertexAPI = lineageHelper.getVertexById(expEdgeAPI.get_inV())
+                Vertex endVertexAPI = lineageHelper.getVertexById(expEdgeAPI.getInV())
                     .getResults();
                 Point endPointAPI = processPage.getVertexEndpoint(endVertexAPI.getName());
                 for (Point[] actualEndpoints : edgesFromGraph) {
@@ -339,7 +339,7 @@ public class LineageGraphTest extends BaseUITestClass {
      */
     @Test
     public void testLineageOpenClose() {
-        ProcessPage processPage = new ProcessPage(DRIVER, prism, processName);
+        ProcessPage processPage = new ProcessPage(driver, prism, processName);
         processPage.navigateTo();
         List<String> previous = new ArrayList<String>();
         for (Vertex piVertex : piVertices) {

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cc9909ae/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
index 88c26d5..9282d2c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
@@ -174,7 +174,7 @@ public class ProcessUITest extends BaseUITestClass {
             OozieClientException, InterruptedException {
 
         //check Process statuses via UI
-        EntitiesPage page = new EntitiesPage(DRIVER, cluster, EntityType.PROCESS);
+        EntitiesPage page = new EntitiesPage(driver, cluster, EntityType.PROCESS);
         page.navigateTo();
         String process = bundles[0].getProcessData();
         String processName = Util.readEntityName(process);
@@ -188,7 +188,7 @@ public class ProcessUITest extends BaseUITestClass {
         softAssert.assertEquals(page.getEntityStatus(processName),
                 EntitiesPage.EntityStatus.RUNNING, "Process status should be RUNNING");
 
-        ProcessPage processPage = new ProcessPage(DRIVER, cluster, processName);
+        ProcessPage processPage = new ProcessPage(driver, cluster, processName);
         processPage.navigateTo();
 
         String bundleID = InstanceUtil.getLatestBundleID(cluster, processName, EntityType.PROCESS);


Mime
View raw message