You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/20 12:46:47 UTC
incubator-ignite git commit: ignite-471-2: fixed data streamer bug
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 19d3aac7c -> 12c6d4a91
ignite-471-2: fixed data streamer bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12c6d4a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12c6d4a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12c6d4a9
Branch: refs/heads/ignite-471-2
Commit: 12c6d4a9120137055c687b75d3bf5964b61c9c91
Parents: 19d3aac
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed May 20 13:46:25 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed May 20 13:46:25 2015 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamProcessorSelfTest.java | 15 +++++++++++----
.../ignite/testsuites/IgniteCacheTestSuite.java | 14 +++++++++++++-
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c6d4a9/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 8233b9d..cbf834a 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
@@ -890,7 +890,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
try (IgniteDataStreamer<String, TestObject> ldr = ignite.dataStreamer(null)) {
ldr.allowOverwrite(true);
- ldr.receiver(new TestDataReceiver());
+ ldr.receiver(getStreamReceiver());
for (int i = 0; i < 100; i++)
ldr.addData(String.valueOf(i), new TestObject(i));
@@ -913,14 +913,14 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class TestObject {
+ protected static class TestObject {
/** Value. */
- private final int val;
+ public final int val;
/**
* @param val Value.
*/
- private TestObject(int val) {
+ public TestObject(int val) {
this.val = val;
}
@@ -946,6 +946,13 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest {
/**
*
*/
+ protected StreamReceiver<String, TestObject> getStreamReceiver() {
+ return new TestDataReceiver();
+ }
+
+ /**
+ *
+ */
@SuppressWarnings("PublicInnerClass")
public static class TestStore extends CacheStoreAdapter<Object, Object> {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12c6d4a9/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 3fa3d9d..2dfa1e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -29,6 +29,9 @@ import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.datastreamer.*;
+import org.apache.ignite.testframework.*;
+
+import java.util.*;
/**
* Test suite.
@@ -39,6 +42,15 @@ public class IgniteCacheTestSuite extends TestSuite {
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
+ return suite(null);
+ }
+
+ /**
+ * @param ignoredTests
+ * @return Test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite(Set<Class> ignoredTests) throws Exception {
TestSuite suite = new TestSuite("IgniteCache Test Suite");
suite.addTestSuite(IgniteCacheEntryListenerAtomicTest.class);
@@ -107,7 +119,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(GridCacheBalancingStoreSelfTest.class);
suite.addTestSuite(GridCacheAffinityApiSelfTest.class);
suite.addTestSuite(GridCacheStoreValueBytesSelfTest.class);
- suite.addTestSuite(DataStreamProcessorSelfTest.class);
+ GridTestUtils.addTestIfNeeded(suite, DataStreamProcessorSelfTest.class, ignoredTests);
suite.addTestSuite(DataStreamerMultiThreadedSelfTest.class);
suite.addTestSuite(DataStreamerImplSelfTest.class);
suite.addTestSuite(GridCacheEntryMemorySizeSelfTest.class);