You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2019/04/01 16:37:45 UTC
[geode] branch develop updated: GEODE-6578: Moves MockExtension out
of geode-junit. (#3377)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new fbbefd3 GEODE-6578: Moves MockExtension out of geode-junit. (#3377)
fbbefd3 is described below
commit fbbefd399aa287cec4f9e096eaa32c0562537e1d
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Apr 1 09:37:34 2019 -0700
GEODE-6578: Moves MockExtension out of geode-junit. (#3377)
It doesn't need to be in this shared test framework.
---
.../geode/internal/cache/extension/mock/AbstractMockExtension.java | 0
.../cache/extension/mock/AbstractMockExtensionXmlGenerator.java | 0
.../cache/extension/mock/AlterMockCacheExtensionFunction.java | 0
.../cache/extension/mock/AlterMockRegionExtensionFunction.java | 0
.../cache/extension/mock/CreateMockCacheExtensionFunction.java | 0
.../cache/extension/mock/CreateMockRegionExtensionFunction.java | 0
.../cache/extension/mock/DestroyMockCacheExtensionFunction.java | 0
.../cache/extension/mock/DestroyMockRegionExtensionFunction.java | 0
.../geode/internal/cache/extension/mock/MockCacheExtension.java | 0
.../cache/extension/mock/MockCacheExtensionXmlGenerator.java | 0
.../geode/internal/cache/extension/mock/MockExtensionCommands.java | 0
.../geode/internal/cache/extension/mock/MockExtensionXmlParser.java | 0
.../geode/internal/cache/extension/mock/MockRegionExtension.java | 0
.../cache/extension/mock/MockRegionExtensionXmlGenerator.java | 0
.../services/org.apache.geode.internal.cache.xmlcache.XmlParser | 0
.../META-INF/services/org.springframework.shell.core.CommandMarker | 0
.../cli/commands/CommandAvailabilityIndicatorTestHelper.java | 5 -----
17 files changed, 5 deletions(-)
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtension.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockExtensionXmlParser.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
diff --git a/geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
diff --git a/geode-junit/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser b/geode-core/src/distributedTest/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser
similarity index 100%
rename from geode-junit/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser
rename to geode-core/src/distributedTest/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser
diff --git a/geode-junit/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker b/geode-core/src/distributedTest/resources/META-INF/services/org.springframework.shell.core.CommandMarker
similarity index 100%
rename from geode-junit/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
rename to geode-core/src/distributedTest/resources/META-INF/services/org.springframework.shell.core.CommandMarker
diff --git a/geode-junit/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTestHelper.java b/geode-junit/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTestHelper.java
index 94c9821..f596b45 100644
--- a/geode-junit/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTestHelper.java
+++ b/geode-junit/src/main/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTestHelper.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliCommand;
-import org.apache.geode.internal.cache.extension.mock.MockExtensionCommands;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CommandManager;
@@ -39,10 +38,6 @@ public class CommandAvailabilityIndicatorTestHelper {
continue;
}
- if (commandMarker instanceof MockExtensionCommands) {
- continue;
- }
-
for (Method method : commandMarker.getClass().getMethods()) {
CliCommand cliCommand = method.getAnnotation(CliCommand.class);
if (cliCommand == null) {