Repository: ignite
Updated Branches:
  refs/heads/ignite-950-new 4b73226f3 -> 0b23b04f3


IGNITE-950-new - Fixing tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b23b04f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b23b04f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b23b04f

Branch: refs/heads/ignite-950-new
Commit: 0b23b04f3057f7a568bca90a8cd8be939eb7680e
Parents: 4b73226
Author: Alexey Goncharuk <[email protected]>
Authored: Sun Nov 1 13:24:58 2015 +0300
Committer: Alexey Goncharuk <[email protected]>
Committed: Sun Nov 1 13:24:58 2015 +0300

----------------------------------------------------------------------
 .../portable/GridPortableMarshallerCtxDisabledSelfTest.java    | 3 ++-
 .../cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java  | 2 +-
 .../portable/GridPortableCacheEntryMemorySizeSelfTest.java     | 3 ++-
 .../Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml  | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b23b04f/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
index d6e5a26..6aff7e6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
@@ -23,6 +23,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Arrays;
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.MarshallerContextAdapter;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.marshaller.portable.PortableMarshaller;
@@ -55,7 +56,7 @@ public class GridPortableMarshallerCtxDisabledSelfTest 
extends GridCommonAbstrac
         PortableMarshaller marsh = new PortableMarshaller();
         marsh.setContext(new MarshallerContextWithNoStorage());
 
-        PortableContext context = new PortableContext(META_HND, null);
+        PortableContext context = new PortableContext(META_HND, new 
IgniteConfiguration());
 
         IgniteUtils.invoke(PortableMarshaller.class, marsh, 
"setPortableContext", context);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b23b04f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index 33c2b53..cd82739 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -169,7 +169,7 @@ public abstract class 
GridCacheOffHeapTieredEvictionAbstractSelfTest extends Gri
      * @throws Exception If failed.
      */
     public void testTransform() throws Exception {
-        final IgniteCache<Integer, Object> cache = grid(0).cache(null);
+        final IgniteCache<Integer, Object> cache = 
grid(0).cache(null).withKeepBinary();
 
         GridTestUtils.runMultiThreaded(new Callable<Void>() {
             @Override public Void call() throws Exception {

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b23b04f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
index 5799017..eaa057a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache.portable;
 
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.portable.PortableContext;
 import org.apache.ignite.internal.portable.PortableMetaDataHandler;
 import 
org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest;
@@ -46,7 +47,7 @@ public class GridPortableCacheEntryMemorySizeSelfTest extends 
GridCacheEntryMemo
             @Override public IgniteObjectMetadata metadata(int typeId) throws 
IgniteObjectException {
                 return null;
             }
-        }, null);
+        }, new IgniteConfiguration());
 
         IgniteUtils.invoke(PortableMarshaller.class, marsh, 
"setPortableContext", pCtx);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b23b04f/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
----------------------------------------------------------------------
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
index 183676b..27ddc21 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml
@@ -72,13 +72,13 @@
             <bean 
class="org.apache.ignite.marshaller.portable.PortableMarshaller">
                 <property name="typeConfigurations">
                     <list>
-                        <bean 
class="org.apache.ignite.portable.PortableTypeConfiguration">
+                        <bean 
class="org.apache.ignite.igniteobject.IgniteObjectConfiguration">
                             <property name="className" 
value="org.apache.ignite.platform.PlatformComputePortable"/>
                         </bean>
-                        <bean 
class="org.apache.ignite.portable.PortableTypeConfiguration">
+                        <bean 
class="org.apache.ignite.igniteobject.IgniteObjectConfiguration">
                             <property name="className" 
value="org.apache.ignite.platform.PlatformComputeJavaPortable"/>
                         </bean>
-                        <bean 
class="org.apache.ignite.portable.PortableTypeConfiguration">
+                        <bean 
class="org.apache.ignite.igniteobject.IgniteObjectConfiguration">
                             <property name="className" 
value="org.apache.ignite.platform.PlatformComputeEnum"/>
                         </bean>
                     </list>

Reply via email to