From ca6f9c5be6c8eb595481a4bcdee8f550e16a04ba Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 4 Jan 2016 10:48:51 +0000 Subject: [PATCH] Replaced TMP with TieredMergePolicy in 2 tests' assert messages. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1722836 13f79535-47bb-0310-9956-ffa450edef68 --- solr/core/src/test/org/apache/solr/core/TestConfig.java | 2 +- .../src/test/org/apache/solr/update/SolrIndexConfigTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java index 63af0c047f7..96ade4554e5 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java @@ -136,7 +136,7 @@ public class TestConfig extends SolrTestCaseJ4 { IndexWriterConfig iwc = sic.toIndexWriterConfig(h.getCore()); assertNotNull("null mp", iwc.getMergePolicy()); - assertTrue("mp is not TMP", iwc.getMergePolicy() instanceof TieredMergePolicy); + assertTrue("mp is not TieredMergePolicy", iwc.getMergePolicy() instanceof TieredMergePolicy); assertNotNull("null ms", iwc.getMergeScheduler()); assertTrue("ms is not CMS", iwc.getMergeScheduler() instanceof ConcurrentMergeScheduler); diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java index 6c5dc52de04..d2a3be58ea2 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java @@ -74,7 +74,7 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 { IndexWriterConfig iwc = solrIndexConfig.toIndexWriterConfig(h.getCore()); assertNotNull("null mp", iwc.getMergePolicy()); - assertTrue("mp is not TMP", iwc.getMergePolicy() instanceof TieredMergePolicy); + assertTrue("mp is not TieredMergePolicy", iwc.getMergePolicy() instanceof TieredMergePolicy); TieredMergePolicy mp = (TieredMergePolicy) iwc.getMergePolicy(); assertEquals("mp.maxMergeAtOnceExplicit", 19, mp.getMaxMergeAtOnceExplicit()); assertEquals("mp.segmentsPerTier",9,(int)mp.getSegmentsPerTier());