You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/14 10:20:37 UTC
[1/2] ignite git commit: IGNITE-2150: Fixed invalid test scenario.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 345fc27d9 -> f3cc98b18
IGNITE-2150: Fixed invalid test scenario.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fdea7cfa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fdea7cfa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fdea7cfa
Branch: refs/heads/ignite-1.5
Commit: fdea7cfaf6ea26834d2694cbfc9634de8d24209b
Parents: 3db1448
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 12:21:17 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 12:21:17 2015 +0300
----------------------------------------------------------------------
.../binary/BinaryMarshallerSelfTest.java | 42 --------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fdea7cfa/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 4ecad09..b83bbad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -2299,41 +2299,6 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testCyclicReferencesMarshalling() throws Exception {
- BinaryMarshaller marsh = binaryMarshaller();
-
- SimpleObject obj = simpleObject();
-
- obj.bArr = obj.inner.bArr;
- obj.cArr = obj.inner.cArr;
- obj.boolArr = obj.inner.boolArr;
- obj.sArr = obj.inner.sArr;
- obj.strArr = obj.inner.strArr;
- obj.iArr = obj.inner.iArr;
- obj.lArr = obj.inner.lArr;
- obj.fArr = obj.inner.fArr;
- obj.dArr = obj.inner.dArr;
- obj.dateArr = obj.inner.dateArr;
- obj.uuidArr = obj.inner.uuidArr;
- obj.objArr = obj.inner.objArr;
- obj.bdArr = obj.inner.bdArr;
- obj.map = obj.inner.map;
- obj.col = obj.inner.col;
- obj.mEntry = obj.inner.mEntry;
-
- SimpleObject res = (SimpleObject)marshalUnmarshal(obj, marsh);
-
- assertEquals(obj, res);
-
- assertTrue(res.objArr == res.inner.objArr);
- assertTrue(res.map == res.inner.map);
- assertTrue(res.col == res.inner.col);
- assertTrue(res.mEntry == res.inner.mEntry);
- }
-
- /**
- * @throws Exception If failed.
- */
public void testProxy() throws Exception {
BinaryMarshaller marsh = binaryMarshaller();
@@ -2799,8 +2764,6 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
inner.map.put(2, "str2");
inner.map.put(3, "str3");
- inner.mEntry = inner.map.entrySet().iterator().next();
-
SimpleObject outer = new SimpleObject();
outer.b = 2;
@@ -2843,8 +2806,6 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
outer.map.put(5, "str5");
outer.map.put(6, "str6");
- outer.mEntry = outer.map.entrySet().iterator().next();
-
return outer;
}
@@ -3144,9 +3105,6 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private TestEnum[] enumArr;
/** */
- private Map.Entry<Integer, String> mEntry;
-
- /** */
private SimpleObject inner;
/** {@inheritDoc} */
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3cc98b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3cc98b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3cc98b1
Branch: refs/heads/ignite-1.5
Commit: f3cc98b189dd4c4a4ad6325e6b9a6fa6db795099
Parents: fdea7cf 345fc27
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 12:21:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 12:21:38 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 26 ++-
.../resources/META-INF/classnames.properties | 68 ++++---
.../cache/GridCacheAbstractFullApiSelfTest.java | 25 ++-
...ContinuousQueryFailoverAbstractSelfTest.java | 186 ++++++++++---------
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 10 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 16 ++
7 files changed, 203 insertions(+), 132 deletions(-)
----------------------------------------------------------------------