diff --git a/functional-test/src/main/java/org/zanata/page/AbstractPage.java b/functional-test/src/main/java/org/zanata/page/AbstractPage.java index eb5899b5d7..c7828466cb 100644 --- a/functional-test/src/main/java/org/zanata/page/AbstractPage.java +++ b/functional-test/src/main/java/org/zanata/page/AbstractPage.java @@ -30,6 +30,7 @@ import org.hamcrest.Matcher; import org.hamcrest.StringDescription; import org.openqa.selenium.*; +import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory; import org.openqa.selenium.support.ui.ExpectedConditions; @@ -356,6 +357,70 @@ public void clickElement(final WebElement element) { element.click(); } + /** + * Convenience function for enter text (common case) + * + * @param element element to pass text to + * @param text text to be entered + */ + public void enterText(final WebElement element, final String text) { + enterText(element, text, true, false, true); + } + + /** + * Enter text into an element. + * + * Waits for notifications to be dismissed and element to be ready and visible before entering + * the text. + * If no checking is performed, the resulting screenshot may not be accurate. + * @param element element to pass text to + * @param text text to be entered + * @param clear clear the element's text before entering new text + * @param inject use sendKeys rather than the Actions chain (direct injection) + * @param check check the 'value' attribute for success, and accurate screenshot delay + */ + public void enterText(final WebElement element, final String text, boolean clear, + boolean inject, final boolean check) { + removeNotifications(); + waitForNotificationsGone(); + scrollIntoView(element); + waitForAMoment().withMessage("editable: " + element.toString()).until( + ExpectedConditions.elementToBeClickable(element)); + if (inject) { + if (clear) { + element.clear(); + } + element.sendKeys(text); + } else { + Actions enterTextAction = new Actions(getDriver()).moveToElement(element); + enterTextAction = enterTextAction.click(); + // Fields can 'blur' on click + waitForPageSilence(); + if (clear) { + enterTextAction = enterTextAction.sendKeys(Keys.chord(Keys.CONTROL, "a")).sendKeys(Keys.DELETE); + // Fields can 'blur' on clear + waitForPageSilence(); + } + enterTextAction.sendKeys(text).perform(); + } + if (check) { + waitForAMoment().withMessage("Text equal to entered") + .until(new Predicate() { + @Override + public boolean apply(WebDriver input) { + String text = element.getAttribute("value"); + if (!text.equals(text)) { + log.info("Found: {}", text); + return false; + } + return true; + } + }); + } else { + log.info("Not checking text entered"); + } + } + private void waitForElementReady(final WebElement element) { waitForAMoment().withMessage("Waiting for element to be ready").until( new Predicate() { diff --git a/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java b/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java index 318ca1377f..d19b4dffbc 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java @@ -22,16 +22,14 @@ import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.BasicAcceptanceTest; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.dashboard.DashboardBasePage; import org.zanata.page.dashboard.dashboardsettings.DashboardAccountTab; -import org.zanata.util.AddUsersRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -44,9 +42,6 @@ @Category(DetailedTest.class) public class ChangePasswordTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - @Before public void setUp() { new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); diff --git a/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java b/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java index 8ba72028bc..bfd626fcbf 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java @@ -23,14 +23,12 @@ import lombok.extern.slf4j.Slf4j; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.RegisterPage; -import org.zanata.util.AddUsersRule; import org.zanata.workflow.BasicWorkFlow; import static org.assertj.core.api.Assertions.assertThat; @@ -45,9 +43,6 @@ public class EmailValidationTest extends ZanataTestCase { private RegisterPage registerPage; - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - @BeforeClass public static void setUp() { // Ensure no login diff --git a/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java b/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java index 888fb22d98..7e5b1f619e 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java @@ -21,19 +21,16 @@ package org.zanata.feature.account; import lombok.extern.slf4j.Slf4j; -import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.subethamail.wiser.WiserMessage; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.InactiveAccountPage; import org.zanata.page.utility.HomePage; -import org.zanata.util.AddUsersRule; import org.zanata.util.EmailQuery; -import org.zanata.util.EnsureLogoutRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -49,15 +46,9 @@ @Category(DetailedTest.class) public class InactiveUserLoginTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - @Rule public HasEmailRule hasEmailRule = new HasEmailRule(); - @Rule - public EnsureLogoutRule ensureLogoutRule = new EnsureLogoutRule(); - @Feature(summary = "The user needs to verify their account before they may " + "log in", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 181714) @@ -108,8 +99,7 @@ public void resendActivationEmail() throws Exception { .signInInactive(usernamepassword, usernamepassword) .clickResendActivationEmail(); - assertThat(homePage.getNotificationMessage()) - .isEqualTo(HomePage.SIGNUP_SUCCESS_MESSAGE) + assertThat(homePage.expectNotification(HomePage.SIGNUP_SUCCESS_MESSAGE)) .as("The message sent notification is displayed"); assertThat(hasEmailRule.getMessages().size()) @@ -155,8 +145,7 @@ public void updateActivationEmail() throws Exception { .enterNewEmail("newtester@example.com") .clickUpdateEmail(); - assertThat(homePage.getNotificationMessage()) - .isEqualTo(HomePage.EMAILCHANGED_MESSAGE) + assertThat(homePage.expectNotification(HomePage.EMAILCHANGED_MESSAGE)) .as("The email changed notification is displayed"); assertThat(hasEmailRule.getMessages().size()) diff --git a/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java b/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java index 72ae0f9585..288ff9b16e 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java @@ -21,17 +21,15 @@ package org.zanata.feature.account; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.RegisterPage; import org.zanata.page.dashboard.dashboardsettings.DashboardAccountTab; import org.zanata.page.dashboard.dashboardsettings.DashboardClientTab; import org.zanata.page.dashboard.dashboardsettings.DashboardProfileTab; -import org.zanata.util.AddUsersRule; import org.zanata.util.Constants; import org.zanata.util.PropertiesHolder; import org.zanata.workflow.LoginWorkFlow; @@ -45,9 +43,6 @@ @Category(DetailedTest.class) public class ProfileTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - private static final String adminsApiKey = "b6d7044e9ee3b2447c28fb7c50d86d98"; private static final String serverUrl = PropertiesHolder .getProperty(Constants.zanataInstance.value()); diff --git a/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java b/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java index e77b6834e8..b21bffc6c3 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java @@ -20,26 +20,25 @@ */ package org.zanata.feature.account; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.BasicAcceptanceTest; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.RegisterPage; import org.zanata.page.account.SignInPage; import org.zanata.page.utility.HomePage; -import org.zanata.util.AddUsersRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.BasicWorkFlow; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -49,9 +48,6 @@ @Category(DetailedTest.class) public class RegisterTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - @ClassRule public static HasEmailRule emailRule = new HasEmailRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java b/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java index 85c93f7ca1..d1edc1ed0a 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.RegisterPage; import org.zanata.workflow.BasicWorkFlow; diff --git a/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java b/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java index 396035ea67..100da5a508 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java @@ -20,14 +20,12 @@ */ package org.zanata.feature.administration; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.administration.RoleAssignmentsPage; -import org.zanata.util.AddUsersRule; import org.zanata.workflow.LoginWorkFlow; import static org.assertj.core.api.Assertions.assertThat; @@ -39,9 +37,6 @@ @Category(DetailedTest.class) public class AutoRoleAssignmentTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - @Feature(summary = "The administrator can create a rule to assign roles " + "at user sign in", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) diff --git a/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java b/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java index d2cad5178e..576e0da08c 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java @@ -20,17 +20,13 @@ */ package org.zanata.feature.administration; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.utility.HomePage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -43,14 +39,8 @@ @Category(DetailedTest.class) public class EditHomePageTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - - @BeforeClass - public static void beforeClass() { + @Before + public void before() { new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") diff --git a/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java b/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java index b671e6448a..ba1096ba2c 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java @@ -20,24 +20,23 @@ */ package org.zanata.feature.administration; -import java.io.File; -import org.junit.BeforeClass; -import org.junit.ClassRule; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.openqa.selenium.Alert; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.administration.TranslationMemoryEditPage; import org.zanata.page.administration.TranslationMemoryPage; -import org.zanata.util.AddUsersRule; import org.zanata.util.TestFileGenerator; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.TranslationMemoryWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -47,13 +46,10 @@ @Category(DetailedTest.class) public class EditTranslationMemoryTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - private TestFileGenerator testFileGenerator = new TestFileGenerator(); - @BeforeClass - public static void beforeClass() { + @Before + public void before() { new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java index eb1c4db7ac..102643e68f 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java @@ -21,19 +21,14 @@ package org.zanata.feature.administration; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.administration.ManageSearchPage; import org.zanata.page.dashboard.DashboardBasePage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -42,23 +37,13 @@ @Category(DetailedTest.class) public class ManageSearchTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - private DashboardBasePage dashboardPage; - @BeforeClass - public static void beforeClass() { + @Before + public void before() { assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") .as("Admin is logged in"); - } - - @Before - public void before() { dashboardPage = new BasicWorkFlow().goToDashboard(); } diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java index e155e284cf..aada379a7e 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java @@ -22,16 +22,14 @@ import org.junit.Before; import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.SignInPage; import org.zanata.page.administration.ManageUserAccountPage; import org.zanata.page.dashboard.DashboardBasePage; -import org.zanata.util.AddUsersRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -45,9 +43,6 @@ @Category(DetailedTest.class) public class ManageUsersTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - @ClassRule public static HasEmailRule emailRule = new HasEmailRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java index 01447cf8fa..ca8a4b3450 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java @@ -21,7 +21,7 @@ package org.zanata.feature.administration; import lombok.extern.slf4j.Slf4j; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.testharness.TestPlan; @@ -29,7 +29,6 @@ import org.zanata.page.account.RegisterPage; import org.zanata.page.administration.ServerConfigurationPage; import org.zanata.page.utility.HomePage; -import org.zanata.util.AddUsersRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.RegisterWorkFlow; @@ -44,12 +43,9 @@ @Category(TestPlan.DetailedTest.class) public class ServerSettingsTest extends ZanataTestCase { - @Rule + @ClassRule public HasEmailRule hasEmailRule = new HasEmailRule(); - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - @Test public void setServerURLTest() { new LoginWorkFlow() diff --git a/functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java b/functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java index df52a0ebe5..98c8157c56 100644 --- a/functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java +++ b/functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java @@ -20,32 +20,30 @@ */ package org.zanata.feature.clientserver; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.List; - +import com.google.common.io.Files; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.xml.sax.InputSource; import org.zanata.adapter.po.PoReader2; import org.zanata.common.LocaleId; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.page.webtrans.Plurals; import org.zanata.rest.dto.resource.TextFlow; import org.zanata.rest.dto.resource.TextFlowTarget; -import org.zanata.util.SampleProjectRule; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientWorkFlow; import org.zanata.workflow.LoginWorkFlow; -import com.google.common.io.Files; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -60,9 +58,6 @@ @Category(DetailedTest.class) public class GettextPluralSupportTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - private ClientWorkFlow client = new ClientWorkFlow(); private ZanataRestCaller restCaller; diff --git a/functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java b/functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java index 7ce8a77a1c..0c57a1ef52 100644 --- a/functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java +++ b/functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java @@ -24,18 +24,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.io.Files; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.common.LocaleId; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projectversion.VersionLanguagesPage; import org.zanata.rest.dto.resource.TranslationsResource; import org.zanata.util.Constants; import org.zanata.util.PropertiesHolder; -import org.zanata.util.SampleProjectRule; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientWorkFlow; @@ -60,8 +58,6 @@ @Category(DetailedTest.class) public class ProjectMaintainerTest extends ZanataTestCase { - @Rule - public SampleProjectRule rule = new SampleProjectRule(); private ClientWorkFlow client = new ClientWorkFlow(); private File projectRootPath = client.getProjectRootPath("plural"); private String translatorConfig = ClientWorkFlow diff --git a/functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java b/functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java index 9eceef54d1..fa8cced814 100644 --- a/functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java +++ b/functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java @@ -20,29 +20,27 @@ */ package org.zanata.feature.clientserver; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.util.List; - +import com.google.common.collect.Lists; +import com.google.common.io.Files; import org.fedorahosted.openprops.Properties; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientWorkFlow; import org.zanata.workflow.LoginWorkFlow; -import com.google.common.collect.Lists; -import com.google.common.io.Files; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -53,8 +51,6 @@ @Category(DetailedTest.class) public class PropertiesRoundTripTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); private ClientWorkFlow client = new ClientWorkFlow(); private ZanataRestCaller restCaller; diff --git a/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java b/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java index 5b653ea974..2ac3479d74 100644 --- a/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java +++ b/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java @@ -20,39 +20,31 @@ */ package org.zanata.feature.concurrentedit; -import static org.assertj.core.api.Assertions.assertThat; -import static org.zanata.util.ZanataRestCaller.buildSourceResource; -import static org.zanata.util.ZanataRestCaller.buildTextFlow; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.ws.rs.core.MediaType; - +import com.google.common.base.Function; +import com.google.common.base.Throwables; +import com.google.common.collect.Lists; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.WebResource; import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; import org.zanata.feature.testharness.TestPlan.DetailedTest; import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.rest.dto.resource.Resource; -import org.zanata.util.AddUsersRule; import org.zanata.util.Constants; import org.zanata.util.PropertiesHolder; import org.zanata.util.ZanataRestCaller; -import com.google.common.base.Function; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.WebResource; +import javax.ws.rs.core.MediaType; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.zanata.util.ZanataRestCaller.buildSourceResource; +import static org.zanata.util.ZanataRestCaller.buildTextFlow; /** * @author Patrick Huang pahuang@redhat.com @@ -49,8 +43,6 @@ @Category(DetailedTest.class) public class EditorFilterMessagesTest extends ZanataTestCase { private final String document = "messages"; - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Before public void setUp() { diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java index a1b3ca36f1..2c864d14a3 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java @@ -20,8 +20,6 @@ */ package org.zanata.feature.editor; -import java.io.File; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -33,17 +31,18 @@ import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.CleanDocumentStorageRule; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.FunctionalTestHelper.assumeFalse; @@ -58,9 +57,6 @@ public class TranslateHTMLTest extends ZanataTestCase { @Rule public Timeout timeout = new Timeout(ZanataTestCase.MAX_LONG_TEST_DURATION); - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @ClassRule public static CleanDocumentStorageRule documentStorageRule = new CleanDocumentStorageRule(); @@ -81,6 +77,10 @@ public static void beforeClass() { new File(CleanDocumentStorageRule.getDocumentStoragePath() .concat(File.separator).concat("documents") .concat(File.separator)).exists()); + } + + @Before + public void before() { assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") .as("Admin is logged in"); diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java index 60084630e4..90cf3bb9fb 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java @@ -20,24 +20,23 @@ */ package org.zanata.feature.editor; -import java.io.File; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.CleanDocumentStorageRule; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.FunctionalTestHelper.assumeFalse; @@ -48,9 +47,6 @@ @Category(DetailedTest.class) public class TranslateIdmlTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Rule public CleanDocumentStorageRule documentStorageRule = new CleanDocumentStorageRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java index 71194929a4..b4214b3937 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java @@ -20,24 +20,23 @@ */ package org.zanata.feature.editor; -import java.io.File; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.CleanDocumentStorageRule; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.FunctionalTestHelper.assumeFalse; @@ -48,9 +47,6 @@ @Category(DetailedTest.class) public class TranslateOdsTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Rule public CleanDocumentStorageRule documentStorageRule = new CleanDocumentStorageRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java index 9a172f5727..96713d470f 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java @@ -20,30 +20,26 @@ */ package org.zanata.feature.editor; -import java.io.File; - import org.junit.Before; -import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Rule; import org.junit.experimental.categories.Category; import org.junit.experimental.theories.DataPoint; import org.junit.experimental.theories.Theories; import org.junit.experimental.theories.Theory; -import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.CleanDocumentStorageRule; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.FunctionalTestHelper.assumeFalse; @@ -55,12 +51,6 @@ @Category(DetailedTest.class) public class TranslateOpenOfficeTest extends ZanataTestCase { - @Rule - public Timeout timeout = new Timeout(ZanataTestCase.MAX_LONG_TEST_DURATION); - - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @ClassRule public static CleanDocumentStorageRule documentStorageRule = new CleanDocumentStorageRule(); @@ -75,8 +65,8 @@ public class TranslateOpenOfficeTest extends ZanataTestCase { @DataPoint public static String TEST_ODP = "odp"; - @BeforeClass - public static void beforeClass() { + @Before + public void before() { new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); assumeFalse( "", diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java index d308b10a0b..ee570892eb 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java @@ -20,24 +20,23 @@ */ package org.zanata.feature.editor; -import java.io.File; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.CleanDocumentStorageRule; -import org.zanata.util.SampleProjectRule; import org.zanata.util.TestFileGenerator; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.io.File; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.FunctionalTestHelper.assumeFalse; @@ -48,9 +47,6 @@ @Category(DetailedTest.class) public class TranslateTextTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Rule public CleanDocumentStorageRule documentStorageRule = new CleanDocumentStorageRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java b/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java index b587e3934f..5c561559c8 100644 --- a/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java +++ b/functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java @@ -28,7 +28,6 @@ import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; import org.zanata.util.RetryRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; @@ -43,9 +42,6 @@ public class TranslationHistoryTest extends ZanataTestCase { @Rule public RetryRule retryRule = new RetryRule(0); - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Test public void showTranslationHistory() { new LoginWorkFlow().signIn("admin", "admin"); diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java index 0b5e6101f2..ccc2102259 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java @@ -21,17 +21,13 @@ package org.zanata.feature.glossary; import lombok.extern.slf4j.Slf4j; - import org.hamcrest.Matchers; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.TestRule; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.glossary.GlossaryPage; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.ClientWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -50,9 +46,6 @@ @Slf4j public class GlossaryAdminTest extends ZanataTestCase { - @Rule - public TestRule sampleProjectRule = new SampleProjectRule(); - private ClientWorkFlow clientWorkFlow = new ClientWorkFlow(); /** diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java index 9f57856ef0..1614cddb45 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java @@ -22,14 +22,11 @@ import lombok.extern.slf4j.Slf4j; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.TestRule; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -49,9 +46,6 @@ @Slf4j public class GlossaryDeleteTest extends ZanataTestCase { - @Rule - public TestRule sampleProjectRule = new SampleProjectRule(); - private ClientWorkFlow clientWorkFlow; private File projectRootPath; private String userConfigPath; diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java index 51240a7ea4..67b084b8c8 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java @@ -23,14 +23,11 @@ import com.google.common.base.Joiner; import lombok.extern.slf4j.Slf4j; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.TestRule; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.webtrans.EditorPage; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.ClientWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -49,9 +46,6 @@ @Category(DetailedTest.class) public class GlossaryPushTest extends ZanataTestCase { - @Rule - public TestRule sampleProjectRule = new SampleProjectRule(); - private ClientWorkFlow clientWorkFlow; private File projectRootPath; private String userConfigPath; diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java index 69cd2354f9..8c47fb5a2a 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java @@ -23,14 +23,11 @@ import com.google.common.base.Joiner; import lombok.extern.slf4j.Slf4j; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.TestRule; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; -import org.zanata.util.SampleProjectRule; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.workflow.ClientWorkFlow; import java.io.File; @@ -48,9 +45,6 @@ @Slf4j public class InvalidGlossaryPushTest extends ZanataTestCase { - @Rule - public TestRule sampleProjectRule = new SampleProjectRule(); - private String pushCommand = "mvn --batch-mode zanata:glossary-push -Dglossary.lang=fr -Dzanata.glossaryFile=compendium_fr_invalid.po -Dzanata.userConfig="; private ClientWorkFlow clientWorkFlow; private String userConfigPath; diff --git a/functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java b/functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java deleted file mode 100644 index 8a48d3c438..0000000000 --- a/functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2013, Red Hat, Inc. and individual contributors as indicated by the - * @author tags. See the copyright.txt file in the distribution for a full - * listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF - * site: http://www.fsf.org. - */ -package org.zanata.feature.googleopenid; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; -import static org.zanata.util.GoogleSignIn.getSignIn; -import static org.zanata.util.GoogleSignIn.googleIsReachable; - -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.zanata.feature.testharness.ZanataTestCase; -import org.zanata.feature.testharness.TestPlan.UnstableTest; -import org.zanata.page.googleaccount.GoogleAccountPage; -import org.zanata.page.googleaccount.GoogleManagePermissionsPage; -import org.zanata.page.utility.HomePage; -import org.zanata.util.CleanDatabaseRule; -import org.zanata.util.HasEmailRule; -import org.zanata.workflow.BasicWorkFlow; -import org.zanata.workflow.GoogleWorkFlow; -import org.zanata.workflow.RegisterWorkFlow; - -/** - * @author Damian Jansen djansen@redhat.com - */ -@Category(UnstableTest.class) -public class GoogleOpenIDTest extends ZanataTestCase { - - @Rule - public CleanDatabaseRule cleanDatabaseRule = new CleanDatabaseRule(); - - @ClassRule - public static HasEmailRule hasEmailRule = new HasEmailRule(); - - private String googleUsername1 = "zanata.test.1"; - private String googlePassword1; - - @Before - public void before() { - googlePassword1 = getSignIn(googleUsername1); - assertThat("Environment has Google login data", - !googlePassword1.isEmpty()); - assertThat("Google can be reached", googleIsReachable()); - - new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); - - GoogleManagePermissionsPage googleManagePermissionsPage = - new GoogleWorkFlow().resetGooglePermissions(googleUsername1, - googlePassword1); - - assumeFalse("Google contains localhost permissions", - googleManagePermissionsPage.pageContainsPermission("localhost")); - - GoogleAccountPage googleAccountPage = - new GoogleWorkFlow().forceLogout(); - - assumeTrue(googleAccountPage.getUrl().contains("/ServiceLogin")); - } - - @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION) - public void signInWithGoogleOpenID() { - String googleUsername = googleUsername1; - String googlePassword = googlePassword1; - - HomePage homePage = new RegisterWorkFlow() - .registerGoogleOpenID("Zanata OpenID", - "openidtest", googlePassword, - googleUsername.concat("@gmail.com")); - - assertThat("The registration message is shown", - homePage.getNotificationMessage(), - Matchers.equalTo("You will soon receive an email with a link" + - " to activate your account.")); - } -} 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 c18874fc7f..8ee1b8ac31 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 @@ -21,25 +21,21 @@ package org.zanata.feature.language; -import java.util.List; -import java.util.Map; - -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.administration.AddLanguagePage; import org.zanata.page.languages.LanguagesPage; import org.zanata.page.projects.projectsettings.ProjectLanguagesTab; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; +import java.util.List; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -49,14 +45,8 @@ @Category(DetailedTest.class) public class AddLanguageTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - - @BeforeClass - public static void beforeClass() { + @Before + public void before() { new BasicWorkFlow().goToHome().deleteCookiesAndRefresh(); assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") diff --git a/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java b/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java index 509c881d21..cf7eb48b8d 100644 --- a/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java +++ b/functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java @@ -20,7 +20,7 @@ */ package org.zanata.feature.language; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.subethamail.wiser.WiserMessage; @@ -28,7 +28,6 @@ import org.zanata.feature.testharness.TestPlan.DetailedTest; import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.languages.LanguagesPage; -import org.zanata.util.AddUsersRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.LoginWorkFlow; @@ -42,11 +41,8 @@ @Category(DetailedTest.class) public class ContactLanguageTeamTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public HasEmailRule emailRule = new HasEmailRule(); + @ClassRule + public static HasEmailRule emailRule = new HasEmailRule(); @Feature(summary = "The user can contact a language team coordinator", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) diff --git a/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java b/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java index ec59a09537..62b4b79d0f 100644 --- a/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java +++ b/functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java @@ -20,20 +20,19 @@ */ package org.zanata.feature.language; -import java.util.concurrent.TimeUnit; - -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.subethamail.wiser.WiserMessage; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.languages.LanguagePage; import org.zanata.util.HasEmailRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; +import java.util.concurrent.TimeUnit; + import static org.assertj.core.api.Assertions.assertThat; import static org.zanata.util.HasEmailRule.getEmailContent; @@ -44,11 +43,8 @@ @Category(DetailedTest.class) public class JoinLanguageTeamTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - - @Rule - public HasEmailRule hasEmailRule = new HasEmailRule(); + @ClassRule + public static HasEmailRule hasEmailRule = new HasEmailRule(); @Feature(summary = "The administrator can add a member to a language team", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 181703) diff --git a/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java b/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java index 97367a3679..eff284d583 100644 --- a/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java +++ b/functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java @@ -1,15 +1,8 @@ package org.zanata.feature.manual; -import static org.zanata.util.ZanataRestCaller.buildSourceResource; -import static org.zanata.util.ZanataRestCaller.buildTextFlow; -import static org.zanata.util.ZanataRestCaller.buildTextFlowTarget; -import static org.zanata.util.ZanataRestCaller.buildTranslationResource; - -import java.util.List; - +import com.google.common.collect.ImmutableList; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang.RandomStringUtils; import org.junit.Before; import org.junit.Rule; @@ -24,7 +17,9 @@ import org.zanata.util.SampleProjectRule; import org.zanata.util.ZanataRestCaller; -import com.google.common.collect.ImmutableList; +import java.util.List; + +import static org.zanata.util.ZanataRestCaller.*; /** * This is a manual test that will help tuning/troubleshooting copyTrans. This diff --git a/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java b/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java index 1efff5550d..0170ffd577 100644 --- a/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java +++ b/functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java @@ -20,23 +20,22 @@ */ package org.zanata.feature.misc; -import java.util.List; - -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.subethamail.wiser.WiserMessage; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.dashboard.DashboardBasePage; import org.zanata.page.utility.ContactAdminFormPage; -import org.zanata.util.AddUsersRule; import org.zanata.util.Constants; import org.zanata.util.HasEmailRule; import org.zanata.util.PropertiesHolder; import org.zanata.workflow.LoginWorkFlow; +import java.util.List; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -46,10 +45,8 @@ @Category(DetailedTest.class) public class ContactAdminTest extends ZanataTestCase { - @Rule - public AddUsersRule addUsersRule = new AddUsersRule(); - @Rule - public HasEmailRule emailRule = new HasEmailRule(); + @ClassRule + public static HasEmailRule emailRule = new HasEmailRule(); @Feature(summary = "The user can contact the site administrator", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 181717) diff --git a/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java b/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java index 4303c7f057..6bc44d7c30 100644 --- a/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java +++ b/functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java @@ -20,19 +20,14 @@ */ package org.zanata.feature.misc; -import java.util.concurrent.Callable; - -import org.hamcrest.Matchers; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projectversion.VersionLanguagesPage; import org.zanata.page.webtrans.EditorPage; import org.zanata.rest.dto.resource.Resource; -import org.zanata.util.SampleProjectRule; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -53,8 +48,6 @@ @Category(DetailedTest.class) public class ObsoleteTextTest extends ZanataTestCase { - @Rule - public SampleProjectRule rule = new SampleProjectRule(); private ZanataRestCaller restCaller; @Before diff --git a/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java b/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java index 9cdf13d7d3..ccec03cd44 100644 --- a/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java +++ b/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java @@ -20,22 +20,16 @@ */ package org.zanata.feature.misc; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.ws.rs.core.MediaType; - +import com.google.common.base.Function; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.UniformInterfaceException; +import com.sun.jersey.api.client.WebResource; import lombok.extern.slf4j.Slf4j; - import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; @@ -43,20 +37,21 @@ import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.administration.AdministrationPage; import org.zanata.page.administration.ServerConfigurationPage; -import org.zanata.util.AddUsersRule; import org.zanata.util.Constants; import org.zanata.util.PropertiesHolder; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.LoginWorkFlow; -import com.google.common.base.Function; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.UniformInterfaceException; -import com.sun.jersey.api.client.WebResource; +import javax.ws.rs.core.MediaType; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Patrick Huang djansen@redhat.com @@ -52,13 +49,7 @@ public class EditPermissionsTest extends ZanataTestCase { private final String TRANSLATOR_KEY = PropertiesHolder .getProperty(Constants.zanataTranslatorKey.value()); - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @After - public void after() { - new BasicWorkFlow().goToHome(); - } @Feature(summary = "The user can view maintainers for a project", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java index d7cdd78ee5..d929ad8166 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java @@ -21,15 +21,13 @@ package org.zanata.feature.project; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projects.ProjectAboutPage; import org.zanata.page.projects.projectsettings.ProjectAboutTab; -import org.zanata.util.SampleProjectRule; import org.zanata.util.ZanataRestCaller; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; @@ -43,9 +41,6 @@ @Category(DetailedTest.class) public class EditProjectAboutTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Feature(summary = "The administrator can change a project about content", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION) diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java index 2abe50b543..2ee331e837 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java @@ -20,19 +20,15 @@ */ package org.zanata.feature.project; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; -import org.zanata.page.projects.projectsettings.ProjectGeneralTab; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projects.ProjectVersionsPage; import org.zanata.page.projects.ProjectsPage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; +import org.zanata.page.projects.projectsettings.ProjectGeneralTab; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; @@ -46,14 +42,8 @@ @Category(DetailedTest.class) public class EditProjectGeneralTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - - @BeforeClass - public static void beforeClass() { + @Before + public void before() { assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") .as("Admin is logged in"); diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java index 654558995f..161253ec10 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java @@ -21,26 +21,21 @@ package org.zanata.feature.project; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.List; - import org.assertj.core.api.Assertions; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Rule; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; import org.zanata.feature.testharness.TestPlan.DetailedTest; import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projects.projectsettings.ProjectLanguagesTab; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Damian Jansen * djansen@redhat.com @@ -48,14 +43,8 @@ @Category(DetailedTest.class) public class EditProjectLanguagesTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - - @BeforeClass - public static void beforeClass() { + @Before + public void before() { assertThat(new LoginWorkFlow().signIn("admin", "admin").loggedInAs()) .isEqualTo("admin") .as("Admin is logged in"); diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java index a10c667373..b0178b93dc 100644 --- a/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java +++ b/functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java @@ -20,22 +20,17 @@ */ package org.zanata.feature.project; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; +import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.projects.projectsettings.ProjectTranslationTab; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; /** * @author Damian Jansen pahuang@redhat.com */ public class CopyTransTest { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); private boolean COPYTRANS = true; diff --git a/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java b/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java index 2050a12d7b..9d0938f8b8 100644 --- a/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java +++ b/functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java @@ -21,22 +21,18 @@ package org.zanata.feature.search; -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.BasePage; import org.zanata.page.account.ProfilePage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.EnsureLogoutRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Damian Jansen djansen@redhat.com @@ -44,12 +40,6 @@ @Category(DetailedTest.class) public class PersonSearchTest extends ZanataTestCase { - @ClassRule - public static AddUsersRule addUsersRule = new AddUsersRule(); - - @Rule - public EnsureLogoutRule ensureLogoutRule = new EnsureLogoutRule(); - @Feature(summary = "The user can search for another user", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION) diff --git a/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java b/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java index 125f843905..79646db8b9 100644 --- a/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java +++ b/functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java @@ -21,21 +21,19 @@ package org.zanata.feature.search; -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.BasePage; import org.zanata.page.projects.ProjectBasePage; import org.zanata.page.projects.ProjectsPage; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Damian Jansen djansen@redhat.com @@ -43,9 +41,6 @@ @Category(DetailedTest.class) public class ProjectSearchTest extends ZanataTestCase { - @Rule - public SampleProjectRule sampleProjectRule = new SampleProjectRule(); - @Feature(summary = "The user can search for a project", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION) diff --git a/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java b/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java index d202f190e1..1fa1722823 100644 --- a/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java +++ b/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java @@ -21,20 +21,17 @@ package org.zanata.feature.security; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.RuleChain; import org.openqa.selenium.By; import org.subethamail.wiser.WiserMessage; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.BasicAcceptanceTest; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.account.ResetPasswordPage; import org.zanata.page.utility.HomePage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.EnsureLogoutRule; import org.zanata.util.HasEmailRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; @@ -47,12 +44,9 @@ */ @Category(DetailedTest.class) public class SecurityTest extends ZanataTestCase { - @Rule - public HasEmailRule hasEmailRule = new HasEmailRule(); - @Rule - public RuleChain chain = RuleChain.outerRule(new AddUsersRule()) - .around(new EnsureLogoutRule()); + @ClassRule + public static HasEmailRule hasEmailRule = new HasEmailRule(); @Feature(summary = "The user can log in", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 86815) diff --git a/functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java b/functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java index 30038ef4a0..e8e861a163 100644 --- a/functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java +++ b/functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java @@ -24,29 +24,34 @@ import org.junit.runners.Suite; import org.zanata.feature.account.*; import org.zanata.feature.administration.*; -import org.zanata.feature.clientserver.*; -import org.zanata.feature.concurrentedit.*; +import org.zanata.feature.clientserver.GettextPluralSupportTest; +import org.zanata.feature.clientserver.ProjectMaintainerTest; +import org.zanata.feature.clientserver.PropertiesRoundTripTest; +import org.zanata.feature.concurrentedit.ConcurrentAccessTest; +import org.zanata.feature.concurrentedit.ConcurrentEditTest; import org.zanata.feature.dashboard.DashboardTest; -import org.zanata.feature.document.FileTypeUploadTest; -import org.zanata.feature.document.HTMLDocumentTypeTest; -import org.zanata.feature.document.MultiFileUploadTest; -import org.zanata.feature.document.SubtitleDocumentTypeTest; -import org.zanata.feature.document.UploadTest; +import org.zanata.feature.document.*; import org.zanata.feature.editor.*; import org.zanata.feature.glossary.GlossaryAdminTest; import org.zanata.feature.glossary.GlossaryDeleteTest; import org.zanata.feature.glossary.GlossaryPushTest; import org.zanata.feature.glossary.InvalidGlossaryPushTest; -import org.zanata.feature.googleopenid.GoogleOpenIDTest; import org.zanata.feature.language.AddLanguageTest; import org.zanata.feature.language.ContactLanguageTeamTest; import org.zanata.feature.language.JoinLanguageTeamTest; -import org.zanata.feature.misc.*; +import org.zanata.feature.misc.ContactAdminTest; +import org.zanata.feature.misc.FlakyTest; +import org.zanata.feature.misc.ObsoleteTextTest; +import org.zanata.feature.misc.RateLimitRestAndUITest; import org.zanata.feature.project.*; -import org.zanata.feature.projectversion.*; +import org.zanata.feature.projectversion.CreateProjectVersionTest; +import org.zanata.feature.projectversion.EditVersionLanguagesTest; +import org.zanata.feature.projectversion.EditVersionValidationsTest; +import org.zanata.feature.projectversion.VersionFilteringTest; import org.zanata.feature.search.ProjectSearchTest; import org.zanata.feature.security.SecurityTest; -import org.zanata.feature.versionGroup.*; +import org.zanata.feature.versionGroup.VersionGroupTest; +import org.zanata.feature.versionGroup.VersionGroupUrlTest; /** * The Zanata feature test list and suite interface.
@@ -137,12 +142,6 @@ GlossaryPushTest.class, InvalidGlossaryPushTest.class, - /* - * Google OpenID - * Registration and log in with Google OpenID - */ - GoogleOpenIDTest.class, - /* * Language * Participation in an management of language teams diff --git a/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java b/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java index b17ee87930..eae1fa158f 100644 --- a/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java +++ b/functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java @@ -29,8 +29,11 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; +import org.junit.rules.RuleChain; import org.junit.rules.TestName; import org.zanata.page.WebDriverFactory; +import org.zanata.util.EnsureLogoutRule; +import org.zanata.util.SampleProjectRule; /** * Global application of rules to Zanata functional tests @@ -47,6 +50,11 @@ public class ZanataTestCase { @Rule public TestName testName = new TestName(); + @Rule + public RuleChain theOneRule = RuleChain + .outerRule(new EnsureLogoutRule()) + .around(new SampleProjectRule()); + /* * rhbz1096552 - disable test timeout for now * see https://bugzilla.redhat.com/show_bug.cgi?id=1096552 diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java index 3a4048181c..cf4a3dc7a7 100644 --- a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java +++ b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java @@ -21,25 +21,20 @@ package org.zanata.feature.versionGroup; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; -import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.feature.testharness.TestPlan.BasicAcceptanceTest; import org.zanata.feature.testharness.TestPlan.DetailedTest; +import org.zanata.feature.testharness.ZanataTestCase; import org.zanata.page.groups.CreateVersionGroupPage; import org.zanata.page.groups.VersionGroupPage; import org.zanata.page.groups.VersionGroupsPage; -import org.zanata.util.AddUsersRule; -import org.zanata.util.SampleProjectRule; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.LoginWorkFlow; -import static org.zanata.util.FunctionalTestHelper.assumeTrue; import static org.assertj.core.api.Assertions.assertThat; +import static org.zanata.util.FunctionalTestHelper.assumeTrue; /** * @author Damian Jansen