svn commit: r1150404 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java

[rm...@apache.org]

Author: rmuir
Date: Sun Jul 24 15:19:49 2011
New Revision: 1150404

URL: http://svn.apache.org/viewvc?rev=1150404&view=rev
Log:
SOLR-2673: fix test dependent on order

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1150404&r1=1150403&r2=1150404&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Sun Jul 24 15:19:49 2011
@@ -180,8 +180,18 @@ public class TestReplicationHandler exte
     return details;
   }
 
-  @Test
-  public void testDetails() throws Exception {
+  public void test() throws Exception {
+    doTestDetails();
+    doTestReplicateAfterWrite2Slave();
+    doTestIndexAndConfigReplication();
+    doTestStopPoll();
+    doTestSnapPullWithMasterUrl();
+    doTestReplicateAfterStartup();
+    doTestIndexAndConfigAliasReplication();
+    doTestBackup();
+  }
+
+  private void doTestDetails() throws Exception {
     { 
       NamedList<Object> details = getDetails(masterClient);
       
@@ -234,8 +244,7 @@ public class TestReplicationHandler exte
     }
   }
 
-  @Test
-  public void testReplicateAfterWrite2Slave() throws Exception {
+  private void doTestReplicateAfterWrite2Slave() throws Exception {
     clearIndexWithReplication();
     nDocs--;
     for (int i = 0; i < nDocs; i++) {
@@ -299,8 +308,7 @@ public class TestReplicationHandler exte
     assertEquals(nDocs, slaveQueryResult.getNumFound());
   }
 
-  @Test
-  public void testIndexAndConfigReplication() throws Exception {
+  private void doTestIndexAndConfigReplication() throws Exception {
     clearIndexWithReplication();
 
     nDocs--;
@@ -355,8 +363,7 @@ public class TestReplicationHandler exte
 
   }
 
-  @Test
-  public void testStopPoll() throws Exception {
+  private void doTestStopPoll() throws Exception {
     clearIndexWithReplication();
 
     // Test:
@@ -423,8 +430,7 @@ public class TestReplicationHandler exte
   }
 
   
-  @Test
-  public void testSnapPullWithMasterUrl() throws Exception {
+  private void doTestSnapPullWithMasterUrl() throws Exception {
     //change solrconfig on slave
     //this has no entry for pollinginterval
     slave.copyConfigFile(CONF_DIR + "solrconfig-slave1.xml", "solrconfig.xml");
@@ -471,8 +477,7 @@ public class TestReplicationHandler exte
   }
 
 
-  @Test
-  public void testReplicateAfterStartup() throws Exception {
+  private void doTestReplicateAfterStartup() throws Exception {
     //stop slave
     slaveJetty.stop();
 
@@ -529,8 +534,7 @@ public class TestReplicationHandler exte
   }
 
 
-  @Test
-  public void testIndexAndConfigAliasReplication() throws Exception {
+  private void doTestIndexAndConfigAliasReplication() throws Exception {
     clearIndexWithReplication();
 
     nDocs--;
@@ -604,8 +608,7 @@ public class TestReplicationHandler exte
 
 
   
-  @Test
-  public void testBackup() throws Exception {
+  private void doTestBackup() throws Exception {
     masterJetty.stop();
     master.copyConfigFile(CONF_DIR + "solrconfig-master1.xml", 
                           "solrconfig.xml");