IGNITE-10811: Add new TC build-config to test Service Grid new and old implementation...
authorVyacheslav Daradur <daradurvs@gmail.com>
Fri, 28 Dec 2018 08:56:22 +0000 (11:56 +0300)
committerNikolay Izhikov <nizhikov@apache.org>
Fri, 28 Dec 2018 08:56:22 +0000 (11:56 +0300)
Signed-off-by: Nikolay Izhikov <nizhikov@apache.org>
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicWithPersistenceTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceGridTestSuite.java [new file with mode: 0644]

index b5e8418..276dbc5 100644 (file)
@@ -73,7 +73,6 @@ import org.apache.ignite.internal.processors.database.IndexStorageSelfTest;
 import org.apache.ignite.internal.processors.database.SwapPathConstructionSelfTest;
 import org.apache.ignite.internal.processors.odbc.OdbcConfigurationValidationSelfTest;
 import org.apache.ignite.internal.processors.odbc.OdbcEscapeSequenceSelfTest;
-import org.apache.ignite.internal.processors.service.ClosureServiceClientsNodesTest;
 import org.apache.ignite.internal.product.GridProductVersionSelfTest;
 import org.apache.ignite.internal.util.GridCleanerTest;
 import org.apache.ignite.internal.util.nio.IgniteExceptionInNioWorkerSelfTest;
