[Bigdata-commit] SF.net SVN: bigdata:[3779] branches/maven_scaleout/bigdata-core/src/test/ java/com/bigdata/rdf

[<ble...@us...>]

Revision: 3779
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3779&view=rev
Author:   blevine218
Date:     2010-10-12 21:13:14 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
Added @IgnoreIf to certain long-running testcases to conditionally filter them out

Modified Paths:
--------------
    branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
    branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
    branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java

Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java	2010-10-12 20:33:16 UTC (rev 3778)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java	2010-10-12 21:13:14 UTC (rev 3779)
@@ -39,6 +39,10 @@
 import com.bigdata.rdf.store.AbstractTestCase;
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.store.ProxyTestCase;
+import com.bigdata.test.conditional.ConditionalParameterized;
+import com.bigdata.test.conditional.IgnoreIf;
+import com.bigdata.test.conditional.LongTestsExcluded;
+
 import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,7 +55,7 @@
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
  */
-@RunWith(Parameterized.class)
+@RunWith(ConditionalParameterized.class)
 public class TestLoadAndVerify extends AbstractRIOTestCase {
 
     /**
@@ -167,6 +171,7 @@
      * LUBM U(1)
      */
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_loadAndVerify_U1() throws Exception {
         
         final String file = DataFinder.bestPath("testing/data/lehigh/U1");

Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java	2010-10-12 20:33:16 UTC (rev 3778)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java	2010-10-12 21:13:14 UTC (rev 3779)
@@ -40,6 +40,10 @@
 import com.bigdata.relation.rule.eval.ActionEnum;
 import com.bigdata.relation.rule.eval.IJoinNexus;
 import com.bigdata.relation.rule.eval.IJoinNexusFactory;
+import com.bigdata.test.conditional.ConditionalParameterized;
+import com.bigdata.test.conditional.IgnoreIf;
+import com.bigdata.test.conditional.LongTestsExcluded;
+
 import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,7 +56,7 @@
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
  */
-@RunWith(Parameterized.class)
+@RunWith(ConditionalParameterized.class)
 public class TestDatabaseAtOnceClosure extends AbstractRuleTestCase {
 
     /**
@@ -382,6 +386,7 @@
      */
 
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_fixedPoint_LUBM_U1_As_Full_NestedSubquery()
             throws Exception {
 
@@ -410,6 +415,7 @@
     }
 
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_fixedPoint_LUBM_U1_As_Full_PipelineJoins()
             throws Exception {
 
@@ -438,6 +444,7 @@
     }
 
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_fixedPoint_LUBM_U1_As_Fast_NestedSubquery() throws Exception {
 
         final String[] resources = readFiles(new File( DataFinder.bestPath("testing/data/lehigh/U1" ) ),
@@ -464,6 +471,7 @@
     }
 
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_fixedPoint_LUBM_U1_As_Fast_PipelineJoins() throws Exception {
 
         final String[] resources = readFiles(new File( DataFinder.bestPath("testing/data/lehigh/U1" ) ),

Modified: branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java	2010-10-12 20:33:16 UTC (rev 3778)
+++ branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java	2010-10-12 21:13:14 UTC (rev 3779)
@@ -67,6 +67,10 @@
 import com.bigdata.striterator.ChunkedArrayIterator;
 import com.bigdata.striterator.IChunkedIterator;
 import com.bigdata.striterator.IChunkedOrderedIterator;
+import com.bigdata.test.conditional.ConditionalParameterized;
+import com.bigdata.test.conditional.IgnoreIf;
+import com.bigdata.test.conditional.LongTestsExcluded;
+
 import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,9 +87,10 @@
  * 
  * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
  */
-@RunWith(Parameterized.class)
+@RunWith(ConditionalParameterized.class)
 public class TestTruthMaintenance extends AbstractInferenceEngineTestCase {
 
+
     /**
      * 
      */
@@ -928,6 +933,7 @@
      * @todo use data files that we can bundle with the distribution.
      */
     @Test
+    @IgnoreIf(LongTestsExcluded.class)
     public void test_stress() {
 
 //        fail("enable test");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.