From 3adabbd43aa83d27e317d81f98a690e3b43a49b1 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Sat, 23 Feb 2013 00:32:12 +0000 Subject: [PATCH] SOLR-4471: Fix up test. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1449258 13f79535-47bb-0310-9956-ffa450edef68 --- .../solr/handler/TestReplicationHandler.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index 5b33d15f559..794c5187b45 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -447,7 +447,12 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { assertTrue(slaveXsltDir.isDirectory()); assertTrue(slaveXsl.exists()); - + + // revert the schema + master.copyConfigFile(CONF_DIR + "schema-replication1.xml", "schema.xml"); + masterJetty.stop(); + masterJetty = createJetty(master); + masterClient = createNewSolrServer(masterJetty.getLocalPort()); } @Test @@ -674,8 +679,8 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { } } - - private void doTestReplicateAfterStartup() throws Exception { + @Test + public void doTestReplicateAfterStartup() throws Exception { //stop slave slaveJetty.stop(); @@ -737,7 +742,8 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { slaveClient = createNewSolrServer(slaveJetty.getLocalPort()); } - private void doTestReplicateAfterStartupWithNoActivity() throws Exception { + @Test + public void doTestReplicateAfterStartupWithNoActivity() throws Exception { useFactory(null); try { @@ -961,6 +967,18 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { slaveQueryRsp = rQuery(1, "*:*", slaveClient); SolrDocument d = ((SolrDocumentList) slaveQueryRsp.get("response")).get(0); assertEquals("newname = 2001", (String) d.getFieldValue("newname")); + + // revert configs + //change solrconfig on master + master.copyConfigFile(CONF_DIR + "solrconfig-master1.xml", + "solrconfig.xml"); + //change schema on master + master.copyConfigFile(CONF_DIR + "schema-replication1.xml", + "schema.xml"); + masterJetty.stop(); + + masterJetty = createJetty(master); + masterClient = createNewSolrServer(masterJetty.getLocalPort()); }