ignite-471-2: keep fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/119acfd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/119acfd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/119acfd4 Branch: refs/heads/ignite-471-2 Commit: 119acfd4a55190e95dbef751395bf854d247db51 Parents: 713c0e6 Author: Denis Magda <dma...@gridgain.com> Authored: Thu May 21 11:04:20 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu May 21 11:04:20 2015 +0300 ---------------------------------------------------------------------- .../internal/util/nio/GridNioSelfTest.java | 25 +++++++++++--------- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 14 ++++++++++- 3 files changed, 28 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/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 e3baeb0..254d3ed 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 @@ -644,7 +644,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { try { client = createClient(U.getLocalHost(), PORT, U.getLocalHost()); - MessageWithId msg = new MessageWithId(); + MessageWithId msg = new MessageWithId(idProvider.getAndIncrement()); byte[] data = serializeMessage(msg); @@ -746,7 +746,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { client = createClient(U.getLocalHost(), PORT, U.getLocalHost()); while (cntr.getAndIncrement() < MSG_CNT * THREAD_CNT) { - MessageWithId msg = new MessageWithId(); + MessageWithId msg = new MessageWithId(idProvider.getAndIncrement()); byte[] data = serializeMessage(msg); @@ -829,13 +829,11 @@ 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."); } } @@ -904,13 +902,11 @@ 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."); } } @@ -1408,7 +1404,14 @@ public class GridNioSelfTest extends GridCommonAbstractTest { */ private static class MessageWithId implements Serializable { /** */ - private final int id = idProvider.getAndIncrement(); + private final int id; + + /** + * @param id Message ID. + */ + public MessageWithId(int id) { + this.id = id; + } /** */ @SuppressWarnings({"unused"}) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 1a642d4..ed8579f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -55,7 +55,7 @@ public class IgniteBasicTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite Basic Test Suite"); suite.addTest(IgniteLangSelfTestSuite.suite()); - suite.addTest(IgniteUtilSelfTestSuite.suite()); + suite.addTest(IgniteUtilSelfTestSuite.suite(ignoredTests)); suite.addTest(IgniteMarshallerSelfTestSuite.suite(ignoredTests)); suite.addTest(IgniteKernalSelfTestSuite.suite()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/119acfd4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java index 32cd038..92ad2e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java @@ -26,10 +26,13 @@ import org.apache.ignite.internal.util.offheap.unsafe.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.*; +import org.apache.ignite.testframework.*; import org.apache.ignite.thread.*; import org.apache.ignite.util.*; import org.apache.ignite.util.mbeans.*; +import java.util.*; + /** * Test suite for Ignite utility classes. */ @@ -39,6 +42,15 @@ public class IgniteUtilSelfTestSuite extends TestSuite { * @throws Exception If failed. */ public static TestSuite suite() throws Exception { + return suite(null); + } + + /** + * @param ignoredTests Tests don't include in the execution. + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Util Test Suite"); suite.addTestSuite(GridThreadPoolExecutorServiceSelfTest.class); @@ -66,7 +78,7 @@ public class IgniteUtilSelfTestSuite extends TestSuite { suite.addTestSuite(GridNioSessionMetaKeySelfTest.class); suite.addTestSuite(GridNioSelfTest.class); suite.addTestSuite(GridNioFilterChainSelfTest.class); - suite.addTestSuite(GridNioSslSelfTest.class); + GridTestUtils.addTestIfNeeded(suite, GridNioSslSelfTest.class, ignoredTests); suite.addTestSuite(GridNioDelimitedBufferTest.class); return suite;
