You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/08/23 01:17:55 UTC
svn commit: r1516661 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search:
TestFastLRUCache.java TestLFUCache.java TestLRUCache.java
Author: rmuir
Date: Thu Aug 22 23:17:55 2013
New Revision: 1516661
URL: http://svn.apache.org/r1516661
Log:
remove code duplication in tests
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=1516661&r1=1516660&r2=1516661&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java Thu Aug 22 23:17:55 2013
@@ -43,7 +43,7 @@ public class TestFastLRUCache extends Lu
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "100%");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = fastCache.init(params, null, cr);
fastCache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
@@ -89,7 +89,7 @@ public class TestFastLRUCache extends Lu
params.put("size", String.valueOf(limit));
params.put("initialSize", "10");
params.put("autowarmCount", percentage + "%");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = fastCache.init(params, null, cr);
fastCache.setState(SolrCache.State.LIVE);
for (int i = 1; i <= limit; i++) {
@@ -120,7 +120,7 @@ public class TestFastLRUCache extends Lu
Map<String, String> params = new HashMap<String, String>();
params.put("size", "100");
params.put("initialSize", "10");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = fastCache.init(params, null, cr);
fastCache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
@@ -150,7 +150,7 @@ public class TestFastLRUCache extends Lu
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "-1");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = cache.init(params, null, cr);
cache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
@@ -173,20 +173,6 @@ public class TestFastLRUCache extends Lu
assertEquals("103", cacheNew.get(103));
cacheNew.close();
}
-
- private CacheRegenerator createCodeRegenerator() {
- CacheRegenerator cr = new CacheRegenerator() {
- @Override
- public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache,
- SolrCache oldCache, Object oldKey, Object oldVal) {
- newCache.put(oldKey, oldVal);
- return true;
- }
- };
- return cr;
- }
-
-
public void testSimple() throws IOException {
FastLRUCache sc = new FastLRUCache();
@@ -194,7 +180,7 @@ public class TestFastLRUCache extends Lu
l.put("size", "100");
l.put("initialSize", "10");
l.put("autowarmCount", "25");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = sc.init(l, null, cr);
sc.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java?rev=1516661&r1=1516660&r2=1516661&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLFUCache.java Thu Aug 22 23:17:55 2013
@@ -38,15 +38,6 @@ import java.util.Map;
*/
public class TestLFUCache extends SolrTestCaseJ4 {
- private class LFURegenerator implements CacheRegenerator {
- @Override
- public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache,
- SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
- newCache.put(oldKey, oldVal);
- return true;
- }
- }
-
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-caching.xml", "schema.xml");
@@ -139,7 +130,7 @@ public class TestLFUCache extends SolrTe
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "25");
- LFURegenerator regenerator = new LFURegenerator();
+ NoOpRegenerator regenerator = new NoOpRegenerator();
Object initObj = lfuCache.init(params, null, regenerator);
lfuCache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java?rev=1516661&r1=1516660&r2=1516661&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestLRUCache.java Thu Aug 22 23:17:55 2013
@@ -36,7 +36,7 @@ public class TestLRUCache extends Lucene
params.put("size", "100");
params.put("initialSize", "10");
params.put("autowarmCount", "100%");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = lruCache.init(params, null, cr);
lruCache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
@@ -69,7 +69,7 @@ public class TestLRUCache extends Lucene
params.put("size", String.valueOf(limit));
params.put("initialSize", "10");
params.put("autowarmCount", percentage + "%");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = lruCache.init(params, null, cr);
lruCache.setState(SolrCache.State.LIVE);
for (int i = 1; i <= limit; i++) {
@@ -98,7 +98,7 @@ public class TestLRUCache extends Lucene
Map<String, String> params = new HashMap<String, String>();
params.put("size", "100");
params.put("initialSize", "10");
- CacheRegenerator cr = createCodeRegenerator();
+ CacheRegenerator cr = new NoOpRegenerator();
Object o = lruCache.init(params, null, cr);
lruCache.setState(SolrCache.State.LIVE);
for (int i = 0; i < 101; i++) {
@@ -121,17 +121,4 @@ public class TestLRUCache extends Lucene
assertEquals(null, lruCacheNew.get(50));
lruCacheNew.close();
}
-
- private CacheRegenerator createCodeRegenerator() {
- CacheRegenerator cr = new CacheRegenerator() {
- @Override
- @SuppressWarnings("unchecked")
- public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache,
- SolrCache oldCache, Object oldKey, Object oldVal) {
- newCache.put(oldKey, oldVal);
- return true;
- }
- };
- return cr;
- }
}