ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject incubator-ignite git commit: IGNITE-141 - Marshallers refactoring
Date Tue, 03 Mar 2015 01:38:45 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-141 35df737ec -> 7032bdd15


IGNITE-141 - Marshallers refactoring


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

Branch: refs/heads/ignite-141
Commit: 7032bdd1559acf5376792579db33f07a702c9688
Parents: 35df737
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Mon Mar 2 17:39:29 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Mon Mar 2 17:39:29 2015 -0800

----------------------------------------------------------------------
 .../ignite/testframework/junits/GridAbstractTest.java  |  6 +-----
 .../testframework/junits/GridTestKernalContext.java    | 13 +++----------
 .../testframework/junits/IgniteTestResources.java      | 12 +++---------
 3 files changed, 7 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7032bdd1/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index e6a0ebd..bd33265 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -370,11 +370,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Test kernal context.
      */
     protected GridTestKernalContext newContext() {
-        GridTestKernalContext ctx = new GridTestKernalContext();
-
-        ctx.config().setGridLogger(log());
-
-        return ctx;
+        return new GridTestKernalContext(log());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7032bdd1/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
index 4b5244c..afce47b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
@@ -32,10 +32,10 @@ import java.util.concurrent.*;
  */
 public class GridTestKernalContext extends GridKernalContextImpl {
     /**
-     *
+     * @param log Logger to use in context config.
      */
-    public GridTestKernalContext() {
-        super(null,
+    public GridTestKernalContext(IgniteLogger log) {
+        super(new GridLoggerProxy(log, null, null, null),
             new IgniteKernal(null),
             new IgniteConfiguration(),
             new GridKernalGatewayImpl(null),
@@ -49,13 +49,6 @@ public class GridTestKernalContext extends GridKernalContextImpl {
             null);
 
         GridTestUtils.setFieldValue(grid(), "cfg", config());
-    }
-
-    /**
-     * @param log Logger to use in context config.
-     */
-    public GridTestKernalContext(IgniteLogger log) {
-        this();
 
         config().setGridLogger(log);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7032bdd1/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 7af1e72..583c082 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -70,9 +70,7 @@ public class IgniteTestResources {
         home = U.getIgniteHome();
         locHost = localHost();
 
-        GridTestKernalContext ctx = new GridTestKernalContext();
-
-        ctx.config().setGridLogger(log);
+        GridTestKernalContext ctx = new GridTestKernalContext(log);
 
         rsrcProc = new GridResourceProcessor(ctx);
     }
@@ -91,9 +89,7 @@ public class IgniteTestResources {
         home = U.getIgniteHome();
         locHost = localHost();
 
-        GridTestKernalContext ctx = new GridTestKernalContext();
-
-        ctx.config().setGridLogger(log);
+        GridTestKernalContext ctx = new GridTestKernalContext(log);
 
         rsrcProc = new GridResourceProcessor(ctx);
     }
@@ -111,9 +107,7 @@ public class IgniteTestResources {
         home = U.getIgniteHome();
         locHost = localHost();
 
-        GridTestKernalContext ctx = new GridTestKernalContext();
-
-        ctx.config().setGridLogger(log);
+        GridTestKernalContext ctx = new GridTestKernalContext(log);
 
         rsrcProc = new GridResourceProcessor(ctx);
     }


Mime
View raw message