Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2673: fix test dependent on order 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150404 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-07-24 15:19:49 +00:00
parent 347ba7a172
commit 870a4ce9f9
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
View File

@ -180,8 +180,18 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
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 extends SolrTestCaseJ4 {
}
}
@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 extends SolrTestCaseJ4 {
assertEquals(nDocs, slaveQueryResult.getNumFound());
}
@Test
public void testIndexAndConfigReplication() throws Exception {
private void doTestIndexAndConfigReplication() throws Exception {
clearIndexWithReplication();
nDocs--;
@ -355,8 +363,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
}
@Test
public void testStopPoll() throws Exception {
private void doTestStopPoll() throws Exception {
clearIndexWithReplication();
// Test:
@ -423,8 +430,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
}
@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 extends SolrTestCaseJ4 {
}
@Test
public void testReplicateAfterStartup() throws Exception {
private void doTestReplicateAfterStartup() throws Exception {
//stop slave
slaveJetty.stop();
@ -529,8 +534,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
}
@Test
public void testIndexAndConfigAliasReplication() throws Exception {
private void doTestIndexAndConfigAliasReplication() throws Exception {
clearIndexWithReplication();
nDocs--;
@ -604,8 +608,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
@Test
public void testBackup() throws Exception {
private void doTestBackup() throws Exception {
masterJetty.stop();
master.copyConfigFile(CONF_DIR + "solrconfig-master1.xml",
"solrconfig.xml");