Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8463E200B35 for ; Tue, 5 Jul 2016 15:04:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 82CF2160A60; Tue, 5 Jul 2016 13:04:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A0D20160A4F for ; Tue, 5 Jul 2016 15:04:00 +0200 (CEST) Received: (qmail 61880 invoked by uid 500); 5 Jul 2016 13:03:58 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 61798 invoked by uid 99); 5 Jul 2016 13:03:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 13:03:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1200E38B3; Tue, 5 Jul 2016 13:03:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 05 Jul 2016 13:03:57 -0000 Message-Id: <0657c4aaf2bc4ba3a8ee4ff541206ba9@git.apache.org> In-Reply-To: <462c6924aab5487286c8cea7ff771252@git.apache.org> References: <462c6924aab5487286c8cea7ff771252@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ignite git commit: IGNITE-3414: Planner test: applied Ignite proxy. archived-at: Tue, 05 Jul 2016 13:04:01 -0000 IGNITE-3414: Planner test: applied Ignite proxy. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3fe22705 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fe22705 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3fe22705 Branch: refs/heads/ignite-3414 Commit: 3fe22705cb1435bd7224f6631b8eb2d4d9129d7a Parents: cc22238 Author: vozerov-gridgain Authored: Tue Jul 5 16:03:47 2016 +0300 Committer: vozerov-gridgain Committed: Tue Jul 5 16:03:47 2016 +0300 ---------------------------------------------------------------------- .../HadoopDefaultMapReducePlannerSelfTest.java | 136 ++++--------------- 1 file changed, 23 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe22705/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java index 9cf4f20..275df7d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java @@ -17,49 +17,27 @@ package org.apache.ignite.internal.processors.hadoop; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteFileSystem; -import org.apache.ignite.IgniteSpringBean; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.configuration.FileSystemConfiguration; import org.apache.ignite.hadoop.mapreduce.IgniteHadoopMapReducePlanner; import org.apache.ignite.igfs.IgfsBlockLocation; -import org.apache.ignite.igfs.IgfsFile; -import org.apache.ignite.igfs.IgfsMetrics; -import org.apache.ignite.igfs.IgfsOutputStream; import org.apache.ignite.igfs.IgfsPath; -import org.apache.ignite.igfs.IgfsPathSummary; -import org.apache.ignite.igfs.mapreduce.IgfsRecordResolver; -import org.apache.ignite.igfs.mapreduce.IgfsTask; -import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; -import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.cluster.IgniteClusterEx; -import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; -import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.hadoop.planner.HadoopAbstractMapReducePlanner; import org.apache.ignite.internal.processors.igfs.IgfsBlockLocationImpl; -import org.apache.ignite.internal.processors.igfs.IgfsContext; -import org.apache.ignite.internal.processors.igfs.IgfsEx; -import org.apache.ignite.internal.processors.igfs.IgfsInputStreamAdapter; -import org.apache.ignite.internal.processors.igfs.IgfsLocalMetrics; +import org.apache.ignite.internal.processors.igfs.IgfsIgniteMock; import org.apache.ignite.internal.processors.igfs.IgfsMock; -import org.apache.ignite.internal.processors.igfs.IgfsPaths; -import org.apache.ignite.internal.processors.igfs.IgfsStatus; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.lang.IgniteFuture; -import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.testframework.GridTestNode; import org.apache.ignite.testframework.GridTestUtils; -import org.jetbrains.annotations.Nullable; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /** * @@ -92,12 +70,12 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes /** */ private static final String INVALID_HOST_3 = "invalid_host3"; - /** Mocked Grid. */ - private static final MockIgnite GRID = new MockIgnite(); - /** Mocked IGFS. */ private static final IgniteFileSystem IGFS = new MockIgfs(); + /** Mocked Grid. */ + private static final MockIgnite GRID = new MockIgnite(IGFS); + /** Planner. */ private static final HadoopMapReducePlanner PLANNER = new IgniteHadoopMapReducePlanner(); @@ -111,7 +89,7 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes private static final ThreadLocal PLAN = new ThreadLocal<>(); /** - * + * Static initializer. */ static { GridTestUtils.setFieldValue(PLANNER, HadoopAbstractMapReducePlanner.class, "ignite", GRID); @@ -635,6 +613,7 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes } /** {@inheritDoc} */ + @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") @Override public HadoopJobInfo info() { return new HadoopDefaultJobInfo() { @Override public int reducers() { @@ -687,7 +666,7 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes * Constructor. */ public MockIgfs() { - super(null); + super("igfs"); } /** {@inheritDoc} */ @@ -710,83 +689,14 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes * Mocked Grid. */ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") - private static class MockIgnite extends IgniteSpringBean implements IgniteEx { - /** {@inheritDoc} */ - @Override public IgniteClusterEx cluster() { - return (IgniteClusterEx)super.cluster(); - } - - /** {@inheritDoc} */ - @Override public IgniteFileSystem igfsx(String name) { - assert F.eq("igfs", name); - - return IGFS; - } - - /** {@inheritDoc} */ - @Override public Hadoop hadoop() { - return null; - } - - /** {@inheritDoc} */ - @Override public String name() { - return null; - } - - /** {@inheritDoc} */ - @Override public IgniteInternalCache utilityCache() { - return null; - } - - /** {@inheritDoc} */ - @Nullable @Override public IgniteInternalCache cachex(@Nullable String name) { - return null; - } - - /** {@inheritDoc} */ - @Nullable @Override public IgniteInternalCache cachex() { - return null; - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public Collection> cachesx(@Nullable IgnitePredicate>... p) { - return null; - } - - /** {@inheritDoc} */ - @Override public boolean eventUserRecordable(int type) { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean allEventsUserRecordable(int[] types) { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isJmxRemoteEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override public boolean isRestartEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override public ClusterNode localNode() { - return null; - } - - /** {@inheritDoc} */ - @Override public String latestVersion() { - return null; - } - - /** {@inheritDoc} */ - @Override public GridKernalContext context() { - return null; + private static class MockIgnite extends IgfsIgniteMock { + /** + * Constructor. + * + * @param igfs IGFS. + */ + public MockIgnite(IgniteFileSystem igfs) { + super(null, igfs); } } } \ No newline at end of file