rename package and move

server/functional-test/src/main/java/org/zanata/action/AbstractAction.java → server/functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java

@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.zanata.action;
+package org.zanata.workflow;
 
 import org.openqa.selenium.WebDriver;
 import org.zanata.page.HomePage;
 import org.zanata.page.WebDriverFactory;
 
-public class AbstractAction
+public class AbstractWebWorkFlow
 {
    protected final WebDriver driver;
    protected final String hostUrl;
 
-   public AbstractAction()
+   public AbstractWebWorkFlow()
    {
       String baseUrl = WebDriverFactory.INSTANCE.getHostUrl();
       hostUrl = appendTrailingSlash(baseUrl);

server/functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010 Google Inc.
+ * 
+ * Licensed 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
+ * 
+ * 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. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.zanata.workflow;
+
+public class ClientPushWorkFlow
+{
+
+}

server/functional-test/src/main/java/org/zanata/action/LanguageAction.java → server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.zanata.action;
+package org.zanata.workflow;
 
 import org.zanata.page.ManageLanguagePage;
 
-public class LanguageAction extends AbstractAction
+public class LanguageWorkFlow extends AbstractWebWorkFlow
 {
    public ManageLanguagePage addLanguageAndJoin(String localeId)
    {

server/functional-test/src/main/java/org/zanata/action/LoginAction.java → server/functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java

@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.zanata.action;
+package org.zanata.workflow;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.zanata.page.HomePage;
 import org.zanata.page.SignInPage;
 
-public class LoginAction extends AbstractAction
+public class LoginWorkFlow extends AbstractWebWorkFlow
 {
-   private static final Logger LOGGER = LoggerFactory.getLogger(LoginAction.class);
+   private static final Logger LOGGER = LoggerFactory.getLogger(LoginWorkFlow.class);
 
    public HomePage signIn(String username, String password)
    {

server/functional-test/src/main/java/org/zanata/action/ProjectAction.java → server/functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java

@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.zanata.action;
+package org.zanata.workflow;
 
 import org.zanata.page.AbstractPage;
 import org.zanata.page.HomePage;
 import org.zanata.page.ProjectPage;
 import org.zanata.page.ProjectVersionPage;
 import org.zanata.page.ProjectsPage;
 
-public class ProjectAction extends AbstractAction
+public class ProjectWorkFlow extends AbstractWebWorkFlow
 {
    public ProjectPage createNewProject(HomePage homePage, String projectId, String projectName)
    {

server/functional-test/src/test/java/org/zanata/feature/CreateProjectTest.java

@@ -17,8 +17,8 @@
 
 import org.hamcrest.Matchers;
 import org.testng.annotations.Test;
-import org.zanata.action.ProjectAction;
-import org.zanata.action.LoginAction;
+import org.zanata.workflow.LoginWorkFlow;
+import org.zanata.workflow.ProjectWorkFlow;
 import org.zanata.page.HomePage;
 import org.zanata.page.ProjectPage;
 import org.zanata.page.ProjectVersionPage;
@@ -34,8 +34,8 @@ public void canCreateProjectAndVersion() {
       final String projectVersion = "master";
       final String projectName = "plural project";
 
-      HomePage homePage = new LoginAction().signIn("admin", "admin");
-      ProjectAction projectAction = new ProjectAction();
+      HomePage homePage = new LoginWorkFlow().signIn("admin", "admin");
+      ProjectWorkFlow projectAction = new ProjectWorkFlow();
       ProjectPage projectPage = projectAction.createNewProject(homePage, projectId, projectName);
 
       assertThat(projectPage.getProjectId(), Matchers.equalTo("Project ID: " + projectId));

server/functional-test/src/test/java/org/zanata/feature/LanguageTest.java

@@ -16,16 +16,16 @@
 package org.zanata.feature;
 
 import org.testng.annotations.Test;
-import org.zanata.action.LanguageAction;
-import org.zanata.action.LoginAction;
+import org.zanata.workflow.LanguageWorkFlow;
+import org.zanata.workflow.LoginWorkFlow;
 
 public class LanguageTest
 {
    @Test
    public void canAddLanguage()
    {
-      new LoginAction().signIn("admin", "admin");
-      LanguageAction languageAction = new LanguageAction();
+      new LoginWorkFlow().signIn("admin", "admin");
+      LanguageWorkFlow languageAction = new LanguageWorkFlow();
       languageAction.addLanguageAndJoin("en-US");
       languageAction.addLanguageAndJoin("pl");
       languageAction.addLanguageAndJoin("zh");

server/functional-test/src/test/java/org/zanata/feature/LoginTest.java

@@ -17,7 +17,7 @@
 
 import org.hamcrest.Matchers;
 import org.testng.annotations.Test;
-import org.zanata.action.LoginAction;
+import org.zanata.workflow.LoginWorkFlow;
 import org.zanata.page.HomePage;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -26,7 +26,7 @@ public class LoginTest
 {
    @Test
    public void canLogIn() {
-      LoginAction loginAction = new LoginAction();
+      LoginWorkFlow loginAction = new LoginWorkFlow();
       HomePage homePage = loginAction.signIn("admin", "admin");
 
       assertThat(homePage.getTitle(), Matchers.equalTo("Zanata:Home"));

server/functional-test/src/test/resources/setup.properties

@@ -3,4 +3,5 @@ webdriver.chrome.bin=/opt/google/chrome/google-chrome
 
 #this decides what web driver type we intended to use. At the moment only htmlUnit is working under RHEL6
 webdriver.type=htmlUnit
-zanata.instance.url=${zanata.instance.url}
+zanata.instance.url=${zanata.instance.url}
+sample.projects.location=${basedir}/sample-projects