remove personal email from test data script

zanata · Jun 26, 2013 · a8c9e5d · a8c9e5d
1 parent b48bb81
commit a8c9e5d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java b/functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
@@ -14,7 +14,7 @@ public <P extends AbstractPage> P goToPage(String url, Class<P> pageClass)
       return PageFactory.initElements(driver, pageClass);
    }
 
-   public String toUrl(String relativeUrl)
+   private String toUrl(String relativeUrl)
    {
       return hostUrl + removeLeadingSlash(relativeUrl);
    }

diff --git a/...nal-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java b/...nal-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
@@ -12,6 +12,7 @@
 import org.zanata.page.projects.ProjectPage;
 import org.zanata.page.projects.ProjectVersionPage;
 import org.zanata.page.webtrans.DocumentsViewPage;
+import org.zanata.workflow.BasicWorkFlow;
 import org.zanata.workflow.LoginWorkFlow;
 
 import lombok.extern.slf4j.Slf4j;
@@ -25,20 +26,20 @@
 public class DocumentListInWebTransTest
 {
 
-   private HomePage homePage;
    private ProjectVersionPage projectVersionPage;
 
    public boolean signInAs(String username, String password)
    {
-      homePage = new LoginWorkFlow().signIn(username, password);
+      HomePage homePage = new LoginWorkFlow().signIn(username, password);
 
       return homePage.hasLoggedIn();
    }
 
    public ProjectVersionPage goToProjectVersion(String projectName, String versionSlug)
    {
-      ProjectPage projectPage = homePage.goToProjects().goToProject(projectName);
-      projectVersionPage = projectPage.goToVersion(versionSlug);
+      projectVersionPage = new BasicWorkFlow().goToPage(String.format("iteration/view/plurals/%s", versionSlug), ProjectVersionPage.class);
+//      ProjectPage projectPage = homePage.goToProjects().goToProject(projectName);
+//      projectVersionPage = projectPage.goToVersion(versionSlug);
       return projectVersionPage;
    }
 

diff --git a/functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql b/functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
@@ -358,8 +358,8 @@ CREATE CACHED TABLE PUBLIC.HPERSON(
 ALTER TABLE PUBLIC.HPERSON ADD CONSTRAINT PUBLIC.CONSTRAINT_6D PRIMARY KEY(ID);
 -- 4 +/- SELECT COUNT(*) FROM PUBLIC.HPERSON;  
 INSERT INTO PUBLIC.HPERSON(ID, CREATIONDATE, LASTCHANGED, VERSIONNUM, EMAIL, NAME, ACCOUNTID) VALUES
-(1, TIMESTAMP '2012-04-03 15:06:28.0', TIMESTAMP '2012-04-03 15:06:28.0', 0, 'pahuang@redhat.com', 'Administrator', 1),
-(2, TIMESTAMP '2012-04-03 15:06:28.0', TIMESTAMP '2012-04-03 15:06:28.0', 0, 'translator@redhat.com', 'translator', 2),
+(1, TIMESTAMP '2012-04-03 15:06:28.0', TIMESTAMP '2012-04-03 15:06:28.0', 0, 'admin@example.com', 'Administrator', 1),
+(2, TIMESTAMP '2012-04-03 15:06:28.0', TIMESTAMP '2012-04-03 15:06:28.0', 0, 'translator@example.com', 'translator', 2),
 (3, TIMESTAMP '2013-06-24 15:41:33.0', TIMESTAMP '2013-06-24 15:41:33.0', 0, 'glossarist@example.com', 'glossarist', 3),
 (4, TIMESTAMP '2013-06-25 11:43:28.354', TIMESTAMP '2013-06-25 11:43:28.354', 0, 'glossary-admin@example.com', 'glossary-admin', 4);             
 CREATE CACHED TABLE PUBLIC.HPOHEADER(

diff --git a/functional-test/src/test/resources/create_admin_user.sql b/functional-test/src/test/resources/create_admin_user.sql
@@ -1,6 +1,6 @@
 -- this will create user admin/admin
 INSERT INTO HAccount (id,creationDate,lastChanged,versionNum,apiKey,enabled,passwordHash,username,mergedInto) VALUES (1,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},1,'b6d7044e9ee3b2447c28fb7c50d86d98',true,'Eyox7xbNQ09MkIfRyH+rjg==','admin',null);
-INSERT INTO HPerson (id,creationDate,lastChanged,versionNum,email,name,accountId) VALUES (1,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},0,'pahuang@redhat.com','Administrator',1);
+INSERT INTO HPerson (id,creationDate,lastChanged,versionNum,email,name,accountId) VALUES (1,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},0,'admin@example.com','Administrator',1);
 
 INSERT INTO HAccountMembership (accountId,memberOf) VALUES (1,1);
 INSERT INTO HAccountMembership (accountId,memberOf) VALUES (1,4);
diff --git a/functional-test/src/test/resources/create_glossarist_user.sql b/functional-test/src/test/resources/create_glossarist_user.sql
diff --git a/functional-test/src/test/resources/create_translator_user.sql b/functional-test/src/test/resources/create_translator_user.sql
@@ -1,6 +1,6 @@
 -- this will create user translator/translator
 INSERT INTO HAccount (id,creationDate,lastChanged,versionNum,apiKey,enabled,passwordHash,username,mergedInto) VALUES (2,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},1,'d83882201764f7d339e97c4b087f0806',true,'Fr5JHlcaEqKLSHjnBm4gXg==','translator',null);
-INSERT INTO HPerson (id,creationDate,lastChanged,versionNum,email,name,accountId) VALUES (2,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},0,'translator@redhat.com','translator',2);
+INSERT INTO HPerson (id,creationDate,lastChanged,versionNum,email,name,accountId) VALUES (2,{ts '2012-04-03 15:06:28'},{ts '2012-04-03 15:06:28'},0,'translator@example.com','translator',2);
 
 INSERT INTO HAccountMembership (accountId,memberOf) VALUES (2,1);
 INSERT INTO HAccountMembership (accountId,memberOf) VALUES (2,5);