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 4b41ef6de727536c55c9955d553b5bc2eef0b707 Author: Jacob Barrett <[email protected]> AuthorDate: Mon Jul 2 22:19:54 2018 -0700 GEODE-5363: Moves geode-lucene tests into new source sets. --- geode-lucene/build.gradle | 44 ++++++++++++++++++++++ .../geode/cache/lucene/EvictionDUnitTest.java | 0 .../geode/cache/lucene/ExpirationDUnitTest.java | 0 .../lucene/LuceneClientSecurityDUnitTest.java | 0 ...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0 .../lucene/LuceneCommandsSecurityDUnitTest.java | 0 ...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0 .../apache/geode/cache/lucene/LuceneDUnitTest.java | 0 .../cache/lucene/LuceneIndexCreationDUnitTest.java | 0 .../LuceneIndexCreationOnFixedPRDUnitTest.java | 0 .../cache/lucene/LuceneIndexDestroyDUnitTest.java | 0 .../cache/lucene/LuceneQueriesAccessorBase.java | 0 .../cache/lucene/LuceneQueriesClientDUnitTest.java | 0 .../geode/cache/lucene/LuceneQueriesDUnitTest.java | 0 .../LuceneQueriesReindexClientDUnitTest.java | 0 .../lucene/LuceneQueriesReindexDUnitTest.java | 0 ...hRegionCreatedBeforeReindexClientDUnitTest.java | 0 ...iesWithRegionCreatedBeforeReindexDUnitTest.java | 0 ...eriesWithReindexFlagEnabledClientDUnitTest.java | 0 ...ceneQueriesWithReindexFlagEnabledDUnitTest.java | 0 .../LuceneSearchWithRollingUpgradeDUnit.java | 0 ...hRollingUpgradeReindexFlagEnabledDUnitTest.java | 0 .../cache/lucene/MixedObjectIndexDUnitTest.java | 0 .../geode/cache/lucene/PaginationDUnitTest.java | 0 .../geode/cache/lucene/RebalanceDUnitTest.java | 0 .../lucene/RebalanceWithRedundancyDUnitTest.java | 0 ...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 0 .../LuceneClusterConfigurationDUnitTest.java | 0 ...onWhereRegionCreatedBeforeReindexDUnitTest.java | 0 ...ClusterConfigurationWithReindexFlagEnabled.java | 0 .../management/LuceneManagementDUnitTest.java | 0 .../cache/lucene/test/LuceneTestUtilities.java | 0 .../lucene/LuceneIndexCreationIntegrationTest.java | 0 .../LuceneIndexCreationOffHeapIntegrationTest.java | 0 ...eneIndexCreationPersistenceIntegrationTest.java | 0 .../LuceneIndexMaintenanceIntegrationTest.java | 0 .../cache/lucene/LuceneQueriesIntegrationTest.java | 0 .../LuceneQueriesPersistenceIntegrationTest.java | 0 ...hRegionCreatedBeforeReindexIntegrationTest.java | 0 ...eriesWithReindexFlagEnabledIntegrationTest.java | 0 .../NestedObjectSeralizerIntegrationTest.java | 0 .../internal/LuceneServiceImplIntegrationTest.java | 0 .../DumpDirectoryFilesIntegrationTest.java | 0 .../repository/IndexRepositoryImplJUnitTest.java | 0 ...uceneIndexXmlGeneratorIntegrationJUnitTest.java | 0 ...onCreatedBeforeReindexIntegrationJUnitTest.java | 0 ...WithReindexFlagEnabledIntegrationJUnitTest.java | 0 .../LuceneIndexXmlParserIntegrationJUnitTest.java | 0 .../lucene/test/LuceneFunctionSecurityTest.java | 0 .../AnalyzeLuceneSerializablesJUnitTest.java | 0 .../IndexRepositoryImplPerformanceTest.java | 0 .../repository/LuceneIndexMemoryOverheadTest.java | 2 +- .../cache/lucene/test/LuceneTestUtilities.java | 23 ----------- 53 files changed, 45 insertions(+), 24 deletions(-) diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle index f86eb5d..95c7416 100644 --- a/geode-lucene/build.gradle +++ b/geode-lucene/build.gradle @@ -35,10 +35,54 @@ dependencies { testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version' testCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version' testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version' + // TODO build - move shared source to common library. testCompile files(project(':geode-core').sourceSets.test.output) testCompile files(project(':geode-old-versions').sourceSets.main.output) } +configurations { + integrationTestCompile.extendsFrom testCompile + integrationTestRuntime.extendsFrom testRuntime + distributedTestCompile.extendsFrom testCompile + distributedTestRuntime.extendsFrom testRuntime + performanceTestCompile.extendsFrom testCompile + performanceTestRuntime.extendsFrom testRuntime +} + +sourceSets { + integrationTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/integrationTest/java') + } + resources.srcDir file('src/integrationTest/resources') + } + distributedTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/distributedTest/java') + } + resources.srcDir file('src/distributedTest/resources') + } + performanceTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/performanceTest/java') + } + resources.srcDir file('src/performanceTest/resources') + } +} + +dependencies { + // TODO build - move dunit framework to shared module. + integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output) + distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output) + distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output) +} + //The lucene integration tests don't have any issues that requiring forking integrationTest.forkEvery 0 diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java similarity index 100% copy from geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java copy to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java rename to geode-lucene/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java similarity index 100% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java rename to geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java similarity index 98% rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java rename to geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java index 6dac9bc..4924703 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java +++ b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java @@ -15,7 +15,6 @@ package org.apache.geode.cache.lucene.internal.repository; -import static org.apache.geode.cache.lucene.LuceneQueriesIntegrationTest.REGION_NAME; import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME; import java.nio.charset.Charset; @@ -44,6 +43,7 @@ import org.apache.geode.test.junit.categories.PerformanceTest; @Category({PerformanceTest.class, LuceneTest.class}) @Ignore("Tests have no assertions") public class LuceneIndexMemoryOverheadTest extends LuceneIntegrationTest { + private static final String REGION_NAME = "index"; private static int NUM_BATCHES = 30; private static int NUM_ENTRIES = 10000; private Random random = new Random(0); diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java index 6d2940b..684bed1 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java @@ -56,7 +56,6 @@ import org.apache.geode.cache.lucene.internal.LuceneServiceImpl; import org.apache.geode.cache.lucene.internal.distributed.EntryScore; import org.apache.geode.internal.cache.LocalRegion; import org.apache.geode.internal.cache.wan.AbstractGatewaySender; -import org.apache.geode.test.dunit.VM; public class LuceneTestUtilities { public static final String INDEX_NAME = "index"; @@ -151,28 +150,6 @@ public class LuceneTestUtilities { } } - public static Region initDataStoreForFixedPR(final Cache cache) throws Exception { - List<FixedPartitionAttributes> fpaList = new ArrayList<FixedPartitionAttributes>(); - int vmNum = VM.getCurrentVMNum(); - if (vmNum % 2 == 0) { - FixedPartitionAttributes fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true); - FixedPartitionAttributes fpa2 = - FixedPartitionAttributes.createFixedPartition(Quarter2, false); - fpaList.clear(); - fpaList.add(fpa1); - fpaList.add(fpa2); - } else { - FixedPartitionAttributes fpa1 = - FixedPartitionAttributes.createFixedPartition(Quarter1, false); - FixedPartitionAttributes fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, true); - fpaList.clear(); - fpaList.add(fpa1); - fpaList.add(fpa2); - } - - return createFixedPartitionedRegion(cache, REGION_NAME, fpaList, 40); - } - public static Region createFixedPartitionedRegion(final Cache cache, String regionName, List<FixedPartitionAttributes> fpaList, int localMaxMemory) { List<String> allPartitions = new ArrayList();
