This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 957638c0ab9 IGNITE-24044 Refactor tests to remove deprecated
GridClient (#12247)
957638c0ab9 is described below
commit 957638c0ab9e9295274dd8ed777a1dd6aba00d7b
Author: Nikita Amelchev <[email protected]>
AuthorDate: Tue Aug 5 15:49:18 2025 +0300
IGNITE-24044 Refactor tests to remove deprecated GridClient (#12247)
---
.../client/suite/IgniteClientTestSuite.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../processors/rest/RestProtocolStartTest.java | 176 +++++++++++++++++++++
.../internal/processors/rest/TestBinaryClient.java | 37 +++--
...inaryConfigurationCustomSerializerSelfTest.java | 155 ------------------
.../processors/rest/RestProtocolStartTest.java | 136 ----------------
.../testsuites/IgniteBinaryObjectsTestSuite.java | 2 -
.../testsuites/IgniteRestHandlerTestSuite.java | 2 -
8 files changed, 200 insertions(+), 314 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index e3ae3198371..5a22b91b9e1 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -73,6 +73,7 @@ import
org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
import org.apache.ignite.internal.processors.rest.RestMemcacheProtocolSelfTest;
import
org.apache.ignite.internal.processors.rest.RestProcessorMultiStartSelfTest;
import org.apache.ignite.internal.processors.rest.RestProcessorStartSelfTest;
+import org.apache.ignite.internal.processors.rest.RestProtocolStartTest;
import org.apache.ignite.internal.processors.rest.TaskCommandHandlerSelfTest;
import
org.apache.ignite.internal.processors.rest.TcpRestUnmarshalVulnerabilityTest;
import
org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRedisParserSelfTest;
@@ -195,7 +196,8 @@ import org.junit.runners.Suite;
CacheEventSecurityContextTest.class,
RebalanceCacheEventSecurityContextTest.class,
ClusterStateChangeEventSecurityContextTest.class,
- ComputeTaskPermissionsTest.class
+ ComputeTaskPermissionsTest.class,
+ RestProtocolStartTest.class
})
public class IgniteClientTestSuite {
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 95ded66cb3f..714717c4aeb 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -73,7 +73,7 @@ public class RestBinaryProtocolSelfTest extends
GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- client.shutdown();
+ client.close();
grid().cache(DEFAULT_CACHE_NAME).clear();
grid().cache(CACHE_NAME).clear();
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
new file mode 100644
index 00000000000..71b5dc860db
--- /dev/null
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
@@ -0,0 +1,176 @@
+/*
+ * 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.internal.processors.rest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.configuration.ConnectorConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgnitionEx;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.plugin.AbstractTestPluginProvider;
+import org.apache.ignite.plugin.PluginContext;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.spi.metric.IntMetric;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+
+import static
org.apache.ignite.configuration.ConnectorConfiguration.DFLT_TCP_PORT;
+import static
org.apache.ignite.internal.client.integration.ClientAbstractSelfTest.HOST;
+import static
org.apache.ignite.internal.processors.rest.protocols.tcp.GridTcpRestProtocol.REST_CONNECTOR_METRIC_REGISTRY_NAME;
+import static
org.apache.ignite.internal.util.nio.GridNioServer.SESSIONS_CNT_METRIC_NAME;
+import static
org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause;
+
+/**
+ * Test of start rest protocol and stop node.
+ */
+public class RestProtocolStartTest extends GridCommonAbstractTest {
+ /** */
+ private static final CountDownLatch cliConnected = new CountDownLatch(1);
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName)
+ .setConnectorConfiguration(new ConnectorConfiguration())
+ .setPluginProviders(new TestRestProcessorProvider());
+ }
+
+ /** */
+ @Test
+ public void test() throws Exception {
+ IgniteInternalFuture startFut = GridTestUtils.runAsync(
+ () -> assertThrowsWithCause(() -> startGrid(0),
IgniteCheckedException.class));
+
+ FailingGridRestProtocol.restStarted.await();
+
+ IgniteInternalFuture<Object> cliFut = GridTestUtils.runAsync(() -> {
+ try (TestBinaryClient client = new TestBinaryClient(HOST,
DFLT_TCP_PORT)) {
+ // No-op.
+ }
+ catch (RuntimeException e) {
+ if (!"Client disconnected".equals(e.getMessage()))
+ throw e;
+ }
+ });
+
+ IntMetric restSessions =
IgnitionEx.gridx(getTestIgniteInstanceName(0)).context().metric()
+
.registry(REST_CONNECTOR_METRIC_REGISTRY_NAME).findMetric(SESSIONS_CNT_METRIC_NAME);
+
+ GridTestUtils.waitForCondition(() -> restSessions.value() > 0,
getTestTimeout());
+
+ cliConnected.countDown();
+
+ try {
+ startFut.get(10_000);
+ }
+ catch (IgniteFutureTimeoutCheckedException e) {
+ fail("Node has hang.");
+ }
+
+ cliFut.get();
+ }
+
+ /** Test implementation of {@link PluginProvider} for obtaining {@link
TestGridRestProcessorImpl}. */
+ private static class TestRestProcessorProvider extends
AbstractTestPluginProvider {
+ /** {@inheritDoc} */
+ @Override public String name() {
+ return "TEST_REST_PROCESSOR";
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Object createComponent(PluginContext ctx,
Class cls) {
+ if (cls.equals(IgniteRestProcessor.class))
+ return new
TestGridRestProcessorImpl(((IgniteEx)ctx.grid()).context());
+
+ return null;
+ }
+ }
+
+ /** Test no-op implementation of {@link IgniteRestProcessor}. */
+ private static class TestGridRestProcessorImpl extends GridRestProcessor {
+ /** @param ctx Context. */
+ public TestGridRestProcessorImpl(GridKernalContext ctx) {
+ super(ctx);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start() throws IgniteCheckedException {
+ Collection<GridRestProtocol> protos = U.field(this, "protos");
+
+ ArrayList<GridRestProtocol> testProtos = new ArrayList<>();
+
+ testProtos.add(new FailingGridRestProtocol());
+ testProtos.addAll(protos);
+
+ protos.clear();
+ protos.addAll(testProtos);
+
+ super.start();
+ }
+ }
+
+ /** */
+ private static class FailingGridRestProtocol implements GridRestProtocol {
+ /** */
+ private static final CountDownLatch restStarted = new
CountDownLatch(1);
+
+ /** {@inheritDoc} */
+ @Override public String name() {
+ return "FailingGridRestProtocol";
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<IgniteBiTuple<String, Object>>
getProperties() {
+ return Collections.emptyList();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start(GridRestProtocolHandler hnd) { }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() { }
+
+ /** {@inheritDoc} */
+ @Override public void stop() { }
+
+ /** {@inheritDoc} */
+ @Override public void onProcessorStart() {
+ restStarted.countDown();
+
+ try {
+ cliConnected.await();
+ }
+ catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
+ throw new IgniteException("Test exception");
+ }
+ }
+}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
index 6366f662d32..c8eb5fe183f 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
@@ -65,7 +65,7 @@ import static
org.apache.ignite.internal.processors.rest.client.message.GridClie
/**
* Test client.
*/
-final class TestBinaryClient {
+final class TestBinaryClient implements AutoCloseable {
/** Logger. */
private final IgniteLogger log = new JavaLogger();
@@ -122,6 +122,9 @@ final class TestBinaryClient {
// Wait for handshake response.
int read = input.read(buf);
+ if (read == -1)
+ throw new RuntimeException("Client disconnected");
+
assert read == 2 : read;
assert buf[0] == GridMemcachedMessage.IGNITE_HANDSHAKE_RES_FLAG;
@@ -225,22 +228,6 @@ final class TestBinaryClient {
rdr.start();
}
- /** */
- public void shutdown() throws IgniteCheckedException {
- try {
- if (rdr != null) {
- rdr.interrupt();
-
- U.closeQuiet(sock);
-
- rdr.join();
- }
- }
- catch (InterruptedException e) {
- throw new IgniteCheckedException(e);
- }
- }
-
/**
* Makes request to server and waits for response.
*
@@ -598,6 +585,22 @@ final class TestBinaryClient {
return makeRequest(msg).getObject();
}
+ /** {@inheritDoc} */
+ @Override public void close() throws Exception {
+ try {
+ if (rdr != null) {
+ rdr.interrupt();
+
+ U.closeQuiet(sock);
+
+ rdr.join();
+ }
+ }
+ catch (InterruptedException e) {
+ throw new IgniteCheckedException(e);
+ }
+ }
+
/**
* Response data.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
deleted file mode 100644
index 457955c712d..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryConfigurationCustomSerializerSelfTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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.internal.binary;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.UUID;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.binary.BinaryReader;
-import org.apache.ignite.binary.BinarySerializer;
-import org.apache.ignite.binary.BinaryTypeConfiguration;
-import org.apache.ignite.binary.BinaryWriter;
-import org.apache.ignite.configuration.BinaryConfiguration;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.ConnectorConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientFactory;
-import org.apache.ignite.internal.client.GridClientProtocol;
-import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer;
-import org.apache.ignite.internal.management.SystemViewCommandArg;
-import org.apache.ignite.internal.management.SystemViewTask;
-import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
-
-import static
org.apache.ignite.internal.processors.cache.ClusterCachesInfo.CACHES_VIEW;
-
-/**
- * Tests that node will start with custom binary serializer and thin client
will connect to such node.
- */
-public class BinaryConfigurationCustomSerializerSelfTest extends
GridCommonAbstractTest {
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- cfg.setConnectorConfiguration(new ConnectorConfiguration());
-
- BinaryConfiguration binaryCfg = new BinaryConfiguration();
-
- BinaryTypeConfiguration btc = new
BinaryTypeConfiguration("org.MyClass");
-
- btc.setIdMapper(BinaryContext.defaultIdMapper());
- btc.setEnum(false);
-
- // Set custom serializer that is unknown for Optimized marshaller.
- btc.setSerializer(new MyBinarySerializer());
-
- binaryCfg.setTypeConfigurations(Collections.singletonList(btc));
-
- cfg.setBinaryConfiguration(binaryCfg);
-
- // Set custom consistent ID that unknown for Optimized marshaller.
- cfg.setConsistentId(new MyConsistentId("test"));
-
- cfg.setCacheConfiguration(new CacheConfiguration("TEST"));
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- startGrids(2);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- stopAllGrids();
- }
-
- /**
- * Test that thin client will be able to connect to node with custom
binary serializer and custom consistent ID.
- *
- * @throws Exception If failed.
- */
- @Test
- public void testThinClientConnected() throws Exception {
- UUID nid = ignite(0).cluster().localNode().id();
-
- GridClientConfiguration clnCfg = new GridClientConfiguration();
-
- clnCfg.setProtocol(GridClientProtocol.TCP);
- clnCfg.setServers(Collections.singleton("127.0.0.1:11211"));
- clnCfg.setBalancer(new GridClientRoundRobinBalancer());
-
- // Start client.
- GridClient client = GridClientFactory.start(clnCfg);
-
- // Execute some task.
- SystemViewCommandArg arg = new SystemViewCommandArg();
-
- arg.systemViewName(CACHES_VIEW);
-
- client.compute().execute(SystemViewTask.class.getName(),
- new VisorTaskArgument<>(nid, arg, false));
-
- GridClientFactory.stop(client.id(), false);
- }
-
- /**
- * Custom consistent ID.
- */
- private static class MyConsistentId implements Serializable {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** Actual ID. */
- private String id;
-
- /**
- * @param id Actual ID.
- */
- MyConsistentId(String id) {
- this.id = id;
- }
-
- /**
- * @return Consistent ID.
- */
- public String getId() {
- return id;
- }
- }
-
- /**
- * Custom BinarySerializer.
- */
- private static class MyBinarySerializer implements BinarySerializer {
- /** {@inheritDoc} */
- @Override public void writeBinary(Object obj, BinaryWriter writer)
throws BinaryObjectException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void readBinary(Object obj, BinaryReader reader)
throws BinaryObjectException {
- // No-op.
- }
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
deleted file mode 100644
index e014549c644..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/RestProtocolStartTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.internal.processors.rest;
-
-import java.util.Collections;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.ConnectorConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.TestRecordingCommunicationSpi;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientException;
-import org.apache.ignite.internal.client.GridClientFactory;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
-import org.apache.ignite.plugin.segmentation.SegmentationPolicy;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
-
-/**
- * Test of start rest protocol and stop node.
- */
-public class RestProtocolStartTest extends GridCommonAbstractTest {
- /** Failure detection timeout. */
- private static final int FAILURE_DETECTION_TIMEOUT = 2_000;
-
- /** Node local host. */
- private static final String HOST = "127.0.0.1";
-
- /** Binary rest port. */
- private static final int BINARY_PORT = 11212;
-
- /** Recording communication spi. */
- private TestRecordingCommunicationSpi recordingCommunicationSpi = new
TestRecordingCommunicationSpi();
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
- return super.getConfiguration(igniteInstanceName)
- .setConsistentId(igniteInstanceName)
- .setSystemWorkerBlockedTimeout(10_000)
- .setFailureDetectionTimeout(FAILURE_DETECTION_TIMEOUT)
- .setSegmentationPolicy(SegmentationPolicy.STOP) // Handle
segmentation instead of NoOpFailureHandler.
- .setCacheConfiguration(new CacheConfiguration(DEFAULT_CACHE_NAME)
- .setAffinity(new RendezvousAffinityFunction(false, 8)))
-
.setCommunicationSpi(igniteInstanceName.equals(getTestIgniteInstanceName(0))
- ? recordingCommunicationSpi :
- new TestRecordingCommunicationSpi())
- .setLocalHost(HOST)
- .setConnectorConfiguration(
- getTestIgniteInstanceName(1).equals(igniteInstanceName)
- ? new ConnectorConfiguration()
- .setPort(BINARY_PORT) : null);
- }
-
- /**
- *
- */
- @Test
- public void test() throws Exception {
- Ignite ignite = startGrids(2);
-
-
recordingCommunicationSpi.blockMessages(GridDhtPartitionSupplyMessage.class,
getTestIgniteInstanceName(1));
-
- info("Bock supply messages.");
-
- ignite(1).close();
-
- try (IgniteDataStreamer streamer =
ignite.dataStreamer(DEFAULT_CACHE_NAME)) {
- for (int i = 0; i < 100; i++)
- streamer.addData(i, i);
- }
-
- IgniteInternalFuture startFut = GridTestUtils.runAsync(() -> {
- try {
- startGrid(1);
-
- fail("Node should not started before rebalance completed.");
- }
- catch (Exception e) {
- assertEquals("Err = " + e.getMessage(), e.getClass(),
IgniteInterruptedCheckedException.class);
- }
- });
-
- assertTrue("Is active " + ignite.cluster().state().active(),
ignite.cluster().state().active());
-
- GridClient gridClient = client();
-
-
((TcpDiscoverySpi)ignite.configuration().getDiscoverySpi()).brakeConnection();
-
- doSleep(FAILURE_DETECTION_TIMEOUT);
-
- recordingCommunicationSpi.stopBlock();
-
- try {
- startFut.get(10_000);
- }
- catch (IgniteFutureTimeoutCheckedException e) {
- fail("Failed to wait rebalance completed. Node has hang.");
- }
-
- assertTrue("Is active " + ignite.cluster().state().active(),
ignite.cluster().state().active());
- }
-
- /**
- * @return Client.
- * @throws GridClientException In case of error.
- */
- protected GridClient client() throws GridClientException {
- return GridClientFactory.start(new GridClientConfiguration()
- .setConnectTimeout(300)
- .setServers(Collections
- .singleton(HOST + ":" + BINARY_PORT)));
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 818c8fc5356..ad72641031e 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -22,7 +22,6 @@ import org.apache.ignite.internal.binary.BinaryArraySelfTest;
import org.apache.ignite.internal.binary.BinaryBasicIdMapperSelfTest;
import org.apache.ignite.internal.binary.BinaryBasicNameMapperSelfTest;
import
org.apache.ignite.internal.binary.BinaryConfigurationConsistencySelfTest;
-import
org.apache.ignite.internal.binary.BinaryConfigurationCustomSerializerSelfTest;
import org.apache.ignite.internal.binary.BinaryContextPredefinedTypesTest;
import org.apache.ignite.internal.binary.BinaryEnumsSelfTest;
import org.apache.ignite.internal.binary.BinaryFieldExtractionSelfTest;
@@ -113,7 +112,6 @@ import org.junit.runners.Suite;
BinaryArrayIdentityResolverSelfTest.class,
BinaryConfigurationConsistencySelfTest.class,
- BinaryConfigurationCustomSerializerSelfTest.class,
GridBinaryMarshallerCtxDisabledSelfTest.class,
BinaryObjectBuilderDefaultMappersSelfTest.class,
BinaryObjectBuilderSimpleNameLowerCaseMappersSelfTest.class,
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
index 07c593d6998..28a820610b4 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
@@ -19,7 +19,6 @@ package org.apache.ignite.testsuites;
import org.apache.ignite.internal.processors.rest.RestProcessorHangTest;
import
org.apache.ignite.internal.processors.rest.RestProcessorInitializationTest;
-import org.apache.ignite.internal.processors.rest.RestProtocolStartTest;
import
org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheAtomicCommandHandlerSelfTest;
import
org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandlerSelfTest;
import
org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheMetadataCommandTest;
@@ -40,7 +39,6 @@ import org.junit.runners.Suite;
GridLogCommandHandlerTest.class,
GridQueryCommandHandlerTest.class,
CacheTopologyCommandHandlerTest.class,
- RestProtocolStartTest.class,
RestProcessorInitializationTest.class,
RestProcessorHangTest.class
})
