IGNITE-12122 Remove setIncludeEventTypes from GridAbstractTest (apache#6825)

IGNITE-12122: Remove setIncludeEventTypes from GridAbstractTest

Author: zstan

modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java

@@ -25,6 +25,7 @@
 import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi;
@@ -52,6 +53,8 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest {
         cfg.setMetricsUpdateFrequency(500);
         cfg.setDeploymentMode(depMode);
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         return cfg;
     }
 

modules/camel/src/test/java/org/apache/ignite/stream/camel/IgniteCamelStreamerTest.java

@@ -48,7 +48,9 @@
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.util.lang.GridMapEntry;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgniteBiPredicate;
@@ -96,6 +98,11 @@ public IgniteCamelStreamerTest() {
         super(true);
     }
 
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return super.getConfiguration(igniteInstanceName).setIncludeEventTypes(EventType.EVTS_ALL);
+    }
+
     @SuppressWarnings("unchecked")
     @Override public void beforeTest() throws Exception {
         grid().<Integer, String>getOrCreateCache(defaultCacheConfiguration());

modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java

@@ -35,6 +35,7 @@
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.events.TaskEvent;
 import org.apache.ignite.internal.client.GridClient;
 import org.apache.ignite.internal.client.GridClientConfiguration;
@@ -76,6 +77,8 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
 
         cfg.setConnectorConfiguration(new ConnectorConfiguration());
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         return cfg;
     }
 

modules/core/src/test/java/org/apache/ignite/failure/OomFailureHandlerTest.java

@@ -52,6 +52,8 @@ public class OomFailureHandlerTest extends AbstractFailureHandlerTest {
             .setBackups(0)
         );
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         return cfg;
     }
 

modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java

@@ -42,6 +42,7 @@
 import org.apache.ignite.compute.ComputeTaskSplitAdapter;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.lang.IgniteBiTuple;
@@ -117,6 +118,8 @@ protected ClusterGroupAbstractTest() {
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
 
         return cfg;

modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java

@@ -29,6 +29,7 @@
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.DiscoveryEvent;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.lang.IgnitePredicate;
@@ -62,7 +63,7 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest {
 
         cfg.setCacheConfiguration();
         cfg.setIncludeProperties();
-        //cfg.setMetricsUpdateFrequency(0);
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
 
         return cfg;
     }

modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java

@@ -34,6 +34,7 @@
 import org.apache.ignite.compute.ComputeTaskName;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.lang.IgnitePredicate;
 import org.apache.ignite.resources.LoggerResource;
 import org.apache.ignite.spi.IgniteSpiException;
@@ -77,6 +78,8 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest {
         // Disable cache since it can deploy some classes during start process.
         cfg.setCacheConfiguration();
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         return cfg;
     }
 

modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java

@@ -40,6 +40,7 @@
 import org.apache.ignite.events.CheckpointEvent;
 import org.apache.ignite.events.DeploymentEvent;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.events.JobEvent;
 import org.apache.ignite.events.TaskEvent;
 import org.apache.ignite.internal.util.IgniteUtils;
@@ -99,6 +100,8 @@ public GridEventStorageCheckAllEventsSelfTest() {
         // TODO: IGNITE-3099 (hotfix the test to check the event order in common case).
         cfg.setPublicThreadPoolSize(1);
 
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
+
         return cfg;
     }
 

modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageSelfTest.java

@@ -31,7 +31,9 @@
 import org.apache.ignite.compute.ComputeJobAdapter;
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.compute.ComputeTaskSplitAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
+import org.apache.ignite.events.EventType;
 import org.apache.ignite.events.JobEvent;
 import org.apache.ignite.events.TaskEvent;
 import org.apache.ignite.internal.processors.task.GridInternal;
@@ -69,6 +71,11 @@ public GridEventStorageSelfTest() {
         super(/*start grid*/false);
     }
 
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return super.getConfiguration(igniteInstanceName).setIncludeEventTypes(EventType.EVTS_ALL);
+    }
+
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ignite1 = startGrid(1);

modules/core/src/test/java/org/apache/ignite/internal/GridJobSubjectIdSelfTest.java

@@ -28,6 +28,7 @@
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.compute.ComputeTaskAdapter;
 import org.apache.ignite.compute.ComputeTaskSession;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.Event;
 import org.apache.ignite.events.EventType;
 import org.apache.ignite.events.JobEvent;
@@ -60,6 +61,11 @@ public class GridJobSubjectIdSelfTest extends GridCommonAbstractTest {
     /** Second node. */
     private Ignite node2;
 
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return super.getConfiguration(igniteInstanceName).setIncludeEventTypes(EventType.EVTS_ALL);
+    }
+
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         node1 = startGrid(1);