You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2017/09/12 20:45:14 UTC
[geode] branch feature/GEODE-3240 updated: GEODE-3240: add
integration test
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-3240
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3240 by this push:
new 1a85fae GEODE-3240: add integration test
1a85fae is described below
commit 1a85faeb33d0c3874a775f6ce9a3d612c689e399
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Sep 12 13:43:52 2017 -0700
GEODE-3240: add integration test
---
.../LuceneIndexMaintenanceIntegrationTest.java | 23 ++++++++++++++++++++++
.../LuceneIndexForPartitionedRegionTest.java | 9 ++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
index ad28164..c3a481c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
@@ -41,6 +41,7 @@ import org.apache.geode.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import org.apache.geode.cache.lucene.internal.LuceneIndexImpl;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
+import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -107,6 +108,28 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest
}
@Test
+ public void useSerializerToIndex() throws Exception {
+ luceneService.createIndexFactory().setFields("title", "description")
+ .setLuceneSerializer(
+ new HeterogeneousLuceneSerializer(new String[] {"title", "description"}))
+ .create(INDEX_NAME, REGION_NAME);
+
+ Region region = createRegion(REGION_NAME, RegionShortcut.PARTITION);
+ region.put("object-1", new TestObject("title 1", "hello world"));
+ region.put("object-2", new TestObject("title 2", "this will not match"));
+ region.put("object-3", new TestObject("title 3", "hello world"));
+ region.put("object-4", new TestObject("hello world", "hello world"));
+
+ LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
+ luceneService.waitUntilFlushed(INDEX_NAME, REGION_NAME, WAIT_FOR_FLUSH_TIME,
+ TimeUnit.MILLISECONDS);
+ LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME,
+ "description:\"hello world\"", DEFAULT_FIELD);
+ PageableLuceneQueryResults<Integer, TestObject> results = query.findPages();
+ assertEquals(3, results.size());
+ }
+
+ @Test
public void statsAreUpdatedAfterACommit() throws Exception {
luceneService.createIndexFactory().setFields("title", "description").create(INDEX_NAME,
REGION_NAME);
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index f0053b0..075a751 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.cache.lucene.internal.directory.DumpDirectoryFiles;
-import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -126,7 +125,7 @@ public class LuceneIndexForPartitionedRegionTest {
String name = "indexName";
String regionPath = "regionName";
InternalCache cache = Fakes.cache();
- HeterogeneousLuceneSerializer serializer = mock(HeterogeneousLuceneSerializer.class);
+ LuceneSerializer serializer = mock(LuceneSerializer.class);
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index = spy(index);
@@ -140,15 +139,15 @@ public class LuceneIndexForPartitionedRegionTest {
String regionPath = "regionName";
String fields[] = {"field1", "field2"};
InternalCache cache = Fakes.cache();
- ArgumentCaptor<HeterogeneousLuceneSerializer> serializerCaptor =
- ArgumentCaptor.forClass(HeterogeneousLuceneSerializer.class);
+ ArgumentCaptor<LuceneSerializer> serializerCaptor =
+ ArgumentCaptor.forClass(LuceneSerializer.class);
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index = spy(index);
when(index.getFieldNames()).thenReturn(fields);
index.setupRepositoryManager(null);
verify(index).createRepositoryManager(serializerCaptor.capture());
- HeterogeneousLuceneSerializer serializer = serializerCaptor.getValue();
+ LuceneSerializer serializer = serializerCaptor.getValue();
assertNull(serializer);
}
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].