# ignite-471-2 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df808af9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df808af9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df808af9 Branch: refs/heads/ignite-471-2 Commit: df808af9151821d7b75285016b0512fea5d5e6fe Parents: 661b6af Author: sboikov <sboi...@gridgain.com> Authored: Tue May 26 11:16:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 26 11:16:34 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 4 ++-- .../cacheobject/IgniteCacheObjectProcessor.java | 6 ++---- .../processors/datastreamer/DataStreamerImpl.java | 5 +++-- .../processors/portable/GridPortableInputStream.java | 1 - .../ignite/internal/GridDiscoveryEventSelfTest.java | 14 ++++++++------ .../GridFailFastNodeFailureDetectionSelfTest.java | 6 +++--- .../GridDiscoveryManagerAliveCacheSelfTest.java | 3 ++- .../processors/cache/GridCacheMemoryModeSelfTest.java | 3 +++ ...GridCacheAtomicReferenceMultiNodeAbstractTest.java | 8 -------- .../query/GridCacheSwapScanQueryAbstractSelfTest.java | 5 +++-- .../datastreamer/DataStreamProcessorSelfTest.java | 8 ++++---- .../ignite/internal/util/nio/GridNioSelfTest.java | 12 ++++++++---- .../ignite/internal/util/nio/GridNioSslSelfTest.java | 1 + .../util/tostring/GridToStringBuilderSelfTest.java | 8 +++----- .../ignite/messaging/GridMessagingSelfTest.java | 8 ++------ .../p2p/GridP2PContinuousDeploymentSelfTest.java | 5 ++--- .../apache/ignite/testframework/GridTestUtils.java | 2 +- .../testframework/junits/IgniteTestResources.java | 1 + .../processors/query/h2/sql/GridQueryParsingTest.java | 2 +- 19 files changed, 49 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 37e3f4d..8c18b84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -265,7 +265,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { // Suppress warning if at least one ATOMIC cache found. perf.add("Enable ATOMIC mode if not using transactions (set 'atomicityMode' to ATOMIC)", - cfg.getAtomicityMode() == ATOMIC); + cfg.getAtomicityMode() == ATOMIC); // Suppress warning if at least one non-FULL_SYNC mode found. perf.add("Disable fully synchronous writes (set 'writeSynchronizationMode' to PRIMARY_SYNC or FULL_ASYNC)", @@ -425,7 +425,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cc.getAtomicityMode() == ATOMIC) assertParameter(cc.getTransactionManagerLookupClassName() == null, - "transaction manager can not be used with ATOMIC cache"); + "transaction manager can not be used with ATOMIC cache"); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java index 353f0d5..f2b3ef4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java @@ -18,12 +18,10 @@ package org.apache.ignite.internal.processors.cacheobject; import org.apache.ignite.*; -import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; /** @@ -77,8 +75,7 @@ public interface IgniteCacheObjectProcessor extends GridProcessor { /** * Checks whether given class is portable. * - * @param cls Class. - * @return {@code true} If the class was registered as portable. + * @return {@code true} If portable objects are enabled. */ public boolean isPortableEnabled(); @@ -116,6 +113,7 @@ public interface IgniteCacheObjectProcessor extends GridProcessor { public Object unmarshal(CacheObjectContext ctx, byte[] bytes, ClassLoader clsLdr) throws IgniteCheckedException; /** + * @param ccfg Cache configuration. * @return Cache object context. * @throws IgniteCheckedException If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index baa1a63..40716be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -185,8 +185,9 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed try { this.cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg); - } catch (IgniteCheckedException e) { - throw new IgniteException("Failed to initialize cache context"); + } + catch (IgniteCheckedException e) { + throw new IgniteException("Failed to initialize cache context.", e); } this.cacheName = cacheName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java index 28253d7..501517b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java @@ -36,7 +36,6 @@ public interface GridPortableInputStream extends GridPortableStream { */ public byte[] readByteArray(int cnt); - /** * Reads {@code cnt} of bytes into byte array. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java index 9d3a22d..9d98768 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java @@ -147,8 +147,9 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLeaveSequenceEvents() throws Exception { - throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-932";); - /*try { + fail("https://issues.apache.org/jira/browse/IGNITE-932";); + + try { Ignite g0 = startGrid(0); UUID id0 = g0.cluster().localNode().id(); @@ -209,15 +210,16 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { } finally { stopAllGrids(); - }*/ + } } /** * @throws Exception If failed. */ public void testMixedSequenceEvents() throws Exception { - throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-932";); - /*try { + fail("https://issues.apache.org/jira/browse/IGNITE-932";); + + try { Ignite g0 = startGrid(0); UUID id0 = g0.cluster().localNode().id(); @@ -328,7 +330,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { } finally { stopAllGrids(); - }*/ + } } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java index 563e960..3f5df1c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java @@ -63,9 +63,9 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract * @throws Exception If failed. */ public void testFailFast() throws Exception { - throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-933";); + fail("https://issues.apache.org/jira/browse/IGNITE-933";); - /*startGridsMultiThreaded(5); + startGridsMultiThreaded(5); final CountDownLatch failLatch = new CountDownLatch(4); @@ -100,7 +100,7 @@ public class GridFailFastNodeFailureDetectionSelfTest extends GridCommonAbstract failNode(ignite1); - assert failLatch.await(500, TimeUnit.MILLISECONDS);*/ + assert failLatch.await(500, TimeUnit.MILLISECONDS); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index d2b733d..8c2ce02 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -74,8 +74,9 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe } }; + /** {@inheritDoc} */ @Override protected long getTestTimeout() { - return 10 * 60 * 1000; //10 minutes + return 10 * 60 * 1000; //10 minutes. } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index 8b7d15f..cc3b072 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -79,6 +79,9 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { return cfg; } + /** + * @return Cache configuration. + */ protected CacheConfiguration cacheConfiguration() { CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java index 1d62003..88cd623 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; -import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import java.util.*; @@ -35,13 +34,6 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Igni return GRID_CNT; } - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - return cfg; - } - /** * JUnit. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 91b1e1b..931e3e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -129,8 +129,8 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA cache.getAndPut(new Key(i), new Person("p-" + i, i)); try { - CacheQuery<Map.Entry<Key, Person>> qry = cache.context().queries().createScanQuery - (new QueryFilter(), false); + CacheQuery<Map.Entry<Key, Person>> qry = + cache.context().queries().createScanQuery(new QueryFilter(), false); Collection<Map.Entry<Key, Person>> res = qry.execute().get(); @@ -358,6 +358,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA * */ private static class QueryFilter implements IgniteBiPredicate<Key, Person> { + /** {@inheritDoc} */ @Override public boolean apply(Key key, Person p) { assertEquals(key.id, (Integer)p.salary); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java index 3a1e4b8..280ba95 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java @@ -944,7 +944,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { } /** - * + * @return Stream receiver. */ protected StreamReceiver<String, TestObject> getStreamReceiver() { return new TestDataReceiver(); @@ -975,9 +975,9 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { * */ private static class TestDataReceiver implements StreamReceiver<String, TestObject> { - @Override - public void receive(IgniteCache<String, TestObject> cache, - Collection<Map.Entry<String, TestObject>> entries) { + /** {@inheritDoc} */ + @Override public void receive(IgniteCache<String, TestObject> cache, + Collection<Map.Entry<String, TestObject>> entries) { for (Map.Entry<String, TestObject> e : entries) { assertTrue(e.getKey() instanceof String); assertTrue(e.getValue() instanceof TestObject); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java index 254d3ed..63521e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java @@ -829,11 +829,13 @@ public class GridNioSelfTest extends GridCommonAbstractTest { U.sleep(4000); info("After sleep."); - } catch (Exception e) { + } + catch (Exception e) { error("Failed to create client: " + e.getMessage()); fail("Failed to create client: " + e.getMessage()); - } finally { + } + finally { info("Test thread finished."); } } @@ -902,11 +904,13 @@ public class GridNioSelfTest extends GridCommonAbstractTest { U.sleep(4000); info("After sleep."); - } catch (Exception e) { + } + catch (Exception e) { error("Failed to create client: ", e); fail("Failed to create client: " + e.getMessage()); - } finally { + } + finally { info("Test thread finished."); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java index 35fe2fa..930b5d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java @@ -36,6 +36,7 @@ public class GridNioSslSelfTest extends GridNioSelfTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); + sslCtx = GridTestUtils.sslContext(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java index 26b5a2f..de6cd85 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java @@ -70,21 +70,19 @@ public class GridToStringBuilderSelfTest extends GridCommonAbstractTest { } /** - * TODO: IGNITE-602. - * * @throws Exception If failed. */ public void testToStringCheckAdvancedRecursionPrevention() throws Exception { - throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-602";); + fail("https://issues.apache.org/jira/browse/IGNITE-602";); - /*ArrayList<Object> list1 = new ArrayList<>(); + ArrayList<Object> list1 = new ArrayList<>(); ArrayList<Object> list2 = new ArrayList<>(); list2.add(list1); list1.add(list2); GridToStringBuilder.toString(ArrayList.class, list1, "name", list2); - GridToStringBuilder.toString(ArrayList.class, list2, "name", list1);*/ + GridToStringBuilder.toString(ArrayList.class, list2, "name", list1); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 36c2a9f..2090d36 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -890,6 +890,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { /** * @param expOldestIgnite Expected oldest ignite. + * @throws InterruptedException If interrupted. */ private void remoteListenForOldest(Ignite expOldestIgnite) throws InterruptedException { ClusterGroup grp = ignite1.cluster().forOldest(); @@ -919,8 +920,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override public boolean apply(UUID nodeId, Object msg) { - log.info(Thread.currentThread().getName() + - " Listener received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']'); + log.info("Listener received new message [msg=" + msg + ", senderNodeId=" + nodeId + ']'); msgCnt.incrementAndGet(); @@ -928,7 +928,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { } } - /** * */ @@ -1000,7 +999,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { } } - /** * */ @@ -1081,7 +1079,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { } } - /** * */ @@ -1110,5 +1107,4 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { } } } - } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index 849b271..6b3ad63 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -98,8 +98,8 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest */ @SuppressWarnings("unchecked") public void testDeployment() throws Exception { - throw new IgniteCheckedException("https://issues.apache.org/jira/browse/IGNITE-934";); - /* + fail("https://issues.apache.org/jira/browse/IGNITE-934";); + Ignite ignite = startGrid(GRID_NAME); Class cls = getExternalClassLoader().loadClass(TEST_TASK_1); @@ -115,6 +115,5 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest compute(ignite.cluster().forRemotes()).execute(cls, null); stopGrid(GRID_NAME); - */ } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index ac3e939..e2dda54 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1462,7 +1462,7 @@ public final class GridTestUtils { double dur = (System.currentTimeMillis() - startTime) / 1000d; System.out.printf("%s:\n operations:%d, duration=%fs, op/s=%d, latency=%fms\n", name, cnt, dur, - (long)(cnt / dur), dur / cnt); + (long)(cnt / dur), dur / cnt); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 734eb51..6da6049 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -197,6 +197,7 @@ public class IgniteTestResources { } /** + * @param cls Class. * @return Logger for specified class. */ public static IgniteLogger getLogger(Class<?> cls) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df808af9/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index f03785a..c4d2481 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -89,7 +89,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { } /** - * + * @throws Exception If failed. */ public void testAllExamples() throws Exception { checkQuery("select ? limit ? offset ?");
