From 796d7feaeda58e8bd04b7e24f66a7058871002da Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Fri, 8 Nov 2013 10:11:11 +1000 Subject: [PATCH] convert newly added tests --- .../feature/language/AddLanguageTest.java | 5 ++-- .../feature/project/EditMaintainersTest.java | 5 ++-- .../feature/project/ProjectVersionTest.java | 11 ++++---- .../org/zanata/util/SampleProjectProfile.java | 25 +++++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java b/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java index 3fef33394b..66a540822a 100644 --- a/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java +++ b/functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java @@ -29,7 +29,7 @@ import org.zanata.page.administration.AddLanguagePage; import org.zanata.page.administration.ManageLanguagePage; import org.zanata.page.projects.CreateVersionPage; -import org.zanata.util.ResetDatabaseRule; +import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import java.util.Map; @@ -44,8 +44,7 @@ public class AddLanguageTest { @ClassRule - public static ResetDatabaseRule resetDatabaseRule = - new ResetDatabaseRule(ResetDatabaseRule.Config.WithData); + public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Test public void addLanguageAsEnabled() { diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java index 8dce87b8ff..87611759d8 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java @@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category; import org.zanata.feature.DetailedTest; import org.zanata.page.projects.ProjectMaintainersPage; -import org.zanata.util.ResetDatabaseRule; +import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import static org.junit.Assume.assumeTrue; @@ -41,8 +41,7 @@ public class EditMaintainersTest { @Rule - public ResetDatabaseRule resetDatabaseRule = - new ResetDatabaseRule(ResetDatabaseRule.Config.WithData); + public SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Test public void maintainerDetailsAreDisplayed() { diff --git a/functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java b/functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java index c989bfa78d..e5d28d5e9d 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java @@ -23,12 +23,13 @@ import org.hamcrest.Matchers; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.DetailedTest; import org.zanata.page.projects.CreateVersionPage; import org.zanata.page.projects.ProjectVersionPage; -import org.zanata.util.ResetDatabaseRule; +import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import static org.hamcrest.MatcherAssert.assertThat; @@ -41,11 +42,7 @@ public class ProjectVersionTest { @ClassRule - public static ResetDatabaseRule resetDatabaseRule = - new ResetDatabaseRule(ResetDatabaseRule.Config.WithData); - - private String formatError = "must start and end with letter or number, "+ - "and contain only letters, numbers, underscores and hyphens."; + public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Test public void idFieldMustNotBeEmpty() { @@ -70,6 +67,8 @@ public void idStartsAndEndsWithAlphanumeric() { .clickCreateVersionLink() .inputVersionId("-A"); + String formatError = "must start and end with letter or number, " + + "and contain only letters, numbers, underscores and hyphens."; assertThat("The input is rejected", createVersionPage.getErrors(), Matchers.hasItem(formatError)); diff --git a/functional-test/src/test/java/org/zanata/util/SampleProjectProfile.java b/functional-test/src/test/java/org/zanata/util/SampleProjectProfile.java index b4c9d0a12c..1a36e5e347 100644 --- a/functional-test/src/test/java/org/zanata/util/SampleProjectProfile.java +++ b/functional-test/src/test/java/org/zanata/util/SampleProjectProfile.java @@ -116,39 +116,42 @@ public void makeSampleUsers() { "b6d7044e9ee3b2447c28fb7c50d86d98", 1L); assignAccountRole(1L, "admin"); - admin = makePerson(1L, "Administrator"); + admin = makePerson(1L, "Administrator", "admin"); assignAccountToPerson(adminAccount, admin); HAccount translatorAccount = makeAccount("translator", "Fr5JHlcaEqKLSHjnBm4gXg==", "d83882201764f7d339e97c4b087f0806", 2L); assignAccountRole(2L, "user"); - translator = makePerson(2L, "translator"); + translator = makePerson(2L, "translator", "translator"); assignAccountToPerson(translatorAccount, translator); HAccount glossaristAccount = makeAccount("glossarist", "fRIeiPDPlSMtHbBNoqDjNQ==", "b1e3daa18e41c0ce79829e87ce66b201", 3L); assignAccountRole(3L, "glossarist"); - glossarist = makePerson(3L, "glossarist"); + glossarist = makePerson(3L, "glossarist", "glossarist"); assignAccountToPerson(glossaristAccount, glossarist); HAccount gAdminAccount = makeAccount("glossaryadmin", "/W0YpteXk+WtymQ7H84kPQ==", "5a6a34d28d39ff90ea47402311f339d4", 4L); assignAccountRole(4L, "glossary-admin"); - glossaryAdmin = makePerson(4L, "glossary-admin"); + glossaryAdmin = makePerson(4L, "glossary-admin", "glossary-admin"); assignAccountToPerson(gAdminAccount, glossaryAdmin); } - private HPerson makePerson(Long wantedIdValue, String nameValue) { + private HPerson makePerson(Long wantedIdValue, String nameValue, + String username) { return EntityMakerBuilder - .builder() - .addFieldOrPropertyMaker(HPerson.class, "name", - FixedValueMaker.fix(nameValue)) - .build() - .makeAndPersist(entityManager, HPerson.class, - new FixIdCallback(HPerson.class, wantedIdValue)); + .builder() + .addFieldOrPropertyMaker(HPerson.class, "name", + FixedValueMaker.fix(nameValue)) + .addFieldOrPropertyMaker(HPerson.class, "email", + FixedValueMaker.fix(username + "@example.com")) + .build() + .makeAndPersist(entityManager, HPerson.class, + new FixIdCallback(HPerson.class, wantedIdValue)); } private void assignAccountToPerson(HAccount account, HPerson hPerson) {