You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sh...@apache.org on 2016/11/07 04:30:09 UTC
[22/50] [abbrv] ignite git commit: Merge branch 'ignite-1.6.9' into
ignite-1.7.3
Merge branch 'ignite-1.6.9' into ignite-1.7.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/36087cfa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36087cfa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/36087cfa
Branch: refs/heads/ignite-2788
Commit: 36087cfa6867d29e7db56cf47e7a87b5aa9b63dc
Parents: b590233 de50287
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Oct 3 10:48:50 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Oct 3 10:48:50 2016 +0300
----------------------------------------------------------------------
.../client/ClientReconnectionSelfTest.java | 4 +-
.../client/router/TcpSslRouterSelfTest.java | 7 +-
.../client/suite/IgniteClientTestSuite.java | 71 +++----
.../internal/binary/BinaryClassDescriptor.java | 16 +-
.../internal/binary/BinaryEnumObjectImpl.java | 5 +
.../ignite/internal/binary/BinaryObjectEx.java | 8 +
.../internal/binary/BinaryObjectImpl.java | 7 +
.../binary/BinaryObjectOffheapImpl.java | 7 +
.../ignite/internal/binary/BinaryUtils.java | 5 +-
.../internal/binary/BinaryWriterExImpl.java | 6 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 11 +-
.../processors/cache/GridCacheAdapter.java | 7 +
.../processors/cache/GridCacheUtils.java | 5 +
.../distributed/near/GridNearCacheAdapter.java | 7 +
.../query/GridCacheQueryMetricsAdapter.java | 12 +-
.../ignite/internal/util/IgniteUtils.java | 23 ++-
.../cache/VisorCacheResetQueryMetricsTask.java | 69 +++++++
...ridCacheStoreManagerDeserializationTest.java | 1 +
.../cache/GridCacheUtilsSelfTest.java | 64 +++++-
...calCacheStoreManagerDeserializationTest.java | 2 +-
...niteCacheExpireAndUpdateConsistencyTest.java | 7 +
.../GridCacheBinaryObjectsAbstractSelfTest.java | 37 ++++
.../ignite/testframework/IgniteTestSuite.java | 203 ++++++++++++++++---
.../testframework/junits/GridAbstractTest.java | 31 ++-
.../apache/ignite/testsuites/IgniteIgnore.java | 2 +-
modules/ignored-tests/pom.xml | 128 +++++++++++-
.../testsuites/IgniteIgnoredTestSuite.java | 9 +
.../CacheAbstractQueryMetricsSelfTest.java | 6 +-
...titionedCacheJtaLookupClassNameSelfTest.java | 4 +-
.../ignite/testsuites/IgniteJtaTestSuite.java | 3 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 7 +-
.../testsuites/IgniteResourceSelfTestSuite.java | 11 +-
.../testsuites/IgniteSpringTestSuite.java | 15 +-
33 files changed, 676 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/36087cfa/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/36087cfa/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
----------------------------------------------------------------------
diff --cc modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
index 135714f,fff8108..671d339
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@@ -46,10 -46,9 +47,10 @@@ public class IgniteSpringTestSuite exte
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite("Spring Test Suite");
+ TestSuite suite = new IgniteTestSuite("Spring Test Suite");
suite.addTestSuite(GridSpringBeanSerializationSelfTest.class);
+ suite.addTestSuite(IgniteSpringBeanTest.class);
suite.addTestSuite(GridFactorySelfTest.class);
suite.addTest(IgniteResourceSelfTestSuite.suite());