You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by du...@apache.org on 2016/07/12 12:07:28 UTC
svn commit: r1752284 - in /sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule: FilterRuleExcludeCategoryIgnoreIfTest.java FilterRuleExcludeCategoryTest.java FilterRuleIncludeCategoryIgnoreIfTest.java

Author: dulvac
Date: Tue Jul 12 12:07:27 2016
New Revision: 1752284

URL: http://svn.apache.org/viewvc?rev=1752284&view=rev
Log:
SLING-5803 FilterRuleExcludeCategoryIgnoreIfTest fails on Jenkins
* Added an assumption that the system property is still there for test

Modified:
    sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryIgnoreIfTest.java
    sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryTest.java
    sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleIncludeCategoryIgnoreIfTest.java

Modified: sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryIgnoreIfTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryIgnoreIfTest.java?rev=1752284&r1=1752283&r2=1752284&view=diff
==============================================================================
--- sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryIgnoreIfTest.java (original)
+++ sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryIgnoreIfTest.java Tue Jul 12 12:07:27 2016
@@ -23,11 +23,13 @@ import org.apache.sling.testing.junit.ru
 import org.apache.sling.testing.junit.rules.category.SlowRunningTest;
 import org.apache.sling.testing.junit.rules.util.IgnoreTestsConfig;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.TestName;
 
+//TODO use a better way to test this
 public class FilterRuleExcludeCategoryIgnoreIfTest {
 
     @Rule
@@ -92,6 +94,7 @@ public class FilterRuleExcludeCategoryIg
     @Test
     @Category(Issue.class)
     public void testExcludedCategoryExists() {
+        Assume.assumeTrue(System.getProperty(FilterRule.CATEGORY_PROPERTY).equals("Issue,SlowRunningTest"));
         Assert.fail("Test should be Ignored");
     }
 

Modified: sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryTest.java?rev=1752284&r1=1752283&r2=1752284&view=diff
==============================================================================
--- sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryTest.java (original)
+++ sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleExcludeCategoryTest.java Tue Jul 12 12:07:27 2016
@@ -22,6 +22,7 @@ import org.apache.sling.testing.junit.ru
 import org.apache.sling.testing.junit.rules.category.FailingTest;
 import org.apache.sling.testing.junit.rules.util.IgnoreTestsConfig;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -79,6 +80,7 @@ public class FilterRuleExcludeCategoryTe
     @Test
     @Category(Issue.class)
     public void testExcludedCategoryExists() {
+        Assume.assumeTrue(System.getProperty(FilterRule.CATEGORY_PROPERTY).equals("Issue"));
         Assert.fail("Test should be Ignored");
     }
 

Modified: sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleIncludeCategoryIgnoreIfTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleIncludeCategoryIgnoreIfTest.java?rev=1752284&r1=1752283&r2=1752284&view=diff
==============================================================================
--- sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleIncludeCategoryIgnoreIfTest.java (original)
+++ sling/trunk/testing/junit/rules/src/test/java/org/apache/sling/testing/junit/rules/util/filterrule/FilterRuleIncludeCategoryIgnoreIfTest.java Tue Jul 12 12:07:27 2016
@@ -70,7 +70,7 @@ public class FilterRuleIncludeCategoryIg
     @Test
     @IgnoreIfProperty(name = "test.filterrule.a", value = "a")
     @Category(FailingTest.class)
-    public void testIgnoreIfPropExixtsandIncludedCategoryNotExists() {
+    public void testIgnoreIfPropExistsandIncludedCategoryNotExists() {
         Assert.fail("Test should be Ignored");
     }