@@ -144,7 +143,6 @@ public class IgniteBasicTestSuite {
         suite.addTest(new JUnit4TestAdapter(GridClosureProcessorSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(GridClosureProcessorRemoteTest.class));
         suite.addTest(new JUnit4TestAdapter(GridClosureSerializationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ClosureServiceClientsNodesTest.class));
         suite.addTest(new JUnit4TestAdapter(GridStartStopSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(GridProjectionForCachesSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(GridProjectionForCachesOnDaemonNodeSelfTest.class));
index eefce7f..e5d4165 100644 (file)
@@ -34,8 +34,6 @@ import org.apache.ignite.internal.encryption.EncryptedCacheNodeJoinTest;
 import org.apache.ignite.internal.encryption.EncryptedCachePreconfiguredRestartTest;
 import org.apache.ignite.internal.encryption.EncryptedCacheRestartTest;
 import org.apache.ignite.internal.processors.cache.persistence.CheckpointReadLockFailureTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentOnActivationTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentOutsideBaselineTest;
 import org.apache.ignite.marshaller.GridMarshallerMappingConsistencyTest;
 import org.apache.ignite.util.GridCommandHandlerSslTest;
 import org.apache.ignite.util.GridCommandHandlerTest;
@@ -65,8 +63,6 @@ public class IgniteBasicWithPersistenceTestSuite {
 
         suite.addTest(new JUnit4TestAdapter(IoomFailureHandlerTest.class));
         suite.addTest(new JUnit4TestAdapter(ClusterBaselineNodesMetricsSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOnActivationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOutsideBaselineTest.class));
         suite.addTest(new JUnit4TestAdapter(GridMarshallerMappingConsistencyTest.class));
         suite.addTest(new JUnit4TestAdapter(SystemWorkersTerminationTest.class));
         suite.addTest(new JUnit4TestAdapter(FailureHandlingConfigurationTest.class));
index a63134d..9e73096 100644 (file)
@@ -20,7 +20,6 @@ package org.apache.ignite.testsuites;
 import junit.framework.JUnit4TestAdapter;
 import junit.framework.TestSuite;
 import org.apache.ignite.internal.ClusterMetricsSelfTest;
-import org.apache.ignite.internal.ComputeJobCancelWithServiceSelfTest;
 import org.apache.ignite.internal.GridCommunicationSelfTest;
 import org.apache.ignite.internal.GridDiscoveryEventSelfTest;
 import org.apache.ignite.internal.GridDiscoverySelfTest;
@@ -52,44 +51,7 @@ import org.apache.ignite.internal.managers.events.GridEventStorageManagerSelfTes
 import org.apache.ignite.internal.processors.cluster.GridAddressResolverSelfTest;
 import org.apache.ignite.internal.processors.cluster.GridUpdateNotifierSelfTest;
 import org.apache.ignite.internal.processors.port.GridPortProcessorSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceClientNodeTest;
-import org.apache.ignite.internal.processors.service.GridServiceContinuousQueryRedeployTest;
-import org.apache.ignite.internal.processors.service.GridServiceDeploymentCompoundFutureSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceDeploymentExceptionPropagationTest;
-import org.apache.ignite.internal.processors.service.GridServicePackagePrivateSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorBatchDeploySelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorMultiNodeConfigSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorMultiNodeSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorProxySelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorSingleNodeSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProcessorStopSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProxyClientReconnectSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceProxyNodeStopSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceReassignmentSelfTest;
-import org.apache.ignite.internal.processors.service.GridServiceSerializationSelfTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersJdkMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingDefaultMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingJdkMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceDynamicCachesSelfTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceProxyTimeoutInitializedTest;
-import org.apache.ignite.internal.processors.service.IgniteServiceReassignmentTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentNonSerializableStaticConfigurationTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentDiscoveryListenerNotificationOrderTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentOnClientDisconnectTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnCoordinatorFailTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnCoordinatorLeftTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnNodesFailTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnNodesLeftTest;
-import org.apache.ignite.internal.processors.service.ServiceInfoSelfTest;
-import org.apache.ignite.internal.processors.service.ServicePredicateAccessCacheTest;
-import org.apache.ignite.internal.processors.service.ServiceReassignmentFunctionSelfTest;
-import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessIdSelfTest;
-import org.apache.ignite.internal.processors.service.SystemCacheNotConfiguredTest;
 import org.apache.ignite.internal.util.GridStartupWithUndefinedIgniteHomeSelfTest;
-import org.apache.ignite.services.ServiceThreadPoolSelfTest;
 import org.apache.ignite.spi.communication.GridCacheMessageSelfTest;
 import org.apache.ignite.testframework.GridTestUtils;
 
@@ -147,53 +109,11 @@ public class IgniteKernalSelfTestSuite {
         suite.addTest(new JUnit4TestAdapter(IgniteUpdateNotifierPerClusterSettingSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(GridLocalEventListenerSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(IgniteTopologyPrintFormatSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ComputeJobCancelWithServiceSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(IgniteConnectionConcurrentReserveAndRemoveTest.class));
         suite.addTest(new JUnit4TestAdapter(LongJVMPauseDetectorTest.class));
         suite.addTest(new JUnit4TestAdapter(ClusterMetricsSelfTest.class));
         suite.addTest(new JUnit4TestAdapter(DeploymentRequestOfUnknownClassProcessingTest.class));
 
-        // Managed Services.
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorSingleNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorMultiNodeSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorMultiNodeConfigSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorProxySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceReassignmentSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceClientNodeTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorStopSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServicePredicateAccessCacheTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServicePackagePrivateSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceSerializationSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProxyNodeStopSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProxyClientReconnectSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceReassignmentTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceProxyTimeoutInitializedTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDynamicCachesSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceContinuousQueryRedeployTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceThreadPoolSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorBatchDeploySelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(GridServiceDeploymentCompoundFutureSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(SystemCacheNotConfiguredTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingJdkMarshallerTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersJdkMarshallerTest.class));
-        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.class));
-
-        suite.addTest(new JUnit4TestAdapter(GridServiceDeploymentExceptionPropagationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnCoordinatorLeftTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnCoordinatorFailTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnNodesLeftTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnNodesFailTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOnClientDisconnectTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentDiscoveryListenerNotificationOrderTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentNonSerializableStaticConfigurationTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceReassignmentFunctionSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceInfoSelfTest.class));
-        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessIdSelfTest.class));
-
         return suite;
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteServiceGridTestSuite.java
new file mode 100644 (file)
index 0000000..a814bad
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * 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 org.apache.ignite.testsuites;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.TestSuite;
+import org.apache.ignite.internal.ComputeJobCancelWithServiceSelfTest;
+import org.apache.ignite.internal.processors.service.ClosureServiceClientsNodesTest;
+import org.apache.ignite.internal.processors.service.GridServiceClientNodeTest;
+import org.apache.ignite.internal.processors.service.GridServiceContinuousQueryRedeployTest;
+import org.apache.ignite.internal.processors.service.GridServiceDeploymentCompoundFutureSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceDeploymentExceptionPropagationTest;
+import org.apache.ignite.internal.processors.service.GridServicePackagePrivateSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorBatchDeploySelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorMultiNodeConfigSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorMultiNodeSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorProxySelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorSingleNodeSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProcessorStopSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProxyClientReconnectSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceProxyNodeStopSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceReassignmentSelfTest;
+import org.apache.ignite.internal.processors.service.GridServiceSerializationSelfTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersJdkMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingDefaultMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingJdkMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceDynamicCachesSelfTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceProxyTimeoutInitializedTest;
+import org.apache.ignite.internal.processors.service.IgniteServiceReassignmentTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentDiscoveryListenerNotificationOrderTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentNonSerializableStaticConfigurationTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentOnActivationTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentOnClientDisconnectTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentOutsideBaselineTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessIdSelfTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnCoordinatorFailTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnCoordinatorLeftTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnNodesFailTest;
+import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessingOnNodesLeftTest;
+import org.apache.ignite.internal.processors.service.ServiceInfoSelfTest;
+import org.apache.ignite.internal.processors.service.ServicePredicateAccessCacheTest;
+import org.apache.ignite.internal.processors.service.ServiceReassignmentFunctionSelfTest;
+import org.apache.ignite.internal.processors.service.SystemCacheNotConfiguredTest;
+import org.apache.ignite.services.ServiceThreadPoolSelfTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.AllTests;
+
+/**
+ * Contains Service Grid related tests.
+ */
+@RunWith(AllTests.class)
+public class IgniteServiceGridTestSuite {
+    /**
+     * @return Suite.
+     */
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("Service Grid Test Suite");
+
+        suite.addTest(new JUnit4TestAdapter(ComputeJobCancelWithServiceSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorSingleNodeSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorMultiNodeSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorMultiNodeConfigSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorProxySelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceReassignmentSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceClientNodeTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorStopSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServicePredicateAccessCacheTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServicePackagePrivateSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceSerializationSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProxyNodeStopSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProxyClientReconnectSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceReassignmentTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceProxyTimeoutInitializedTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDynamicCachesSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceContinuousQueryRedeployTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceThreadPoolSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceProcessorBatchDeploySelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(GridServiceDeploymentCompoundFutureSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(SystemCacheNotConfiguredTest.class));
+        suite.addTest(new JUnit4TestAdapter(ClosureServiceClientsNodesTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOnActivationTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOutsideBaselineTest.class));
+
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingJdkMarshallerTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersJdkMarshallerTest.class));
+        suite.addTest(new JUnit4TestAdapter(IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.class));
+
+        suite.addTest(new JUnit4TestAdapter(GridServiceDeploymentExceptionPropagationTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnCoordinatorLeftTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnCoordinatorFailTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnNodesLeftTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessingOnNodesFailTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentOnClientDisconnectTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentDiscoveryListenerNotificationOrderTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentNonSerializableStaticConfigurationTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceReassignmentFunctionSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceInfoSelfTest.class));
+        suite.addTest(new JUnit4TestAdapter(ServiceDeploymentProcessIdSelfTest.class));
+
+        return suite;
+    }
+}