Merge pull request zanata#973 from zanata/rulechain-SecurityTest

test: stabilize functional test by using RuleChain
carlosmunoz · Sep 18, 2015 · 4ba64f0 · 4ba64f0
2 parents 9b91130 + 6d06105
commit 4ba64f0
Showing 1 changed file with 3 additions and 5 deletions.
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
@@ -24,6 +24,7 @@
 import org.junit.Rule;
 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;
@@ -46,15 +47,12 @@
  */
 @Category(DetailedTest.class)
 public class SecurityTest extends ZanataTestCase {
-
     @Rule
     public HasEmailRule hasEmailRule = new HasEmailRule();
 
     @Rule
-    public EnsureLogoutRule ensureLogoutRule = new EnsureLogoutRule();
-
-    @Rule
-    public AddUsersRule addUsersRule = new AddUsersRule();
+    public RuleChain chain = RuleChain.outerRule(new AddUsersRule())
+            .around(new EnsureLogoutRule());
 
     @Feature(summary = "The user can log in",
             tcmsTestPlanIds = 5316, tcmsTestCaseIds = 86815)