annotate NoScreenshot for stable tests

zanata · Jan 14, 2014 · 926388e · 926388e
1 parent 15294ed
commit 926388e
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 6 deletions.
diff --git a/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java b/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
@@ -22,14 +22,15 @@
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.zanata.util.NoScreenshot;
 
 /**
  * @author Damian Jansen <a
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ ChangePasswordTest.class, RegisterTest.class,
-        UsernameValidationTest.class/*, ValidEmailAddressTest.class,
-        InvalidEmailAddressTest.class */})
+        UsernameValidationTest.class, ValidEmailAddressTest.class,
+        InvalidEmailAddressTest.class })
 public class AccountTestSuite {
 }
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
@@ -32,6 +32,7 @@
 import org.zanata.page.utility.DashboardPage;
 import org.zanata.page.utility.HomePage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.BasicWorkFlow;
 import org.zanata.workflow.LoginWorkFlow;
 
@@ -42,6 +43,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class ChangePasswordTest {
 
     @Rule

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
@@ -30,6 +30,7 @@
 import org.junit.runner.RunWith;
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.account.RegisterPage;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.rfc2822.InvalidEmailAddressRFC2822;
 import org.zanata.workflow.BasicWorkFlow;
 
@@ -42,6 +43,7 @@
  */
 @RunWith(Theories.class)
 @Category(DetailedTest.class)
+@NoScreenshot
 public class InvalidEmailAddressTest {
 
     @DataPoint

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
@@ -28,6 +28,7 @@
 import org.zanata.page.account.EditProfilePage;
 import org.zanata.page.account.MyAccountPage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.LoginWorkFlow;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -37,12 +38,13 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class ProfileTest {
 
     @Rule
     public AddUsersRule addUsersRule = new AddUsersRule();
 
-    private String adminsApiKey = "b6d7044e9ee3b2447c28fb7c50d86d98";
+    private static final String adminsApiKey = "b6d7044e9ee3b2447c28fb7c50d86d98";
 
     @Test
     public void verifyProfileData() {

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
@@ -37,6 +37,7 @@
 import org.zanata.page.account.RegisterPage;
 import org.zanata.page.utility.HomePage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.rfc2822.InvalidEmailAddressRFC2822;
 import org.zanata.workflow.BasicWorkFlow;
 
@@ -45,6 +46,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class RegisterTest {
     @ClassRule
     public static AddUsersRule addUsersRule = new AddUsersRule();

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
@@ -29,6 +29,7 @@
 import org.junit.runner.RunWith;
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.account.RegisterPage;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.BasicWorkFlow;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -39,6 +40,7 @@
  */
 @RunWith(Theories.class)
 @Category(DetailedTest.class)
+@NoScreenshot
 public class UsernameValidationTest {
     @DataPoint
     public static String INVALID_PIPE = "user|name";

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
@@ -29,6 +29,7 @@
 import org.junit.runner.RunWith;
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.account.RegisterPage;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.rfc2822.ValidEmailAddressRFC2822;
 import org.zanata.workflow.BasicWorkFlow;
 
@@ -41,6 +42,7 @@
  */
 @RunWith(Theories.class)
 @Category(DetailedTest.class)
+@NoScreenshot
 public class ValidEmailAddressTest {
 
     @DataPoint

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
@@ -31,6 +31,7 @@
 import org.zanata.page.utility.DashboardPage;
 import org.zanata.page.utility.HomePage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.LoginWorkFlow;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -40,6 +41,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class EditHomePageTest {
     @Rule
     public AddUsersRule addUsersRule = new AddUsersRule();

diff --git a/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java b/functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
@@ -30,6 +30,7 @@
 import org.zanata.page.administration.ManageUserPage;
 import org.zanata.page.utility.DashboardPage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.LoginWorkFlow;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -39,6 +40,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class ManageUsersFullTest {
     @Rule
     public AddUsersRule addUsersRule = new AddUsersRule();

diff --git a/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java b/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
@@ -30,6 +30,7 @@
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.projects.ProjectSourceDocumentsPage;
 import org.zanata.util.CleanDocumentStorageRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.SampleProjectRule;
 import org.zanata.util.TestFileGenerator;
 import org.zanata.workflow.BasicWorkFlow;
@@ -46,6 +47,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class UploadTest {
 
     @Rule

diff --git a/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java b/functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
@@ -30,6 +30,7 @@
 import org.zanata.page.projects.ProjectPage;
 import org.zanata.page.projects.ProjectsPage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.BasicWorkFlow;
 import org.zanata.workflow.LoginWorkFlow;
 import org.zanata.workflow.ProjectWorkFlow;
@@ -44,6 +45,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class CreateProjectTest {
 
     @ClassRule

diff --git a/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java b/functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
@@ -28,6 +28,7 @@
 import org.junit.experimental.categories.Category;
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.projects.ProjectMaintainersPage;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.SampleProjectRule;
 import org.zanata.workflow.LoginWorkFlow;
 
@@ -39,6 +40,7 @@
  *      href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class EditMaintainersTest {
 
     @Rule

diff --git a/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java b/functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
@@ -35,6 +35,7 @@
 import org.zanata.page.account.SignInPage;
 import org.zanata.page.utility.DashboardPage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.BasicWorkFlow;
 import org.zanata.workflow.LoginWorkFlow;
 
@@ -43,6 +44,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class SecurityFullTest {
     @Rule
     public AddUsersRule addUsersRule = new AddUsersRule();

diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
@@ -33,6 +33,7 @@
 import org.zanata.page.groups.VersionGroupPage;
 import org.zanata.page.groups.VersionGroupsPage;
 import org.zanata.page.utility.DashboardPage;
+import org.zanata.util.NoScreenshot;
 import org.zanata.util.SampleProjectRule;
 import org.zanata.workflow.LoginWorkFlow;
 
@@ -43,6 +44,7 @@
  *         href="mailto:djansen@redhat.com">djansen@redhat.com</a>
  */
 @Category(DetailedTest.class)
+@NoScreenshot
 public class VersionGroupFullTest {
     @Rule
     public SampleProjectRule sampleProjectRule = new SampleProjectRule();

diff --git a/...onal-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java b/...onal-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
@@ -33,6 +33,7 @@
 import org.zanata.feature.DetailedTest;
 import org.zanata.page.groups.CreateVersionGroupPage;
 import org.zanata.util.AddUsersRule;
+import org.zanata.util.NoScreenshot;
 import org.zanata.workflow.LoginWorkFlow;
 
 /**
@@ -41,6 +42,7 @@
  */
 @RunWith(Theories.class)
 @Category(DetailedTest.class)
+@NoScreenshot
 public class VersionGroupIDValidationTest {
 
     @Rule

diff --git a/functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java b/functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java
@@ -22,7 +22,10 @@ public class ScreenshotEnabledTestRunListener extends RunListener {
     @Override
     public void testStarted(Description description) throws Exception {
         super.testStarted(description);
-        enableScreenshotForTest(description.getDisplayName());
+        if (description.getTestClass().getAnnotation(NoScreenshot.class) == null
+                && description.getAnnotation(NoScreenshot.class) == null) {
+            enableScreenshotForTest(description.getDisplayName());
+        }
     }
 
     @Override
@@ -44,15 +47,15 @@ private static void enableScreenshotForTest(String testDisplayName)
             throws Exception {
         WebDriverFactory.INSTANCE.updateListenerTestName(testDisplayName);
         String date = new Date().toString();
-        ScreenshotEnabledTestRunListener.log.debug("[TEST] {}:{}", testDisplayName, date);
+        log.debug("[TEST] {}:{}", testDisplayName, date);
     }
 
     private static void deleteScreenshots(String testDisplayName) {
         File testDir = ScreenshotDirForTest.screenshotForTest(testDisplayName);
         try {
             FileUtils.deleteDirectory(testDir);
         } catch (IOException e) {
-            ScreenshotEnabledTestRunListener.log.warn("error deleting screenshot base directory: {}",
+            log.warn("error deleting screenshot base directory: {}",
                     e.getMessage());
         }
     }