define testng group and suite

zanata · Jul 4, 2012 · d00bf4f · d00bf4f
1 parent 489e2c8
commit d00bf4f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 11 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -263,12 +263,9 @@
                             <redirectTestOutputToFile>false</redirectTestOutputToFile>
                             <printSummary>true</printSummary>
                             <forkMode>always</forkMode>
-                            <includes>
-                                <include>**/*Test.java</include>
-                            </includes>
-                            <excludes>
-
-                            </excludes>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${basedir}/src/test/resources/functional-test.tng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/functional-test/src/test/java/org/zanata/ExperimentTest.java b/functional-test/src/test/java/org/zanata/ExperimentTest.java
@@ -37,7 +37,7 @@ public void canFindText() {
       assertThat(matches, Matchers.equalTo(true));
    }
 
-   @Test
+   @Test(enabled = false)
    public void canDoCampbell() {
       //#. Tag: para
       //#, no-c-format

diff --git a/functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java b/functional-test/src/test/java/org/zanata/feature/CreateSampleProjectTest.java
@@ -41,6 +41,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+@Test(groups = "functional")
 @Slf4j
 public class CreateSampleProjectTest
 {

diff --git a/functional-test/src/test/java/org/zanata/feature/LoginTest.java b/functional-test/src/test/java/org/zanata/feature/LoginTest.java
@@ -27,6 +27,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
+@Test(groups = "functional")
 public class LoginTest
 {
    @Test

diff --git a/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java b/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
@@ -35,12 +35,11 @@
 /**
  * @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
-@Test(enabled = false,
-      timeOut = Constants.FIFTY_SEC,
-      description = "This test is to set up Translation Memory test data on the server. Disabled on Jenkins.")
+@Test(groups = "manual-run")
 public class TransMemoryTest
 {
 
+   @Test(timeOut = Constants.FIFTY_SEC)
    public void pushTransMemoryProject() {
       new LoginWorkFlow().signIn("admin", "admin");
       LanguageWorkFlow languageWorkFlow = new LanguageWorkFlow();
@@ -54,8 +53,15 @@ public void pushTransMemoryProject() {
       int exitCode = new ClientPushWorkFlow().mvnPush("trans-memory", "-Dzanata.merge=import", "-Dzanata.projectVersion=master", "-Dzanata.pushType=Both");
 
       assertThat(exitCode, Matchers.equalTo(0));
+      System.out.println("++++++++++++++++++++++++++++");
+      System.out.println("++++++++++++++++++++++++++++");
+      System.out.println("++++++++++++++++++++++++++++");
+      System.out.println("++++++++++++++++++++++++++++");
+      System.out.println("++++++++++++++++++++++++++++");
+      System.out.println("++++++++++++++++++++++++++++");
    }
 
+   @Test(timeOut = Constants.FIFTY_SEC)
    public void pushTransMemoryProjectWithDifferentProjectName() {
       new LoginWorkFlow().signIn("admin", "admin");
       LanguageWorkFlow languageWorkFlow = new LanguageWorkFlow();

diff --git a/functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java b/functional-test/src/test/java/org/zanata/feature/VersionGroupTest.java
@@ -17,7 +17,7 @@
 /**
  * @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
-@Test
+@Test(groups = "functional")
 @Slf4j
 public class VersionGroupTest
 {

diff --git a/functional-test/src/test/resources/functional-test.tng.xml b/functional-test/src/test/resources/functional-test.tng.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="Selenium WebDriver functional test" verbose="1">
+
+    <test name="functional test">
+        <groups>
+            <run>
+                <include name=".*"/>
+                <exclude name="manual-run"/>
+            </run>
+        </groups>
+        <packages>
+            <package name="org.zanata.feature.*"/>
+        </packages>
+    </test>
+
+</suite>