This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git
commit a01271b385296bad642f54e751371333aaf62fc5 Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Wed Jul 11 09:12:46 2018 -0700 GEODE-5363: Rebase cleanup --- .../cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java | 3 +-- .../cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java similarity index 99% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java index 2e2dca2..974e5ea 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java +++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java @@ -58,13 +58,12 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.junit.assertions.CommandResultAssert; -import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.test.junit.categories.LuceneTest; import org.apache.geode.test.junit.rules.GfshCommandRule; import org.apache.geode.test.junit.rules.ServerStarterRule; import org.apache.geode.test.junit.rules.serializable.SerializableTestName; -@Category({IntegrationTest.class, LuceneTest.class}) +@Category(LuceneTest.class) @RunWith(JUnitParamsRunner.class) @SuppressWarnings("serial") public class LuceneIndexCommandsIntegrationTest { diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java similarity index 99% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java index 2b3a703..764c9b9 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java +++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java @@ -39,10 +39,9 @@ import org.apache.geode.cache.lucene.LuceneServiceProvider; import org.apache.geode.cache.lucene.internal.LuceneServiceImpl; import org.apache.geode.cache.lucene.internal.repository.serializer.PrimitiveSerializer; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; -import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.geode.test.junit.categories.LuceneTest; -@Category({IntegrationTest.class, LuceneTest.class}) +@Category(LuceneTest.class) public class LuceneIndexCommandsWithReindexAllowedIntegrationTest extends LuceneIndexCommandsIntegrationTest {