diff --git a/functional-test/pom.xml b/functional-test/pom.xml index de108cc3b1..4c5786fb39 100644 --- a/functional-test/pom.xml +++ b/functional-test/pom.xml @@ -62,7 +62,7 @@ -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787 -Xnoagent -Djava.compiler=NONE - **/*TestSuite.java + **/AggregateTestSuite.java @@ -403,8 +403,8 @@ -Dzanata.sample.projects.basedir=${project.build.testOutputDirectory}/sample-projects -Dcargo.debug.jvm.args : If not set by default will listen to port 8787. Need to set to empty on jenkins - -Dinclude.test.patterns=test filter pattern. Can be used to control what test to run. Default is **/*TestSuite.java. - -Dwebdriver.type=run tests in htmlUnit, chrome or firefox. For chrome, see also webdriver.chrome.* Default is htmlUnit. + -Dinclude.test.patterns=test filter pattern. Can be used to control what test to run. Default is **/*AggregateTestSuite.java. + -Dwebdriver.type=run tests in htmlUnit, chrome or firefox. For chrome, see also webdriver.chrome.* Default is chrome. -Dwebdriver.display=display to run test browser in, for Xnest or otherwise. Default is :0. -Dwebdriver.chrome.bin=full path to chrome binary. -Dwebdriver.chrome.driver=full path to chromedriver binary. diff --git a/functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java b/functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java new file mode 100644 index 0000000000..3b55438285 --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java @@ -0,0 +1,42 @@ +/* + * 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; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.zanata.feature.account.RegisterTestSuite; +import org.zanata.feature.administration.AdministrationTestSuite; +import org.zanata.feature.glossary.GlossaryTestSuite; +import org.zanata.feature.security.SecurityTestSuite; +import org.zanata.feature.startNewProject.CreateSampleProjectTestSuite; +import org.zanata.feature.versionGroup.VersionGroupTestSuite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + RegisterTestSuite.class, + AdministrationTestSuite.class, + GlossaryTestSuite.class, + SecurityTestSuite.class, + CreateSampleProjectTestSuite.class, + VersionGroupTestSuite.class +}) +public class AggregateTestSuite { +} diff --git a/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java b/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java new file mode 100644 index 0000000000..9757b57e11 --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java @@ -0,0 +1,33 @@ +/* + * 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; +/** + * Interface for the execution of the Basic Acceptance Tests (BAT) category. + * + * Tests in this category exercise features only so far as to demonstrate that the feature works, + * and perhaps have a single handled negative case. + * BAT suites should not exceed an agreed interval (e.g. approximately 10 minutes) in order to + * maintain a positive GitHub workflow. + * + * @author Damian Jansen djansen@redhat.com + * @see "http://junit.org/javadoc/4.9/org/junit/experimental/categories/Categories.html" + */ +public interface BasicAcceptanceTest { } diff --git a/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java b/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java new file mode 100644 index 0000000000..e45ec8c5cd --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java @@ -0,0 +1,34 @@ +/* + * 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; + +import org.junit.experimental.categories.Categories; +import org.junit.runner.RunWith; + +/** + * Extend the full test suite, but filter by the Basic Acceptance Test category + * + * @author Damian Jansen djansen@redhat.com + */ +@RunWith(Categories.class) +@Categories.IncludeCategory(BasicAcceptanceTest.class) +public class BasicAcceptanceTestSuite extends AggregateTestSuite { +} diff --git a/functional-test/src/test/java/org/zanata/feature/ConcordionTest.java b/functional-test/src/test/java/org/zanata/feature/ConcordionTest.java new file mode 100644 index 0000000000..a95ce98556 --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/ConcordionTest.java @@ -0,0 +1,33 @@ +/* + * 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; +/** + * Interface for the execution of the Concordion Tests category. + * + * Tests in this category exercise features to a limited point,in order to validate the feature + * in a given use case and generate what is, effectively, a user manual. + * These tests are of a low priority due to the specific system requirements, e.g. actions which + * result in screenshots require a single display environment. + * + * @author Damian Jansen djansen@redhat.com + * @see "http://junit.org/javadoc/4.9/org/junit/experimental/categories/Categories.html" + */ +public interface ConcordionTest { } diff --git a/functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java b/functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java new file mode 100644 index 0000000000..8cb327f27d --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java @@ -0,0 +1,34 @@ +/* + * 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; + +import org.junit.experimental.categories.Categories; +import org.junit.runner.RunWith; + +/** + * Filter by the Concordion Test category + * + * @author Damian Jansen djansen@redhat.com + */ +@RunWith(Categories.class) +@Categories.IncludeCategory(ConcordionTest.class) +public class ConcordionTestSuite extends AggregateTestSuite { +} diff --git a/functional-test/src/test/java/org/zanata/feature/DetailedTest.java b/functional-test/src/test/java/org/zanata/feature/DetailedTest.java new file mode 100644 index 0000000000..563b96be2f --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/DetailedTest.java @@ -0,0 +1,31 @@ +/* + * 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; +/** + * Interface for the execution of the detailed tests category. + * + * Tests that fall under this category exercise features more so than the Basic Acceptance Tests + * (BAT), but are time constrained and are as such not in the "Long" test collection. + * + * @author Damian Jansen djansen@redhat.com + * @see "http://junit.org/javadoc/4.9/org/junit/experimental/categories/Categories.html" + */ +public interface DetailedTest { } diff --git a/functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java b/functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java new file mode 100644 index 0000000000..233e13f4b9 --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java @@ -0,0 +1,14 @@ +package org.zanata.feature; + +import org.junit.experimental.categories.Categories; +import org.junit.runner.RunWith; + +/** + * Extend the full test suite, but filter by the Detailed Test category + * + * @author Damian Jansen djansen@redhat.com + */ +@RunWith(Categories.class) +@Categories.IncludeCategory(DetailedTest.class) +public class DetailedTestSuite extends AggregateTestSuite { +} diff --git a/functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java b/functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java index e79ffe043e..58365f6fce 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java @@ -1,11 +1,33 @@ +/* + * 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.account; import org.hamcrest.Matchers; import org.junit.ClassRule; +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.runner.RunWith; +import org.zanata.feature.DetailedTest; import org.zanata.page.account.RegisterPage; import org.zanata.util.ResetDatabaseRule; import org.zanata.util.rfc2822.InvalidEmailAddressRFC2822; @@ -18,6 +40,7 @@ * @author Damian Jansen djansen@redhat.com */ @RunWith(Theories.class) +@Category(DetailedTest.class) public class InvalidEmailAddressTest { @ClassRule public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); diff --git a/functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java b/functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java similarity index 96% rename from functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java rename to functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java index b59dcc24e3..5caf869597 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java @@ -20,12 +20,14 @@ */ package org.zanata.feature.account; -import lombok.extern.slf4j.Slf4j; import org.hamcrest.Matchers; 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.BasicAcceptanceTest; +import org.zanata.feature.DetailedTest; import org.zanata.page.HomePage; import org.zanata.page.account.RegisterPage; import org.zanata.util.rfc2822.InvalidEmailAddressRFC2822; @@ -40,8 +42,8 @@ /** * @author Damian Jansen djansen@redhat.com */ -@Slf4j -public class RegisterDetailedTest +@Category(DetailedTest.class) +public class RegisterFullTest { @ClassRule public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); @@ -67,6 +69,7 @@ public void before() } @Test + @Category(BasicAcceptanceTest.class) @Ignore("Captcha prevents test completion") public void registerSuccessful() { diff --git a/functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java b/functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java index 8201fa4cd6..3549f756bc 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java +++ b/functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java @@ -20,23 +20,19 @@ */ package org.zanata.feature.account; -import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import org.zanata.util.ResetDatabaseRule; /** * @author Damian Jansen djansen@redhat.com */ @RunWith(Suite.class) @Suite.SuiteClasses({ - RegisterDetailedTest.class, + RegisterFullTest.class, UsernameValidationTest.class, ValidEmailAddressTest.class, InvalidEmailAddressTest.class }) public class RegisterTestSuite { - @ClassRule - public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); } 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 129d3fe45b..b407ecdcc3 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 @@ -22,10 +22,12 @@ import org.hamcrest.Matchers; import org.junit.ClassRule; +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.runner.RunWith; +import org.zanata.feature.DetailedTest; import org.zanata.page.account.RegisterPage; import org.zanata.util.ResetDatabaseRule; import org.zanata.workflow.BasicWorkFlow; @@ -36,6 +38,7 @@ * @author Damian Jansen djansen@redhat.com */ @RunWith(Theories.class) +@Category(DetailedTest.class) public class UsernameValidationTest { @ClassRule diff --git a/functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java b/functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java index 17f8a170d3..6685e4e1f6 100644 --- a/functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java +++ b/functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java @@ -1,11 +1,33 @@ +/* + * 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.account; import org.hamcrest.Matchers; import org.junit.ClassRule; +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.runner.RunWith; +import org.zanata.feature.DetailedTest; import org.zanata.page.account.RegisterPage; import org.zanata.util.ResetDatabaseRule; import org.zanata.util.rfc2822.ValidEmailAddressRFC2822; @@ -18,6 +40,7 @@ * @author Damian Jansen djansen@redhat.com */ @RunWith(Theories.class) +@Category(DetailedTest.class) public class ValidEmailAddressTest { @ClassRule diff --git a/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java b/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java new file mode 100644 index 0000000000..9082a805b1 --- /dev/null +++ b/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java @@ -0,0 +1,38 @@ +/* + * 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.administration; + +import org.concordion.api.extension.Extensions; +import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.zanata.concordion.IndexPageBuilderExtension; +import org.zanata.feature.ConcordionTest; + +/** + * @author Damian Jansen djansen@redhat.com + */ +@RunWith(ConcordionRunner.class) +@Extensions({IndexPageBuilderExtension.class}) +@Category(ConcordionTest.class) +public class AdministrationTest +{ +} diff --git a/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java b/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java index 89e2c69abb..de932b9bdd 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java @@ -1,19 +1,33 @@ +/* + * 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.administration; -import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import org.zanata.util.ResetDatabaseRule; - -import static org.zanata.util.ResetDatabaseRule.Config.*; /** * @author Damian Jansen djansen@redhat.com */ @RunWith(Suite.class) -@Suite.SuiteClasses({ManageUsersTest.class, ManageUsersDetailedTest.class}) +@Suite.SuiteClasses({ManageUsersTest.class, ManageUsersFullTest.class, AdministrationTest.class}) public class AdministrationTestSuite { - @ClassRule - public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); } diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java similarity index 93% rename from functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java rename to functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java index e13fb29465..fdbae05dac 100644 --- a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java +++ b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java @@ -21,6 +21,8 @@ package org.zanata.feature.administration; import org.junit.*; +import org.junit.experimental.categories.Category; +import org.zanata.feature.DetailedTest; import org.zanata.page.HomePage; import org.zanata.page.administration.ManageUserPage; import org.zanata.page.administration.ManageUserAccountPage; @@ -28,11 +30,12 @@ import org.zanata.workflow.LoginWorkFlow; import org.hamcrest.Matchers; import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Damian Jansen djansen@redhat.com */ - -public class ManageUsersDetailedTest +@Category(DetailedTest.class) +public class ManageUsersFullTest { @ClassRule public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(ResetDatabaseRule.Config.Empty); 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 8fa1f9d82a..200255d74c 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 @@ -26,8 +26,10 @@ import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; import org.junit.ClassRule; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; import org.zanata.workflow.LoginWorkFlow; import org.zanata.util.ResetDatabaseRule; @@ -36,6 +38,7 @@ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class ManageUsersTest { @ClassRule 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 4a9f8ae0f0..1c04e57ff8 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 @@ -1,3 +1,23 @@ +/* + * 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.glossary; import java.io.File; @@ -7,8 +27,10 @@ import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.webtrans.EditorPage; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientPushWorkFlow; @@ -22,6 +44,7 @@ */ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class GlossaryDeleteTest { private ClientPushWorkFlow clientPushWorkFlow = new ClientPushWorkFlow(); diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java index c55e1dd265..cab7e9c394 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java @@ -1,3 +1,23 @@ +/* + * 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.glossary; import java.io.File; @@ -7,8 +27,10 @@ import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.workflow.ClientPushWorkFlow; import com.google.common.base.Joiner; @@ -19,6 +41,7 @@ */ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class GlossaryPushCSVTest { private ClientPushWorkFlow clientPushWorkFlow = new ClientPushWorkFlow(); 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 a82924756f..237eeb9b09 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 @@ -1,3 +1,23 @@ +/* + * 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.glossary; import java.io.File; @@ -7,16 +27,16 @@ import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.webtrans.EditorPage; import org.zanata.workflow.BasicWorkFlow; import org.zanata.workflow.ClientPushWorkFlow; import org.zanata.workflow.LoginWorkFlow; import com.google.common.base.Joiner; -import lombok.extern.slf4j.Slf4j; - /** * @see TCMS case * @@ -24,7 +44,7 @@ */ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) -@Slf4j +@Category(ConcordionTest.class) public class GlossaryPushTest { private ClientPushWorkFlow clientPushWorkFlow = new ClientPushWorkFlow(); diff --git a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java index 3614084305..c3399ea1c7 100644 --- a/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java +++ b/functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java @@ -1,15 +1,38 @@ +/* + * 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.glossary; import org.concordion.api.extension.Extensions; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.IndexPageBuilderExtension; +import org.zanata.feature.ConcordionTest; /** * @author Patrick Huang pahuang@redhat.com */ @RunWith(ConcordionRunner.class) @Extensions({IndexPageBuilderExtension.class}) +@Category(ConcordionTest.class) public class GlossaryTest { } 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 c6ffcd30da..99acc7f541 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 @@ -1,3 +1,23 @@ +/* + * 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.glossary; import java.io.File; @@ -7,8 +27,10 @@ import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.workflow.ClientPushWorkFlow; import com.google.common.base.Joiner; @@ -21,7 +43,7 @@ */ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) -@Slf4j +@Category(ConcordionTest.class) public class InvalidGlossaryPushTest { private ClientPushWorkFlow clientPushWorkFlow = new ClientPushWorkFlow(); diff --git a/functional-test/src/test/java/org/zanata/feature/security/LoginTest.java b/functional-test/src/test/java/org/zanata/feature/security/LoginTest.java index b1991a7dd6..a6a01e8a62 100644 --- a/functional-test/src/test/java/org/zanata/feature/security/LoginTest.java +++ b/functional-test/src/test/java/org/zanata/feature/security/LoginTest.java @@ -25,8 +25,10 @@ import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; import org.hamcrest.Matchers; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; import org.zanata.workflow.LoginWorkFlow; @@ -35,6 +37,7 @@ @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class LoginTest { public boolean signInAs(String username, String password) 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 4a3f057722..f789e28080 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 @@ -1,17 +1,38 @@ +/* + * 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.security; import org.concordion.api.extension.Extensions; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.IndexPageBuilderExtension; - -import lombok.extern.slf4j.Slf4j; +import org.zanata.feature.ConcordionTest; /** * @author Patrick Huang pahuang@redhat.com */ @RunWith(ConcordionRunner.class) @Extensions({IndexPageBuilderExtension.class}) +@Category(ConcordionTest.class) public class SecurityTest { } diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java index 2c9b5d326b..1895effcae 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java @@ -1,3 +1,23 @@ +/* + * 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.startNewProject; import java.util.List; @@ -7,8 +27,10 @@ import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; import org.zanata.page.administration.ManageLanguagePage; import org.zanata.page.administration.ManageLanguageTeamMemberPage; @@ -22,6 +44,7 @@ @Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class AddLanguageTest { private HomePage homePage; diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java index 4377bce019..34bf8f08e9 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java @@ -1,28 +1,44 @@ +/* + * 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.startNewProject; -import java.util.List; - import org.concordion.api.extension.Extensions; import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; -import org.zanata.page.HomePage; +import org.zanata.feature.ConcordionTest; import org.zanata.page.projects.ProjectPage; -import org.zanata.page.projects.ProjectsPage; import org.zanata.workflow.LoginWorkFlow; import org.zanata.workflow.ProjectWorkFlow; -import lombok.extern.slf4j.Slf4j; - /** * @author Patrick Huang pahuang@redhat.com */ -@Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class CreateNewProjectTest { diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java index d5e31c75c5..f03cb6dce5 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java @@ -1,3 +1,23 @@ +/* + * 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.startNewProject; import java.util.List; @@ -7,8 +27,10 @@ import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.projects.ProjectPage; import org.zanata.page.projects.ProjectVersionPage; import org.zanata.workflow.LoginWorkFlow; @@ -22,6 +44,7 @@ @Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class CreateVersionAndAddToProjectTest { diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java index 24aa95d5e1..b3061d99ee 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java @@ -1,28 +1,47 @@ +/* + * 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.startNewProject; -import java.util.List; - import org.concordion.api.extension.Extensions; import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; -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; +import java.util.List; /** * @author Patrick Huang pahuang@redhat.com */ -@Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class DocumentListInWebTransTest { diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java index 9e77172d09..196eaa9a7c 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java @@ -1,14 +1,27 @@ +/* + * 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.startNewProject; -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; - +import com.google.common.base.Joiner; +import com.google.common.io.Files; import org.concordion.api.extension.ConcordionExtension; import org.concordion.api.extension.Extension; import org.concordion.api.extension.Extensions; @@ -16,28 +29,25 @@ import org.concordion.ext.ScreenshotExtension; import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.workflow.ClientPushWorkFlow; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import com.google.common.util.concurrent.SimpleTimeLimiter; - -import lombok.extern.slf4j.Slf4j; -import static org.hamcrest.MatcherAssert.assertThat; +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; /** * @author Patrick Huang pahuang@redhat.com */ -@Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class, LoggingTooltipExtension.class}) +@Category(ConcordionTest.class) public class PushPodirPluralProjectTest { private final static Logger tooltipLog = Logger.getLogger(PushPodirPluralProjectTest.class.getName()); @@ -71,8 +81,6 @@ public List push(String command, String configPath) throws Exception return clientPushWorkFlow.callWithTimeout(projectRootPath, command + configPath); } - - public boolean isPushSuccessful(List output) { return clientPushWorkFlow.isPushSuccessful(output); diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java index c773b677ed..72d12b5085 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java @@ -1,9 +1,31 @@ +/* + * 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.startNewProject; import org.concordion.api.extension.Extension; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.IndexPageBuilderExtension; +import org.zanata.feature.ConcordionTest; /** * This is the index page for startNewProject package. @@ -14,6 +36,7 @@ * @author Patrick Huang pahuang@redhat.com */ @RunWith(ConcordionRunner.class) +@Category(ConcordionTest.class) public class StartNewProjectTest { @Extension diff --git a/functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java b/functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java index 4a7282e475..51c636bce5 100644 --- a/functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java +++ b/functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java @@ -1,3 +1,23 @@ +/* + * 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.startNewProject; import java.util.List; @@ -7,22 +27,22 @@ import org.concordion.ext.TimestampFormatterExtension; import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; import org.zanata.page.administration.ManageLanguagePage; import org.zanata.page.administration.ManageLanguageTeamMemberPage; import org.zanata.util.TableRow; import org.zanata.workflow.LoginWorkFlow; -import lombok.extern.slf4j.Slf4j; - /** * @author Patrick Huang pahuang@redhat.com */ -@Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class TranslatorJoinsLanguageTeamTest { private HomePage homePage; diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java index ace7a5cc6d..b3d62aca44 100644 --- a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java +++ b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java @@ -1,3 +1,23 @@ +/* + * 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.versionGroup; import java.util.List; @@ -7,8 +27,10 @@ import org.concordion.integration.junit4.ConcordionRunner; import org.junit.Before; import org.junit.ClassRule; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.CustomResourceExtension; +import org.zanata.feature.ConcordionTest; import org.zanata.page.HomePage; import org.zanata.page.groups.VersionGroupPage; import org.zanata.page.groups.VersionGroupsPage; @@ -18,15 +40,14 @@ import org.zanata.workflow.ProjectWorkFlow; import org.zanata.util.ResetDatabaseRule; -import lombok.extern.slf4j.Slf4j; import static org.hamcrest.MatcherAssert.assertThat; /** * @author Patrick Huang pahuang@redhat.com */ -@Slf4j @RunWith(ConcordionRunner.class) @Extensions({ScreenshotExtension.class, TimestampFormatterExtension.class, CustomResourceExtension.class}) +@Category(ConcordionTest.class) public class VersionGroupBasicTest { @@ -87,7 +108,6 @@ public VersionGroupsPage toggleObsolete(VersionGroupsPage versionGroupsPage) public VersionGroupsPage groups() { VersionGroupsPage versionGroupsPage = projectWorkFlow.goToHome().goToGroups(); - log.info("title is {}", versionGroupsPage.getTitle()); return versionGroupsPage; } diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java similarity index 84% rename from functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java rename to functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java index 9c4680ce5f..445ecc652d 100644 --- a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java +++ b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java @@ -1,3 +1,23 @@ +/* + * 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.versionGroup; import java.util.*; @@ -6,6 +26,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import org.junit.*; +import org.junit.experimental.categories.Category; +import org.zanata.feature.BasicAcceptanceTest; +import org.zanata.feature.DetailedTest; import org.zanata.page.HomePage; import org.zanata.page.groups.VersionGroupPage; import org.zanata.page.groups.VersionGroupsPage; @@ -15,15 +38,15 @@ import lombok.extern.slf4j.Slf4j; - /** * @author Damian Jansen djansen@redhat.com */ @Slf4j -public class VersionGroupDetailedTest +@Category(DetailedTest.class) +public class VersionGroupFullTest { @ClassRule - public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(ResetDatabaseRule.Config.Empty); + public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); private HomePage homePage; @Before @@ -33,6 +56,7 @@ public void before() } @Test + @Category(BasicAcceptanceTest.class) public void createABasicGroup() { String groupID = "basic-group"; @@ -55,7 +79,7 @@ public void inputValidationForID() String errorMsg = "must start and end with letter or number, and contain only letters, numbers, underscores and hyphens."; for (Map.Entry entry : inputValidationForIDData().entrySet()) { - log.info("Test " + entry.getKey() + ":" + entry.getValue()); + VersionGroupFullTest.log.info("Test " + entry.getKey() + ":" + entry.getValue()); VersionGroupsPage versionGroupsPage = homePage.goToGroups(); CreateVersionGroupPage groupPage = versionGroupsPage.createNewGroup(); groupPage.inputGroupId(entry.getValue()).inputGroupName(entry.getValue()); 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 a3c9065971..ea6e3b6839 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 @@ -1,15 +1,38 @@ +/* + * 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.versionGroup; import org.concordion.api.extension.Extensions; import org.concordion.integration.junit4.ConcordionRunner; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.zanata.concordion.IndexPageBuilderExtension; +import org.zanata.feature.ConcordionTest; /** * @author Patrick Huang pahuang@redhat.com */ @RunWith(ConcordionRunner.class) @Extensions({IndexPageBuilderExtension.class}) +@Category(ConcordionTest.class) public class VersionGroupTest { } diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java index 6be8d3a12b..a08b0b2ef6 100644 --- a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java +++ b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java @@ -1,19 +1,17 @@ package org.zanata.feature.versionGroup; -import org.junit.ClassRule; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import org.zanata.util.ResetDatabaseRule; - -import static org.zanata.util.ResetDatabaseRule.Config.*; /** * @author Patrick Huang pahuang@redhat.com */ @RunWith(Suite.class) -@Suite.SuiteClasses({VersionGroupTest.class, VersionGroupBasicTest.class}) +@Suite.SuiteClasses({ + VersionGroupTest.class, + VersionGroupFullTest.class, + VersionGroupBasicTest.class +}) public class VersionGroupTestSuite { - @ClassRule - public static ResetDatabaseRule resetDatabaseRule = new ResetDatabaseRule(); }