[Bigdata-commit] SF.net SVN: bigdata:[4647] branches/QUADS_QUERY_BRANCH/bigdata/src/test/com /bigdata

[<mar...@us...>]

Revision: 4647
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4647&view=rev
Author:   martyncutcher
Date:     2011-06-09 09:08:21 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
Move test inclusion statics to relevant packages

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java	2011-06-08 21:42:15 UTC (rev 4646)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/TestAll.java	2011-06-09 09:08:21 UTC (rev 4647)
@@ -45,8 +45,6 @@
 	/**
 	 * Static flags to HA and/or Quorum to be excluded, preventing hangs in CI
 	 */
-	static boolean s_includeHA = false;
-	static boolean s_includeQuorum = false;
 
     /**
      * 
@@ -103,12 +101,8 @@
         suite.addTest( com.bigdata.rawstore.TestAll.suite() );
         suite.addTest( com.bigdata.btree.TestAll.suite() );
         suite.addTest( com.bigdata.concurrent.TestAll.suite() );
-        if (s_includeQuorum) {
-        	suite.addTest( com.bigdata.quorum.TestAll.suite() );
-        }
-        if (s_includeHA) {
-        	suite.addTest( com.bigdata.ha.TestAll.suite() );
-        }
+        suite.addTest( com.bigdata.quorum.TestAll.suite() );
+        suite.addTest( com.bigdata.ha.TestAll.suite() );
         // Note: this has a dependency on the quorum package.
         suite.addTest(com.bigdata.io.writecache.TestAll.suite());
         suite.addTest( com.bigdata.journal.TestAll.suite() );

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java	2011-06-08 21:42:15 UTC (rev 4646)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/ha/TestAll.java	2011-06-09 09:08:21 UTC (rev 4647)
@@ -39,6 +39,7 @@
  */
 public class TestAll extends TestCase {
 
+	public static boolean s_includeHA = false;
     /**
      * 
      */
@@ -61,7 +62,8 @@
 
         final TestSuite suite = new TestSuite("high availability");
 
-        suite.addTest(com.bigdata.ha.pipeline.TestAll.suite());
+        if (s_includeHA)
+        	suite.addTest(com.bigdata.ha.pipeline.TestAll.suite());
 
         return suite;
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java	2011-06-08 21:42:15 UTC (rev 4646)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/quorum/TestAll.java	2011-06-09 09:08:21 UTC (rev 4647)
@@ -39,7 +39,8 @@
  */
 public class TestAll extends TestCase {
 
-    /**
+	public static boolean s_includeQuorum = false;
+   /**
      * 
      */
     public TestAll() {
@@ -61,30 +62,32 @@
 
         final TestSuite suite = new TestSuite("quorum");
 
-        /*
-         * Test the fixture used to test the quorums (the fixture builds on the
-         * same base class).
-         */
-        suite.addTestSuite(TestMockQuorumFixture.class);
-
-        /*
-         * Test the quorum semantics for a singleton quorum. This unit test
-         * allows us to verify that each quorum state change is translated into
-         * the appropriate methods against the public API of the quorum client
-         * or quorum member.
-         */
-        suite.addTestSuite(TestSingletonQuorumSemantics.class);
-
-        /*
-         * Test the quorum semantics for a highly available quorum of 3
-         * nodes. The main points to test here are the particulars of events not
-         * observable with a singleton quorum, including a service join which
-         * does not trigger a quorum meet, a service leave which does not
-         * trigger a quorum break, a leader leave, etc.
-         */
-        suite.addTestSuite(TestHA3QuorumSemantics.class);
-
-        suite.addTest(StressTestHA3.suite());
+        if (s_includeQuorum) {
+	        /*
+	         * Test the fixture used to test the quorums (the fixture builds on the
+	         * same base class).
+	         */
+	        suite.addTestSuite(TestMockQuorumFixture.class);
+	
+	        /*
+	         * Test the quorum semantics for a singleton quorum. This unit test
+	         * allows us to verify that each quorum state change is translated into
+	         * the appropriate methods against the public API of the quorum client
+	         * or quorum member.
+	         */
+	        suite.addTestSuite(TestSingletonQuorumSemantics.class);
+	
+	        /*
+	         * Test the quorum semantics for a highly available quorum of 3
+	         * nodes. The main points to test here are the particulars of events not
+	         * observable with a singleton quorum, including a service join which
+	         * does not trigger a quorum meet, a service leave which does not
+	         * trigger a quorum break, a leader leave, etc.
+	         */
+	        suite.addTestSuite(TestHA3QuorumSemantics.class);
+	
+	        suite.addTest(StressTestHA3.suite());
+        }
         
         return suite;
         


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