Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D22B8200B31 for ; Tue, 24 May 2016 20:53:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D0B6C160A39; Tue, 24 May 2016 18:53:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A8CE516098E for ; Tue, 24 May 2016 20:53:55 +0200 (CEST) Received: (qmail 10618 invoked by uid 500); 24 May 2016 18:53:54 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 10608 invoked by uid 99); 24 May 2016 18:53:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2016 18:53:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 53354C6811 for ; Tue, 24 May 2016 18:53:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id nlll5Du8IrUV for ; Tue, 24 May 2016 18:53:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 2EC0160D1D for ; Tue, 24 May 2016 18:53:43 +0000 (UTC) Received: (qmail 7365 invoked by uid 99); 24 May 2016 18:53:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2016 18:53:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 23A19DFF8E; Tue, 24 May 2016 18:53:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sai_boorlagadda@apache.org To: commits@geode.incubator.apache.org Date: Tue, 24 May 2016 18:53:43 -0000 Message-Id: <3782ad4a070d4f0485ad5c551942ad75@git.apache.org> In-Reply-To: <5a31d59ae60d443ea8b3494d800eb9be@git.apache.org> References: <5a31d59ae60d443ea8b3494d800eb9be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/55] [abbrv] incubator-geode git commit: GEODE-1276: Change UnitTests file system to IntegrationTest category GEODE-1307: Rename HeterogenousLuceneSerializer to HeterogeneousLuceneSerializer GEODE-1279: Tests for old TRAC bugs should be renamed to use archived-at: Tue, 24 May 2016 18:53:58 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index 5e4dd3d..29eec8e 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -169,7 +169,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase { //cc1 = server1.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile()); cc2 = server2.invoke(() -> PartitionedRegionCqQueryDUnitTest.getCqCountFromRegionProfile()); - //assertEquals("Should have one", 0, cc1); + //assertIndexDetailsEquals("Should have one", 0, cc1); assertEquals("Should have one", 0, cc2); cqHelper.closeServer(server2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java index fafcd9b..68960bd 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java @@ -2168,7 +2168,7 @@ public void testOneServer() throws CacheException, InterruptedException { int client2Size = getRegionSize(client2, regionName); int server1Size = getRegionSize(server1, regionName); LogWriterUtils.getLogWriter().info("region sizes: "+client1Size+","+client2Size+","+server1Size); -// assertEquals(server1Size, client1Size); +// assertIndexDetailsEquals(server1Size, client1Size); // restart server2 createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java index 020f967..5c3a1b3 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java @@ -85,7 +85,7 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase { private final SerializableCallable verifyNoTxState = new SerializableCallable() { public Object call() throws Exception { //TXManagerImpl mgr = getGemfireCache().getTxManager(); - //assertEquals(0, mgr.hostedTransactionsInProgressForTest()); + //assertIndexDetailsEquals(0, mgr.hostedTransactionsInProgressForTest()); final TXManagerImpl mgr = getGemfireCache().getTxManager(); Wait.waitForCriterion(new WaitCriterion() { @Override @@ -244,14 +244,14 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase { Region.Entry eR = refRegion.getEntry(custId); assertNotNull(eC); assertNotNull(eR); -// assertEquals(1,custRegion.size()); - // assertEquals(1,orderRegion.size()); - // assertEquals(1,refRegion.size()); +// assertIndexDetailsEquals(1,custRegion.size()); + // assertIndexDetailsEquals(1,orderRegion.size()); + // assertIndexDetailsEquals(1,refRegion.size()); } else { - //assertEquals(0,custRegion.size()); - //assertEquals(0,orderRegion.size()); - //assertEquals(0,refRegion.size()); + //assertIndexDetailsEquals(0,custRegion.size()); + //assertIndexDetailsEquals(0,orderRegion.size()); + //assertIndexDetailsEquals(0,refRegion.size()); try { Region.Entry eC = custRegion.getEntry(custId); assertNull("should have had an EntryNotFoundException:"+eC,eC); @@ -303,13 +303,13 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase { assertEquals(expectedCust, custRegion.getEntry(custId).getValue()); /* assertNotNull(orderRegion.getEntry(orderId)); - assertEquals(expectedOrder, orderRegion.getEntry(orderId).getValue()); + assertIndexDetailsEquals(expectedOrder, orderRegion.getEntry(orderId).getValue()); assertNotNull(orderRegion.getEntry(orderId2)); - assertEquals(expectedOrder2, orderRegion.getEntry(orderId2).getValue()); + assertIndexDetailsEquals(expectedOrder2, orderRegion.getEntry(orderId2).getValue()); assertNotNull(orderRegion.getEntry(orderId3)); - assertEquals(expectedOrder3, orderRegion.getEntry(orderId3).getValue()); + assertIndexDetailsEquals(expectedOrder3, orderRegion.getEntry(orderId3).getValue()); */ assertNotNull(refRegion.getEntry(custId)); assertEquals(expectedRef, refRegion.getEntry(custId).getValue()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java index 5d2290b..6d830b8 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java @@ -454,7 +454,7 @@ public class CQListGIIDUnitTest extends DistributedTestCase { assertTrue("executeWithInitialResults() state mismatch", cq1.getState() .isRunning()); // if (expectedResultsSize >= 0) { - // assertEquals("unexpected results size", expectedResultsSize, cqResults + // assertIndexDetailsEquals("unexpected results size", expectedResultsSize, cqResults // .size()); // } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index 563c9a7..cfe4d67 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -153,7 +153,7 @@ public class DurableClientTestCase extends DistributedTestCase { assertTrue(proxy.isDurable()); assertEquals(durableClientId, proxy.getDurableId()); assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout()); - //assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive()); + //assertIndexDetailsEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive()); } }); @@ -216,7 +216,7 @@ public class DurableClientTestCase extends DistributedTestCase { assertEquals(dId, proxy.getDurableId()); assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout()); - // assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive()); + // assertIndexDetailsEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive()); } }); @@ -339,7 +339,7 @@ public class DurableClientTestCase extends DistributedTestCase { assertTrue(proxy.isDurable()); assertEquals(durableClientId, proxy.getDurableId()); assertEquals(durableClientTimeout, proxy.getDurableTimeout()); - //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive()); + //assertIndexDetailsEquals(durableClientKeepAlive, proxy.getDurableKeepAlive()); } }); @@ -420,7 +420,7 @@ public class DurableClientTestCase extends DistributedTestCase { assertTrue(proxy.isDurable()); assertEquals(durableClientId, proxy.getDurableId()); assertEquals(durableClientTimeout, proxy.getDurableTimeout()); - //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive()); + //assertIndexDetailsEquals(durableClientKeepAlive, proxy.getDurableKeepAlive()); } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index 06a5d1a..d784397 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -473,7 +473,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { } protected void assertCacheServerConfig(CacheServerMXBean bean) { - // assertEquals(ServerInfo.getInstance().getServerPort(), bean.getPort()); + // assertIndexDetailsEquals(ServerInfo.getInstance().getServerPort(), bean.getPort()); assertEquals(CacheServer.DEFAULT_BIND_ADDRESS, bean.getBindAddress()); assertEquals(CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS, bean .getHostNameForClients()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java index 0d257e3..28ff543 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java @@ -27,12 +27,11 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.internal.cache.PartitionedRegion; /* wrapper of IndexWriter */ @@ -88,7 +87,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl { } // we will create RegionDirectories on the fly when data comes in - HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(getFieldNames()); + HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(getFieldNames()); repositoryManager = new PartitionedRepositoryManager(dataRegion, (PartitionedRegion)fileRegion, (PartitionedRegion)chunkRegion, mapper, analyzer); // create AEQ, AEQ listener and specify the listener to repositoryManager http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java new file mode 100644 index 0000000..a0319f4 --- /dev/null +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; + +import java.util.Map; + +import org.apache.lucene.document.Document; + +import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap; +import com.gemstone.gemfire.pdx.PdxInstance; + +/** + * An implementation of LuceneSerializer that reads the fields + * of a given object using reflection or from a PDX instance and + * writes them to a lucene document. + */ +public class HeterogeneousLuceneSerializer implements LuceneSerializer { + /** + * The set of indexed fields for this mapper + */ + private String[] indexedFields; + + /** + * A mapper for converting a PDX object into a document + */ + private LuceneSerializer pdxMapper; + + /** + * Mappers for each individual class type that this class has seen. + * + * Weak so that entry will be removed if a class is garbage collected. + */ + private Map, LuceneSerializer> mappers = new CopyOnWriteWeakHashMap, LuceneSerializer>(); + + public HeterogeneousLuceneSerializer(String[] indexedFields) { + this.indexedFields = indexedFields; + pdxMapper = new PdxLuceneSerializer(indexedFields); + } + + @Override + public void toDocument(Object value, Document doc) { + + LuceneSerializer mapper = getFieldMapper(value); + + mapper.toDocument(value, doc); + } + + /** + * Get the field mapper based on the type of the given object. + */ + private LuceneSerializer getFieldMapper(Object value) { + if(value instanceof PdxInstance) { + return pdxMapper; + } else { + Class clazz = value.getClass(); + LuceneSerializer mapper = mappers.get(clazz); + if(mapper == null) { + mapper = new ReflectionLuceneSerializer(clazz, indexedFields); + mappers.put(clazz, mapper); + } + return mapper; + } + } + + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java deleted file mode 100644 index 7cb25bb..0000000 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializer.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; - -import java.util.Map; - -import org.apache.lucene.document.Document; - -import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap; -import com.gemstone.gemfire.pdx.PdxInstance; - -/** - * An implementation of LuceneSerializer that reads the fields - * of a given object using reflection or from a PDX instance and - * writes them to a lucene document. - */ -public class HeterogenousLuceneSerializer implements LuceneSerializer { - /** - * The set of indexed fiels for this mapper - */ - private String[] indexedFields; - - /** - * A mapper for converting a PDX object into a document - */ - private LuceneSerializer pdxMapper; - - /** - * Mappers for each individual class type that this class has seen. - * - * Weak so that entry will be removed if a class is garbage collected. - */ - private Map, LuceneSerializer> mappers = new CopyOnWriteWeakHashMap, LuceneSerializer>(); - - public HeterogenousLuceneSerializer(String[] indexedFields) { - this.indexedFields = indexedFields; - pdxMapper = new PdxLuceneSerializer(indexedFields); - } - - @Override - public void toDocument(Object value, Document doc) { - - LuceneSerializer mapper = getFieldMapper(value); - - mapper.toDocument(value, doc); - } - - /** - * Get the field mapper based on the type of the given object. - */ - private LuceneSerializer getFieldMapper(Object value) { - if(value instanceof PdxInstance) { - return pdxMapper; - } else { - Class clazz = value.getClass(); - LuceneSerializer mapper = mappers.get(clazz); - if(mapper == null) { - mapper = new ReflectionLuceneSerializer(clazz, indexedFields); - mappers.put(clazz, mapper); - } - return mapper; - } - } - - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java index 85a5333..9660393 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneEventListenerJUnitTest.java @@ -16,21 +16,17 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.*; import java.io.IOException; import java.util.ArrayList; import java.util.List; import junit.framework.AssertionFailedError; - import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; @@ -38,9 +34,9 @@ import org.mockito.Mockito; import com.gemstone.gemfire.cache.Operation; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; +import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository; import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager; import com.gemstone.gemfire.internal.cache.BucketNotFoundException; -import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository; import com.gemstone.gemfire.test.junit.categories.UnitTest; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java index 74d4e34..ff22f85 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java @@ -16,31 +16,28 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; +import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.ExpectedException; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.RegionFactory; import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.extension.ExtensionPoint; import com.gemstone.gemfire.test.fake.Fakes; import com.gemstone.gemfire.test.junit.categories.UnitTest; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.ExpectedException; - @Category(UnitTest.class) public class LuceneIndexForPartitionedRegionTest { @@ -53,7 +50,7 @@ public class LuceneIndexForPartitionedRegionTest { String regionPath = "regionName"; Cache cache = null; LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache); - Assert.assertEquals(name, index.getName()); + assertEquals(name, index.getName()); } @Test @@ -62,7 +59,7 @@ public class LuceneIndexForPartitionedRegionTest { String regionPath = "regionName"; Cache cache = null; LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache); - Assert.assertEquals(regionPath, index.getRegionPath()); + assertEquals(regionPath, index.getRegionPath()); } @Test @@ -75,7 +72,7 @@ public class LuceneIndexForPartitionedRegionTest { String fileRegionName = index.createFileRegionName(); when(cache.getRegion(fileRegionName)).thenReturn(region); - Assert.assertTrue(index.fileRegionExists(fileRegionName)); + assertTrue(index.fileRegionExists(fileRegionName)); } @Test @@ -87,7 +84,7 @@ public class LuceneIndexForPartitionedRegionTest { String fileRegionName = index.createFileRegionName(); when(cache.getRegion(fileRegionName)).thenReturn(null); - Assert.assertFalse(index.fileRegionExists(fileRegionName)); + assertFalse(index.fileRegionExists(fileRegionName)); } @Test @@ -100,7 +97,7 @@ public class LuceneIndexForPartitionedRegionTest { String chunkRegionName = index.createChunkRegionName(); when(cache.getRegion(chunkRegionName)).thenReturn(region); - Assert.assertTrue(index.chunkRegionExists(chunkRegionName)); + assertTrue(index.chunkRegionExists(chunkRegionName)); } @Test @@ -112,7 +109,7 @@ public class LuceneIndexForPartitionedRegionTest { String chunkRegionName = index.createChunkRegionName(); when(cache.getRegion(chunkRegionName)).thenReturn(null); - Assert.assertFalse(index.chunkRegionExists(chunkRegionName)); + assertFalse(index.chunkRegionExists(chunkRegionName)); } @Test http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java index 2aa3241..ebde9d4 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAJUnitTest.java @@ -21,7 +21,6 @@ package com.gemstone.gemfire.cache.lucene.internal; import static org.junit.Assert.*; import java.io.IOException; -import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.lucene.analysis.Analyzer; @@ -48,7 +47,7 @@ import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository; import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Type1; import com.gemstone.gemfire.internal.cache.BucketNotFoundException; import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl; @@ -64,7 +63,7 @@ public class LuceneIndexRecoveryHAJUnitTest { private static final String INDEX = "index"; private static final String REGION = "indexedRegion"; String[] indexedFields = new String[] { "txt" }; - HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields); + HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(indexedFields); Analyzer analyzer = new StandardAnalyzer(); Cache cache; @@ -72,7 +71,7 @@ public class LuceneIndexRecoveryHAJUnitTest { @Before public void setup() { indexedFields = new String[] { "txt" }; - mapper = new HeterogenousLuceneSerializer(indexedFields); + mapper = new HeterogeneousLuceneSerializer(indexedFields); analyzer = new StandardAnalyzer(); LuceneServiceImpl.registerDataSerializables(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java index 91556a9..9c3a65e 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryResultsImplJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; import static org.junit.Assert.*; @@ -26,13 +25,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import org.mockito.internal.stubbing.defaultanswers.ForwardsInvocations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -76,7 +73,6 @@ public class LuceneQueryResultsImplJUnitTest { @Test public void testMaxStore() { - hits.set(5, new EntryScore("key_5", 502)); LuceneQueryResultsImpl results = new LuceneQueryResultsImpl(hits, null, 5); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java index 7893940..a41c7da 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneResultStructImpJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; import static org.junit.Assert.*; @@ -31,7 +30,6 @@ public class LuceneResultStructImpJUnitTest { @Test public void hashCodeAndEquals() { - //Create 2 equal structs LuceneResultStructImpl result1 = new LuceneResultStructImpl("key1", "value1", 5); LuceneResultStructImpl result2 = new LuceneResultStructImpl("key1", "value1", 5); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java index 1beea0f..dec4572 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; import static org.junit.Assert.*; @@ -36,7 +35,6 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.queryparser.classic.ParseException; import org.junit.After; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -44,32 +42,30 @@ import org.junit.rules.ExpectedException; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider; import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction; import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.test.junit.categories.UnitTest; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; -@Category(UnitTest.class) +@Category(IntegrationTest.class) public class LuceneServiceImplJUnitTest { Cache cache; ClientCache clientCache; private LuceneIndexImpl repo; - private HeterogenousLuceneSerializer mapper; + private HeterogeneousLuceneSerializer mapper; private StandardAnalyzer analyzer = new StandardAnalyzer(); private IndexWriter writer; LuceneServiceImpl service = null; @@ -242,7 +238,7 @@ public class LuceneServiceImplJUnitTest { } } - public void canCreateLuceneIndexForPRType(RegionShortcut regionShortcut) { + private void canCreateLuceneIndexForPRType(RegionShortcut regionShortcut) { getService(); service.createIndex("index1", "PR1", "field1", "field2", "field3"); Region region = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java index bf09f99..4532d16 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java @@ -16,14 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.junit.Assert.*; +import static org.mockito.Matchers.*; import java.io.IOException; import java.util.Arrays; @@ -43,11 +39,10 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer; import com.gemstone.gemfire.internal.cache.BucketNotFoundException; import com.gemstone.gemfire.internal.cache.BucketRegion; @@ -60,7 +55,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class PartitionedRepositoryManagerJUnitTest { - private PartitionedRegion userRegion; private PartitionedRegion fileRegion; private PartitionedRegion chunkRegion; @@ -84,7 +78,7 @@ public class PartitionedRepositoryManagerJUnitTest { chunkRegion = Mockito.mock(PartitionedRegion.class); chunkDataStore = Mockito.mock(PartitionedRegionDataStore.class); Mockito.when(chunkRegion.getDataStore()).thenReturn(chunkDataStore); - serializer = new HeterogenousLuceneSerializer(new String[] {"a", "b"} ); + serializer = new HeterogeneousLuceneSerializer(new String[] {"a", "b"} ); } @Test @@ -163,7 +157,6 @@ public class PartitionedRepositoryManagerJUnitTest { @Test public void getByRegion() throws BucketNotFoundException { - PartitionedRepositoryManager repoManager = new PartitionedRepositoryManager(userRegion, fileRegion, chunkRegion, serializer, new StandardAnalyzer()); setUpMockBucket(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java index a16b019..dded69c 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal; import static org.junit.Assert.assertEquals; @@ -36,9 +35,8 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class StringQueryProviderJUnitTest { - static final String INDEXED_REGION = "indexedRegion"; - LuceneIndex mockIndex; + private LuceneIndex mockIndex; @Before public void initMocksAndCommonObjects() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java index d20b052..e8118c5 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java @@ -16,19 +16,18 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.directory; import java.io.IOException; import java.nio.file.Path; import java.util.concurrent.ConcurrentHashMap; +import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; import org.apache.lucene.store.BaseDirectoryTestCase; import org.apache.lucene.store.Directory; import org.junit.Rule; import org.junit.experimental.categories.Category; -import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; import com.gemstone.gemfire.test.junit.categories.UnitTest; @@ -42,9 +41,11 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; */ @Category(UnitTest.class) public class RegionDirectoryJUnitTest extends BaseDirectoryTestCase { + @Rule public SystemPropertiesRestoreRule restoreProps = new SystemPropertiesRestoreRule(); - + + @Override protected Directory getDirectory(Path path) throws IOException { //This is super lame, but log4j automatically sets the system property, and the lucene http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java index bec2da8..7bcc761 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.distributed; import java.io.IOException; @@ -41,24 +40,17 @@ import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepositoryImpl; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class DistributedScoringJUnitTest { - class TestType { - String txt; - - public TestType(String txt) { - this.txt = txt; - } - } - String[] indexedFields = new String[] { "txt" }; - HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields); + private String[] indexedFields = new String[] { "txt" }; + private HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(indexedFields); - final StandardAnalyzer analyzer = new StandardAnalyzer(); - Region region; + private final StandardAnalyzer analyzer = new StandardAnalyzer(); + private Region region; @Before public void createMocks() { @@ -66,7 +58,7 @@ public class DistributedScoringJUnitTest { Mockito.when(region.isDestroyed()).thenReturn(false); } - /* + /** * The goal of this test is to verify fair scoring if entries are uniformly distributed. It compares ordered results * from a single IndexRepository (IR) with merged-ordered results from multiple repositories (ir1, ir2, ir3). The * records inserted in IR are same as the combined records in irX. This simulates merging of results from buckets of a @@ -152,4 +144,13 @@ public class DistributedScoringJUnitTest { return new IndexRepositoryImpl(region, writer, mapper); } + + private static class TestType { + + String txt; + + public TestType(String txt) { + this.txt = txt; + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java index abdf8ec..bcb34e2 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/EntryScoreJUnitTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.distributed; -import org.junit.Assert; +import static org.junit.Assert.*; + import org.junit.Test; import org.junit.experimental.categories.Category; @@ -29,12 +29,13 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class EntryScoreJUnitTest { + @Test public void testSerialization() { LuceneServiceImpl.registerDataSerializables(); EntryScore entry = new EntryScore("entry", .1f); EntryScore copy = CopyHelper.deepCopy(entry); - Assert.assertEquals("entry", copy.getKey()); - Assert.assertEquals(.1f, copy.getScore(), 0f); + assertEquals("entry", copy.getKey()); + assertEquals(.1f, copy.getScore(), 0f); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java index 46ea67f..39a4dde 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java @@ -16,18 +16,14 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.distributed; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; -import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.mockito.Mockito; import com.gemstone.gemfire.CopyHelper; -import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory; import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider; import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl; @@ -38,6 +34,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class LuceneFunctionContextJUnitTest { + @Test public void testLuceneFunctionArgsDefaults() { LuceneFunctionContext context = new LuceneFunctionContext<>(); @@ -55,7 +52,7 @@ public class LuceneFunctionContextJUnitTest { LuceneFunctionContext copy = CopyHelper.deepCopy(context); assertEquals(123, copy.getLimit()); - Assert.assertNotNull(copy.getQueryProvider()); + assertNotNull(copy.getQueryProvider()); assertEquals("text", ((StringQueryProvider) copy.getQueryProvider()).getQueryString()); assertEquals(TopEntriesCollectorManager.class, copy.getCollectorManager().getClass()); assertEquals("test", ((TopEntriesCollectorManager) copy.getCollectorManager()).getId()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java index b36d8cc..9e2f310 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java @@ -16,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.distributed; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -36,18 +34,19 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class TopEntriesCollectorJUnitTest { - EntryScore r1_1 = new EntryScore("1-1", .9f); - EntryScore r1_2 = new EntryScore("1-2", .7f); - EntryScore r1_3 = new EntryScore("1-3", .5f); - EntryScore r2_1 = new EntryScore("2-1", .85f); - EntryScore r2_2 = new EntryScore("2-2", .65f); + private EntryScore r1_1 = new EntryScore("1-1", .9f); + private EntryScore r1_2 = new EntryScore("1-2", .7f); + private EntryScore r1_3 = new EntryScore("1-3", .5f); + + private EntryScore r2_1 = new EntryScore("2-1", .85f); + private EntryScore r2_2 = new EntryScore("2-2", .65f); - EntryScore r3_1 = new EntryScore("3-1", .8f); - EntryScore r3_2 = new EntryScore("3-2", .6f); - EntryScore r3_3 = new EntryScore("3-3", .4f); + private EntryScore r3_1 = new EntryScore("3-1", .8f); + private EntryScore r3_2 = new EntryScore("3-2", .6f); + private EntryScore r3_3 = new EntryScore("3-3", .4f); - TopEntriesCollectorManager manager; + private TopEntriesCollectorManager manager; @Before public void setup() { @@ -122,16 +121,16 @@ public class TopEntriesCollectorJUnitTest { TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3); ListScanner scanner = new ListScanner(c1.getEntries().getHits()); - Assert.assertTrue(scanner.hasNext()); + assertTrue(scanner.hasNext()); assertEquals(r1_1.getKey(), scanner.peek().getKey()); assertEquals(r1_1.getKey(), scanner.next().getKey()); - Assert.assertTrue(scanner.hasNext()); + assertTrue(scanner.hasNext()); assertEquals(r1_2.getKey(), scanner.peek().getKey()); assertEquals(r1_2.getKey(), scanner.next().getKey()); - Assert.assertTrue(scanner.hasNext()); + assertTrue(scanner.hasNext()); assertEquals(r1_3.getKey(), scanner.peek().getKey()); assertEquals(r1_3.getKey(), scanner.next().getKey()); - Assert.assertFalse(scanner.hasNext()); + assertFalse(scanner.hasNext()); assertEquals(3, c1.getEntries().getHits().size()); TopEntriesJUnitTest.verifyResultOrder(c1.getEntries().getHits(), r1_1, r1_2, r1_3); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java index d849c8e..410d0ef 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesJUnitTest.java @@ -16,11 +16,9 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.distributed; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.Collection; import java.util.Iterator; @@ -40,12 +38,13 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class TopEntriesJUnitTest { - Mockery mockContext; - EntryScore r1_1 = new EntryScore("3", .9f); - EntryScore r1_2 = new EntryScore("1", .8f); - EntryScore r2_1 = new EntryScore("2", 0.85f); - EntryScore r2_2 = new EntryScore("4", 0.1f); + private Mockery mockContext; + + private EntryScore r1_1 = new EntryScore("3", .9f); + private EntryScore r1_2 = new EntryScore("1", .8f); + private EntryScore r2_1 = new EntryScore("2", 0.85f); + private EntryScore r2_2 = new EntryScore("4", 0.1f); @Test public void testPopulateTopEntries() { @@ -115,7 +114,8 @@ public class TopEntriesJUnitTest { assertEquals(3, copy.size()); verifyResultOrder(copy.getHits(), r1_1, r2_1, r1_2); } - + + // TODO: extract to lucene test util class public static void verifyResultOrder(Collection list, EntryScore... expectedEntries) { Iterator iter = list.iterator(); for (EntryScore expectedEntry : expectedEntries) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java index f28b84a..b49beb5 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.filesystem; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java index e4e8752..b4ba92f 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileJUnitTest.java @@ -16,13 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.filesystem; import static org.junit.Assert.*; -import java.util.UUID; - import org.junit.Test; import org.junit.experimental.categories.Category; @@ -41,7 +38,7 @@ public class FileJUnitTest { file.length = 5; file.chunks = 7; File copy = CopyHelper.deepCopy(file); - + assertEquals(file.chunks, copy.chunks); assertEquals(file.created, copy.created); assertEquals(file.modified, copy.modified); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java index 83d9e03..1d936ca 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemJUnitTest.java @@ -16,16 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.filesystem; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -51,6 +46,7 @@ public class FileSystemJUnitTest { private static final int SMALL_CHUNK = 523; private static final int LARGE_CHUNK = 1024 * 1024 * 5 + 33; + private FileSystem system; private Random rand = new Random(); private ConcurrentHashMap fileRegion; @@ -67,7 +63,7 @@ public class FileSystemJUnitTest { * A test of reading and writing to a file. */ @Test - public void testReadWriteBytes() throws IOException { + public void testReadWriteBytes() throws Exception { long start = System.currentTimeMillis(); File file1= system.createFile("testFile1"); @@ -143,7 +139,7 @@ public class FileSystemJUnitTest { * but they should not hurt each other. */ @Test - public void testCloneReader() throws IOException { + public void testCloneReader() throws Exception { File file1= system.createFile("testFile1"); byte[] data = writeRandomBytes(file1); @@ -180,7 +176,7 @@ public class FileSystemJUnitTest { * A test that skip can jump to the correct position in the stream */ @Test - public void testSeek() throws IOException { + public void testSeek() throws Exception { File file= system.createFile("testFile1"); ByteArrayOutputStream expected = new ByteArrayOutputStream(); @@ -238,10 +234,9 @@ public class FileSystemJUnitTest { /** * Test basic file operations - rename, delete, listFiles. - * @throws IOException */ @Test - public void testFileOperations() throws IOException { + public void testFileOperations() throws Exception { String name1 = "testFile1"; File file1= system.createFile(name1); byte[] file1Data = writeRandomBytes(file1); @@ -292,19 +287,17 @@ public class FileSystemJUnitTest { /** * Test what happens if you have an unclosed stream and you create a new file. - * @throws IOException */ @Test - public void testUnclosedStreamSmallFile() throws IOException { + public void testUnclosedStreamSmallFile() throws Exception { doUnclosedStream(SMALL_CHUNK); } /** * Test what happens if you have an unclosed stream and you create a new file. - * @throws IOException */ @Test - public void testUnclosedStreamLargeFile() throws IOException { + public void testUnclosedStreamLargeFile() throws Exception { doUnclosedStream(LARGE_CHUNK); } @@ -346,7 +339,7 @@ public class FileSystemJUnitTest { * the partial rename. */ @Test - public void testPartialRename() throws IOException { + public void testPartialRename() throws Exception { final CountOperations countOperations = new CountOperations(); //Create a couple of mock regions where we count the operations @@ -387,7 +380,7 @@ public class FileSystemJUnitTest { try { system.renameFile(name2, name3); fail("should have seen an error"); - } catch(CacheClosedException e) { + } catch(CacheClosedException expectedException) { } @@ -413,7 +406,7 @@ public class FileSystemJUnitTest { * the partial rename. */ @Test - public void testPartialDelete() throws IOException { + public void testPartialDelete() throws Exception { final CountOperations countOperations = new CountOperations(); //Create a couple of mock regions where we count the operations @@ -456,8 +449,7 @@ public class FileSystemJUnitTest { try { system.deleteFile(name2); fail("should have seen an error"); - } catch(CacheClosedException e) { - + } catch(CacheClosedException expectedException) { } system = new FileSystem(fileRegion, chunkRegion); @@ -466,22 +458,13 @@ public class FileSystemJUnitTest { //File was deleted, but shouldn't have any dangling chunks at this point assertEquals(Collections.EMPTY_SET, fileRegion.keySet()); //TODO - need to purge chunks of deleted files somehow. -// assertEquals(Collections.EMPTY_SET, chunkRegion.keySet()); +// assertIndexDetailsEquals(Collections.EMPTY_SET, chunkRegion.keySet()); } else { file2 = system.getFile(name2); assertContents(expected.toByteArray(), file2); } - } - private File getOrCreateFile(String name) throws IOException { - try { - return system.getFile(name); - } catch(FileNotFoundException e) { - return system.createFile(name); - } - } - private void assertContents(byte[] data, File file) throws IOException { assertEquals(data.length, file.getLength()); @@ -512,11 +495,11 @@ public class FileSystemJUnitTest { outputStream.close(); } - public byte[] getRandomBytes() { + private byte[] getRandomBytes() { return getRandomBytes(rand.nextInt(LARGE_CHUNK) + SMALL_CHUNK); } - - public byte[] getRandomBytes(int length) { + + private byte[] getRandomBytes(int length) { byte[] data = new byte[length]; rand.nextBytes(data); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java index 617879f..53c4161 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java @@ -43,7 +43,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Type2; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest; public class IndexRepositoryImplJUnitTest { private IndexRepositoryImpl repo; - private HeterogenousLuceneSerializer mapper; + private HeterogeneousLuceneSerializer mapper; private StandardAnalyzer analyzer = new StandardAnalyzer(); private IndexWriter writer; private Region region; @@ -69,7 +69,7 @@ public class IndexRepositoryImplJUnitTest { IndexWriterConfig config = new IndexWriterConfig(analyzer); writer = new IndexWriter(dir, config); String[] indexedFields= new String[] {"s", "i", "l", "d", "f", "s2", "missing"}; - mapper = new HeterogenousLuceneSerializer(indexedFields); + mapper = new HeterogeneousLuceneSerializer(indexedFields); region = Mockito.mock(Region.class); Mockito.when(region.isDestroyed()).thenReturn(false); repo = new IndexRepositoryImpl(region, writer, mapper); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java index e996f30..cec76ba 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java @@ -65,7 +65,7 @@ import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory; import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector; import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; import com.gemstone.gemfire.cache.query.QueryException; import com.gemstone.gemfire.test.junit.categories.PerformanceTest; @@ -119,7 +119,7 @@ public class IndexRepositoryImplPerformanceTest { IndexWriterConfig config = new IndexWriterConfig(analyzer); writer = new IndexWriter(dir, config); String[] indexedFields= new String[] {"text"}; - HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(indexedFields); + HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(indexedFields); repo = new IndexRepositoryImpl(fileRegion, writer, mapper); } @@ -381,7 +381,7 @@ public class IndexRepositoryImplPerformanceTest { int size = callbacks.query(query); // int size = callbacks.query(parser.parse(word)); //All of my tests sometimes seem to be missing a couple of words, including the stock lucene -// assertEquals("Error on query " + i + " word=" + word, counts[wordIndex], size); +// assertIndexDetailsEquals("Error on query " + i + " word=" + word, counts[wordIndex], size); } end = System.nanoTime(); results.queryTime = end - start; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java new file mode 100644 index 0000000..3bce904 --- /dev/null +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +import org.apache.lucene.document.Document; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.pdx.PdxInstance; +import com.gemstone.gemfire.test.junit.categories.UnitTest; + +/** + * Unit test of the ObjectToDocumentMapper. + */ +@Category(UnitTest.class) +public class HeterogeneousLuceneSerializerJUnitTest { + + /** + * Test that the mapper can handle a mix of different + * object types. + */ + @Test + public void testHeterogeneousObjects() { + String[] fields = new String[] {"s", "i", "l", "d", "f", "s2", "missing"}; + HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(fields); + + Type1 t1 = new Type1("a", 1, 2L, 3.0, 4.0f); + + Document doc1 = new Document(); + mapper.toDocument(t1, doc1); + + assertEquals(5, doc1.getFields().size()); + assertEquals("a", doc1.getField("s").stringValue()); + assertEquals(1, doc1.getField("i").numericValue()); + assertEquals(2L, doc1.getField("l").numericValue()); + assertEquals(3.0, doc1.getField("d").numericValue()); + assertEquals(4.0f, doc1.getField("f").numericValue()); + + Type2 t2 = new Type2("a", 1, 2L, 3.0, 4.0f, "b"); + + Document doc2 = new Document(); + mapper.toDocument(t2, doc2); + + assertEquals(6, doc2.getFields().size()); + assertEquals("a", doc2.getField("s").stringValue()); + assertEquals("b", doc2.getField("s2").stringValue()); + assertEquals(1, doc2.getField("i").numericValue()); + assertEquals(2L, doc2.getField("l").numericValue()); + assertEquals(3.0, doc2.getField("d").numericValue()); + assertEquals(4.0f, doc2.getField("f").numericValue()); + + PdxInstance i = mock(PdxInstance.class); + + when(i.hasField("s")).thenReturn(true); + when(i.hasField("i")).thenReturn(true); + when(i.getField("s")).thenReturn("a"); + when(i.getField("i")).thenReturn(5); + + Document doc3 = new Document(); + mapper.toDocument(i, doc3); + + assertEquals(2, doc3.getFields().size()); + assertEquals("a", doc3.getField("s").stringValue()); + assertEquals(5, doc3.getField("i").numericValue()); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java deleted file mode 100644 index e54856a..0000000 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/HeterogenousLuceneSerializerJUnitTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; - -import static org.junit.Assert.assertEquals; - -import org.apache.lucene.document.Document; -import org.apache.lucene.index.Term; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.mockito.Mockito; - -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogenousLuceneSerializer; -import com.gemstone.gemfire.pdx.PdxInstance; -import com.gemstone.gemfire.test.junit.categories.UnitTest; - -/** - * Unit test of the ObjectToDocumentMapper. - */ -@Category(UnitTest.class) -public class HeterogenousLuceneSerializerJUnitTest { - - /** - * Test that the mapper can handle a mix of different - * object types. - */ - @Test - public void testHetrogenousObjects() { - String[] fields = new String[] {"s", "i", "l", "d", "f", "s2", "missing"}; - HeterogenousLuceneSerializer mapper = new HeterogenousLuceneSerializer(fields); - - Type1 t1 = new Type1("a", 1, 2L, 3.0, 4.0f); - - Document doc1 = new Document(); - mapper.toDocument(t1, doc1); - - assertEquals(5, doc1.getFields().size()); - assertEquals("a", doc1.getField("s").stringValue()); - assertEquals(1, doc1.getField("i").numericValue()); - assertEquals(2L, doc1.getField("l").numericValue()); - assertEquals(3.0, doc1.getField("d").numericValue()); - assertEquals(4.0f, doc1.getField("f").numericValue()); - - Type2 t2 = new Type2("a", 1, 2L, 3.0, 4.0f, "b"); - - Document doc2 = new Document(); - mapper.toDocument(t2, doc2); - - assertEquals(6, doc2.getFields().size()); - assertEquals("a", doc2.getField("s").stringValue()); - assertEquals("b", doc2.getField("s2").stringValue()); - assertEquals(1, doc2.getField("i").numericValue()); - assertEquals(2L, doc2.getField("l").numericValue()); - assertEquals(3.0, doc2.getField("d").numericValue()); - assertEquals(4.0f, doc2.getField("f").numericValue()); - - PdxInstance i = Mockito.mock(PdxInstance.class); - - Mockito.when(i.hasField("s")).thenReturn(true); - Mockito.when(i.hasField("i")).thenReturn(true); - Mockito.when(i.getField("s")).thenReturn("a"); - Mockito.when(i.getField("i")).thenReturn(5); - - Document doc3 = new Document(); - mapper.toDocument(i, doc3); - - assertEquals(2, doc3.getFields().size()); - assertEquals("a", doc3.getField("s").stringValue()); - assertEquals(5, doc3.getField("i").numericValue()); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java index ec31da9..278e818 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java @@ -16,17 +16,15 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import org.apache.lucene.document.Document; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.mockito.Mockito; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.PdxLuceneSerializer; import com.gemstone.gemfire.pdx.PdxInstance; import com.gemstone.gemfire.test.junit.categories.UnitTest; @@ -42,13 +40,12 @@ public class PdxFieldMapperJUnitTest { String[] fields = new String[] {"s", "i"}; PdxLuceneSerializer mapper = new PdxLuceneSerializer(fields); - PdxInstance i = Mockito.mock(PdxInstance.class); - - Mockito.when(i.hasField("s")).thenReturn(true); - Mockito.when(i.hasField("i")).thenReturn(true); - Mockito.when(i.getField("s")).thenReturn("a"); - Mockito.when(i.getField("i")).thenReturn(5); + PdxInstance i = mock(PdxInstance.class); + when(i.hasField("s")).thenReturn(true); + when(i.hasField("i")).thenReturn(true); + when(i.getField("s")).thenReturn("a"); + when(i.getField("i")).thenReturn(5); Document doc = new Document(); mapper.toDocument(i, doc); @@ -63,17 +60,16 @@ public class PdxFieldMapperJUnitTest { String[] fields = new String[] {"s", "i", "s2", "o"}; PdxLuceneSerializer mapper = new PdxLuceneSerializer(fields); - PdxInstance i = Mockito.mock(PdxInstance.class); - - Mockito.when(i.hasField("s")).thenReturn(true); - Mockito.when(i.hasField("i")).thenReturn(true); - Mockito.when(i.hasField("o")).thenReturn(true); - Mockito.when(i.hasField("o2")).thenReturn(true); - Mockito.when(i.getField("s")).thenReturn("a"); - Mockito.when(i.getField("i")).thenReturn(5); - Mockito.when(i.getField("o")).thenReturn(new Object()); - Mockito.when(i.getField("o2")).thenReturn(new Object()); + PdxInstance i = mock(PdxInstance.class); + when(i.hasField("s")).thenReturn(true); + when(i.hasField("i")).thenReturn(true); + when(i.hasField("o")).thenReturn(true); + when(i.hasField("o2")).thenReturn(true); + when(i.getField("s")).thenReturn("a"); + when(i.getField("i")).thenReturn(5); + when(i.getField("o")).thenReturn(new Object()); + when(i.getField("o2")).thenReturn(new Object()); Document doc = new Document(); mapper.toDocument(i, doc); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java index 3ca8fbf..c187022 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java @@ -16,16 +16,14 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.repository.serializer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import org.apache.lucene.document.Document; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.ReflectionLuceneSerializer; import com.gemstone.gemfire.test.junit.categories.UnitTest; /** @@ -37,7 +35,7 @@ public class ReflectionFieldMapperJUnitTest { @Test public void testAllFields() { - + String[] allFields = new String[] {"s", "i", "l", "d", "f", "s2"}; ReflectionLuceneSerializer mapper1 = new ReflectionLuceneSerializer(Type1.class, allFields); ReflectionLuceneSerializer mapper2 = new ReflectionLuceneSerializer(Type2.class, allFields); @@ -69,7 +67,7 @@ public class ReflectionFieldMapperJUnitTest { @Test public void testIgnoreInvalid() { - + String[] fields = new String[] {"s", "o", "s2"}; ReflectionLuceneSerializer mapper = new ReflectionLuceneSerializer(Type2.class, fields); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java index c1e93ad..ea98f5c 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package com.gemstone.gemfire.cache.lucene.internal.xml; import static org.junit.Assert.*; -import static org.mockito.Matchers.*; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.HashSet; @@ -29,10 +29,8 @@ import java.util.Set; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; import com.gemstone.gemfire.cache.lucene.LuceneIndex; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; @@ -43,28 +41,27 @@ public class LuceneIndexXmlGeneratorJUnitTest { /** * Test of generating and reading cache configuration back in. - * @throws SAXException */ @Test - public void generateWithFields() throws SAXException { - LuceneIndex index = Mockito.mock(LuceneIndex.class); - Mockito.when(index.getName()).thenReturn("index"); + public void generateWithFields() throws Exception { + LuceneIndex index = mock(LuceneIndex.class); + when(index.getName()).thenReturn("index"); String[] fields = new String[] {"field1", "field2"}; - Mockito.when(index.getFieldNames()).thenReturn(fields); + when(index.getFieldNames()).thenReturn(fields); LuceneIndexXmlGenerator generator = new LuceneIndexXmlGenerator(index); - CacheXmlGenerator cacheXmlGenerator = Mockito.mock(CacheXmlGenerator.class); - ContentHandler handler = Mockito.mock(ContentHandler.class); - Mockito.when(cacheXmlGenerator.getContentHandler()).thenReturn(handler); + CacheXmlGenerator cacheXmlGenerator = mock(CacheXmlGenerator.class); + ContentHandler handler = mock(ContentHandler.class); + when(cacheXmlGenerator.getContentHandler()).thenReturn(handler); generator.generate(cacheXmlGenerator); ArgumentCaptor captor = ArgumentCaptor.forClass(Attributes.class); - Mockito.verify(handler).startElement(eq(""), eq("index"), eq("lucene:index"), captor.capture()); + verify(handler).startElement(eq(""), eq("index"), eq("lucene:index"), captor.capture()); Attributes value = captor.getValue(); assertEquals("index", value.getValue(LuceneXmlConstants.NAME)); captor = ArgumentCaptor.forClass(Attributes.class); - Mockito.verify(handler, Mockito.times(2)).startElement(eq(""), eq("field"), eq("lucene:field"), captor.capture()); + verify(handler, times(2)).startElement(eq(""), eq("field"), eq("lucene:field"), captor.capture()); Set foundFields = new HashSet(); for(Attributes fieldAttr : captor.getAllValues()) { foundFields.add(fieldAttr.getValue(LuceneXmlConstants.NAME)); @@ -73,8 +70,8 @@ public class LuceneIndexXmlGeneratorJUnitTest { HashSet expected = new HashSet(Arrays.asList(fields)); assertEquals(expected, foundFields); - Mockito.verify(handler, Mockito.times(2)).endElement(eq(""), eq("field"), eq("lucene:field")); - Mockito.verify(handler).endElement(eq(""), eq("index"), eq("lucene:index")); + verify(handler, times(2)).endElement(eq(""), eq("field"), eq("lucene:field")); + verify(handler).endElement(eq(""), eq("index"), eq("lucene:index")); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java index be2fa62..acb6c2d 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/controllers/PulseControllerJUnitTest.java @@ -18,6 +18,7 @@ package com.vmware.gemfire.tools.pulse.controllers; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -30,6 +31,11 @@ import java.io.File; import java.security.Principal; import java.util.ArrayList; import java.util.HashMap; +import java.util.UUID; +import javax.servlet.ServletContextListener; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.vmware.gemfire.tools.pulse.internal.PulseAppListener; import com.fasterxml.jackson.databind.ObjectMapper; import com.gemstone.gemfire.test.junit.categories.UnitTest; @@ -59,27 +65,17 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -/** - */ -@Category(UnitTest.class) +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; + +@Category(IntegrationTest.class) @PrepareForTest(Repository.class) @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(SpringJUnit4ClassRunner.class) @WebAppConfiguration @ContextConfiguration("classpath*:mvc-dispatcher-servlet.xml") -@PowerMockIgnore("*.UnitTest") +@PowerMockIgnore("*.IntegrationTest") public class PulseControllerJUnitTest { - @Autowired - private WebApplicationContext wac; - - private MockMvc mockMvc; - - private Cluster cluster; - - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); - private static final String PRINCIPAL_USER = "test-user"; private static final String MEMBER_ID = "member1"; @@ -99,6 +95,16 @@ public class PulseControllerJUnitTest { principal = () -> PRINCIPAL_USER; } + @Rule + public TemporaryFolder tempFolder = new TemporaryFolder(); + + @Autowired + private WebApplicationContext wac; + + private MockMvc mockMvc; + + private Cluster cluster; + private final ObjectMapper mapper = new ObjectMapper(); @Before http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java index 70f7dff..0021c2f 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/driver/PulseUITest.java @@ -261,7 +261,7 @@ public class PulseUITest { List locatorRegionscount = testBed.getRootDs().getRegions(locator); int locatorRegions = Integer.parseInt(driver.findElement( By.id("memberRegionsCount")).getText()); - Assert.assertEquals(locatorRegionscount.size(), locatorRegions); + Assert.assertIndexDetailsEquals(locatorRegionscount.size(), locatorRegions); prevSelectedMember = peername; }*/ } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bf258f62/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java index fbd5700..190b381 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -116,7 +116,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{ secondarySenderUpdates = (HashMap)vm5.invoke(() -> WANTestBase.checkQueue()); checkPrimarySenderUpdatesOnVM5(primarySenderUpdates); -// assertEquals(primarySenderUpdates, secondarySenderUpdates); +// assertIndexDetailsEquals(primarySenderUpdates, secondarySenderUpdates); vm4.invoke(() -> WANTestBase.resumeSender( "ln")); Wait.pause(5000);