From 46ba666d6172b4c6d01e7b6177d57a910c585931 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Thu, 27 Nov 2014 11:06:42 +1000 Subject: [PATCH 1/2] Use SampleProjectRule as @Rule, not @ClassRule --- .../zanata/feature/document/SubtitleDocumentTypeTest.java | 5 ++--- .../org/zanata/feature/language/JoinLanguageTeamTest.java | 6 +++--- .../feature/projectversion/CreateProjectVersionTest.java | 6 +++--- .../zanata/feature/projectversion/VersionFilteringTest.java | 6 +++--- .../src/test/java/org/zanata/util/SampleProjectRule.java | 2 ++ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java b/functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java index 4de16bf1e9..6e9534ed51 100644 --- a/functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java +++ b/functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java @@ -21,7 +21,6 @@ package org.zanata.feature.document; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -48,8 +47,8 @@ @Category(DetailedTest.class) public class SubtitleDocumentTypeTest extends ZanataTestCase { - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); + @Rule + public SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Rule public CleanDocumentStorageRule documentStorageRule = 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 dc9b8d98a9..b049bb559f 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,7 +20,7 @@ */ package org.zanata.feature.language; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; @@ -39,8 +39,8 @@ @Category(DetailedTest.class) public class JoinLanguageTeamTest extends ZanataTestCase { - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); + @Rule + public SampleProjectRule sampleProjectRule = new SampleProjectRule(); @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/projectversion/CreateProjectVersionTest.java b/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java index 56b6c38457..14abfd48fe 100644 --- a/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java +++ b/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java @@ -21,7 +21,7 @@ package org.zanata.feature.projectversion; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; @@ -44,8 +44,8 @@ @Category(DetailedTest.class) public class CreateProjectVersionTest extends ZanataTestCase { - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); + @Rule + public SampleProjectRule sampleProjectRule = new SampleProjectRule(); @Feature(summary = "The administrator can create a project version", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 136517) diff --git a/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java b/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java index aae2245b4c..196c691bf6 100644 --- a/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java +++ b/functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java @@ -21,7 +21,7 @@ package org.zanata.feature.projectversion; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.zanata.feature.Feature; @@ -44,8 +44,8 @@ @Category(DetailedTest.class) public class VersionFilteringTest extends ZanataTestCase { - @ClassRule - public static SampleProjectRule sampleProjectRule = new SampleProjectRule(); + @Rule + public SampleProjectRule sampleProjectRule = new SampleProjectRule(); private ZanataRestCaller zanataRestCaller; diff --git a/functional-test/src/test/java/org/zanata/util/SampleProjectRule.java b/functional-test/src/test/java/org/zanata/util/SampleProjectRule.java index 665432c5d3..8e11b1c45d 100644 --- a/functional-test/src/test/java/org/zanata/util/SampleProjectRule.java +++ b/functional-test/src/test/java/org/zanata/util/SampleProjectRule.java @@ -27,6 +27,8 @@ import static org.zanata.util.SampleDataResourceClient.*; /** + * To ensure test isolation, this rule should be used as + * @org.junit.Rule, never as @org.junit.ClassRule. * @author Patrick Huang pahuang@redhat.com */ From 6a8340d7f239e4686163e5ee217c21ec2d8bd5ae Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Thu, 27 Nov 2014 16:19:37 +1000 Subject: [PATCH 2/2] Invert test broken by rhbz1168447 --- .../feature/projectversion/CreateProjectVersionTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java b/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java index 14abfd48fe..648dbdbb71 100644 --- a/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java +++ b/functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java @@ -130,7 +130,9 @@ public void idStartsAndEndsWithAlphanumeric() throws Exception { @Feature(summary = "The system updates the project version counter " + "when a project version is created", tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0) - @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION) + @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION, + // remove when rhbz1168447 is fixed: + expected = org.openqa.selenium.TimeoutException.class) public void versionCounterIsUpdated() throws Exception { String projectName = "version nums";