IGNITE-15083 Remove setMarshaller from tests

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

@@ -23,7 +23,6 @@
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.ConnectorMessageInterceptor;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.lifecycle.LifecycleAware;
 import org.apache.ignite.lifecycle.LifecycleBean;
 import org.apache.ignite.lifecycle.LifecycleEventType;
@@ -102,30 +101,6 @@ private static class TestLifecycleBean extends TestLifecycleAware implements Lif
         }
     }
 
-    /**
-     */
-    private static class TestMarshaller extends BinaryMarshaller implements LifecycleAware {
-        /** */
-        private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
-
-        /** {@inheritDoc} */
-        @Override public void start() {
-            lifecycleAware.start();
-        }
-
-        /** {@inheritDoc} */
-        @Override public void stop() {
-            lifecycleAware.stop();
-        }
-
-        /**
-         * @return Lifecycle aware.
-         */
-        TestLifecycleAware lifecycleAware() {
-            return lifecycleAware;
-        }
-    }
-
     /**
      */
     private static class TestLogger extends JavaLogger implements LifecycleAware {
@@ -182,12 +157,6 @@ TestLifecycleAware lifecycleAware() {
 
         lifecycleAwares.add(lifecycleBean);
 
-        TestMarshaller marshaller = new TestMarshaller();
-
-        cfg.setMarshaller(marshaller);
-
-        lifecycleAwares.add(marshaller.lifecycleAware());
-
         TestLogger testLog = new TestLogger();
 
         cfg.setGridLogger(testLog);

modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySimpleNameTestPropertySelfTest.java

@@ -20,8 +20,6 @@
 import org.apache.ignite.IgniteBinary;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryObjectBuilder;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.testframework.config.GridTestProperties;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
@@ -32,19 +30,6 @@
  * Tests testing framewrok, epecially BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER test property.
  */
 public class BinarySimpleNameTestPropertySelfTest extends GridCommonAbstractTest {
-    /**
-     * flag for facade disabled test. As we use binary marshaller by default al
-     */
-    private boolean enableJdkMarshaller;
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        final IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName);
-        if (enableJdkMarshaller)
-            configuration.setMarshaller(new JdkMarshaller());
-        return configuration;
-    }
-
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();
@@ -77,16 +62,6 @@ public void testPropertyDisabled() throws Exception {
         checkProperty("org.ignite.test.TestClass");
     }
 
-    /**
-     * Check if Binary facade is disabled test. Test uses JDK marshaller to provide warranty facade is not available
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testBinaryDisabled() throws Exception {
-        enableJdkMarshaller = true;
-        assertNull(startGrid().binary());
-    }
-
     /**
      * @param expTypeName Type name.
      * @throws Exception If failed.

modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java

@@ -28,7 +28,6 @@
 import org.apache.ignite.internal.GridTopic;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.plugin.extensions.communication.MessageReader;
 import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -72,7 +71,6 @@ public GridIoManagerSelfTest() throws IgniteCheckedException {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ctx.config().setCommunicationSpi(new TcpCommunicationSpi());
-        ctx.config().setMarshaller(new JdkMarshaller());
 
         // Turn off peer class loading to simplify mocking.
         ctx.config().setPeerClassLoadingEnabled(false);

modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManagerStopSelfTest.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.GridComponent;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
 import org.apache.ignite.spi.IgniteSpiContext;
 import org.apache.ignite.spi.IgniteSpiException;
 import org.apache.ignite.spi.deployment.DeploymentListener;
@@ -46,7 +45,6 @@ public void testOnKernalStop() throws Exception {
 
         GridTestKernalContext ctx = newContext();
 
-        ctx.config().setMarshaller(new JdkMarshaller());
         ctx.config().setDeploymentSpi(spi);
 
         GridResourceProcessor resProc = new GridResourceProcessor(ctx);

modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java

@@ -50,8 +50,6 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
-        cfg.setMarshaller(new OptimizedMarshaller());
-
         cfg.setWorkDirectory(workDir);
 
         if (cache) {