re-organise import in functional test module to reduce diff

zanata · Nov 8, 2013 · df1751a · df1751a
1 parent 796d7fe
commit df1751a
Show file tree

Hide file tree

Showing 27 changed files with 123 additions and 167 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/BasePage.java b/functional-test/src/main/java/org/zanata/page/BasePage.java
@@ -20,12 +20,8 @@
  */
 package org.zanata.page;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
@@ -41,8 +37,11 @@
 import org.zanata.page.projects.ProjectsPage;
 import org.zanata.page.utility.HomePage;
 import org.zanata.util.WebElementUtil;
-
-import java.util.List;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * A Base Page is an extension of the Core Page, providing the navigation bar

diff --git a/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java b/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
@@ -20,9 +20,10 @@
  */
 package org.zanata.page;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import lombok.extern.slf4j.Slf4j;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.firefox.FirefoxBinary;
@@ -33,10 +34,9 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.service.DriverService;
 import org.zanata.util.PropertiesHolder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
+import lombok.extern.slf4j.Slf4j;
 
 import static org.zanata.util.Constants.chrome;
 import static org.zanata.util.Constants.firefox;
@@ -97,8 +97,9 @@ private WebDriver configureChromeDriver() {
                         .withEnvironment(
                                 ImmutableMap
                                         .of("DISPLAY",
-                                                PropertiesHolder.properties
-                                                        .getProperty("webdriver.display")))
+                                            PropertiesHolder.properties
+                                                .getProperty(
+                                                    "webdriver.display")))
                         .withLogFile(
                                 new File(PropertiesHolder.properties
                                         .getProperty("webdriver.log"))).build();

diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
@@ -20,16 +20,16 @@
  */
 package org.zanata.page.administration;
 
-import com.google.common.base.Predicate;
-import lombok.extern.slf4j.Slf4j;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.zanata.page.BasePage;
-
-import java.util.HashMap;
-import java.util.Map;
+import com.google.common.base.Predicate;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author Damian Jansen <a

diff --git a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
@@ -20,10 +20,8 @@
  */
 package org.zanata.page.administration;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
+import java.util.List;
+
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -32,8 +30,10 @@
 import org.zanata.page.BasePage;
 import org.zanata.util.TableRow;
 import org.zanata.util.WebElementUtil;
-
-import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
 
 /**
  * @author Damian Jansen <a

diff --git a/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java b/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
@@ -1,15 +1,15 @@
 package org.zanata.page.groups;
 
-import com.google.common.collect.ImmutableList;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.Select;
 import org.zanata.page.BasePage;
-
-import java.util.List;
+import com.google.common.collect.ImmutableList;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author Patrick Huang <a

diff --git a/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java b/functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
@@ -1,8 +1,7 @@
 package org.zanata.page.groups;
 
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -12,8 +11,9 @@
 import org.zanata.page.projects.ProjectVersionPage;
 import org.zanata.util.TableRow;
 import org.zanata.util.WebElementUtil;
-
-import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author Patrick Huang <a

diff --git a/functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java b/functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
@@ -20,20 +20,20 @@
  */
 package org.zanata.page.projects;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import lombok.extern.slf4j.Slf4j;
+import java.util.Collections;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.zanata.page.BasePage;
 import org.zanata.util.WebElementUtil;
-
-import java.util.Collections;
-import java.util.List;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class ProjectPage extends BasePage {

diff --git a/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java b/functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
@@ -20,18 +20,18 @@
  */
 package org.zanata.page.projects;
 
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.zanata.page.BasePage;
 import org.zanata.page.webtrans.DocumentsViewPage;
-
-import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class ProjectVersionPage extends BasePage {

diff --git a/functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java b/functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
@@ -20,6 +20,9 @@
  */
 package org.zanata.page.utility;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -28,9 +31,6 @@
 import org.zanata.page.BasePage;
 import org.zanata.util.WebElementUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DashboardPage extends BasePage {
 
     @FindBy(id = "main_body_content")

diff --git a/functional-test/src/main/java/org/zanata/util/PropertiesHolder.java b/functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
@@ -1,11 +1,11 @@
 package org.zanata.util;
 
-import lombok.extern.slf4j.Slf4j;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @author Patrick Huang <a
  *         href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>

diff --git a/functional-test/src/main/java/org/zanata/util/TableRow.java b/functional-test/src/main/java/org/zanata/util/TableRow.java
@@ -1,10 +1,10 @@
 package org.zanata.util;
 
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import java.util.List;
-
 /**
  * @author Patrick Huang <a
  *         href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>

diff --git a/functional-test/src/main/java/org/zanata/util/TestFileGenerator.java b/functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
@@ -20,13 +20,13 @@
  */
 package org.zanata.util;
 
-import org.apache.commons.io.FileUtils;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.apache.commons.io.FileUtils;
+
 /**
  * Create and manipulate basic text files for testing.
  *

diff --git a/functional-test/src/main/java/org/zanata/util/WebElementUtil.java b/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
@@ -20,22 +20,22 @@
  */
 package org.zanata.util;
 
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.FluentWait;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

diff --git a/functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java b/functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
@@ -20,6 +20,17 @@
  */
 package org.zanata.workflow;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.zanata.util.Constants;
+import org.zanata.util.PropertiesHolder;
 import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -32,17 +43,6 @@
 import com.google.common.io.InputSupplier;
 import com.google.common.util.concurrent.SimpleTimeLimiter;
 import lombok.extern.slf4j.Slf4j;
-import org.zanata.util.Constants;
-import org.zanata.util.PropertiesHolder;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class ClientPushWorkFlow {

diff --git a/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java b/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
@@ -20,11 +20,11 @@
  */
 package org.zanata.workflow;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.zanata.page.administration.ManageLanguagePage;
 import org.zanata.page.administration.ManageLanguageTeamMemberPage;
-
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class LanguageWorkFlow extends AbstractWebWorkFlow {

diff --git a/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java b/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
@@ -20,13 +20,13 @@
  */
 package org.zanata.workflow;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.zanata.page.projects.CreateVersionPage;
 import org.zanata.page.projects.ProjectPage;
 import org.zanata.page.projects.ProjectVersionPage;
 import org.zanata.page.projects.ProjectsPage;
-
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class ProjectWorkFlow extends AbstractWebWorkFlow {