#IGNITE-96 Moving 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/e92eb9c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e92eb9c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e92eb9c2 Branch: refs/heads/sprint-1 Commit: e92eb9c2abdeaded5ed91150539eeeedaa5084dc Parents: 7996d1d Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Feb 10 17:35:27 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Feb 10 17:35:59 2015 +0300 ---------------------------------------------------------------------- .../marshaller/GridMarshallerAbstractTest.java | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e92eb9c2/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java index db4c76b..5a2c7f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.marshaller; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; @@ -166,14 +165,14 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean.getObjectField() != null; assert outBean.getObjectField() != null; - assert inBean.getObjectField().getClass().equals(GridCacheProxyImpl.class); - assert outBean.getObjectField().getClass().equals(GridCacheProxyImpl.class); + assert inBean.getObjectField().getClass().equals(IgniteCacheProxy.class); + assert outBean.getObjectField().getClass().equals(IgniteCacheProxy.class); assert inBean != outBean; - GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField(); + IgniteCache<String, String> cache0 = (IgniteCache<String, String>)outBean.getObjectField(); - assertNull(cache0.name()); + assertNull(cache0.getName()); assertEquals("val", cache0.get("key")); outBean.checkNullResources(); @@ -196,14 +195,14 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean.getObjectField() != null; assert outBean.getObjectField() != null; - assert inBean.getObjectField().getClass().equals(GridCacheProxyImpl.class); - assert outBean.getObjectField().getClass().equals(GridCacheProxyImpl.class); + assert inBean.getObjectField().getClass().equals(IgniteCacheProxy.class); + assert outBean.getObjectField().getClass().equals(IgniteCacheProxy.class); assert inBean != outBean; - GridCache<String, String> cache0 = (GridCache<String, String>)outBean.getObjectField(); + IgniteCache<String, String> cache0 = (IgniteCache<String, String>)outBean.getObjectField(); - assertEquals(CACHE_NAME, cache0.name()); + assertEquals(CACHE_NAME, cache0.getName()); assertEquals("val", cache0.get("key")); outBean.checkNullResources(); @@ -820,8 +819,8 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest assert inBean.getObjectField() != null; assert outBean.getObjectField() != null; - assert inBean.getObjectField().getClass().equals(GridCacheAffinityProxy.class); - assert outBean.getObjectField().getClass().equals(GridCacheAffinityProxy.class); + assert inBean.getObjectField().getClass().equals(GridCacheAffinityImpl.class); + assert outBean.getObjectField().getClass().equals(GridCacheAffinityImpl.class); assert inBean != outBean; assert inBean.equals(outBean);
