[50/51] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4829

[ak...@apache.org]

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ad971e3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ad971e3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index e0b7ebe,6c44076..15826fb
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@@ -53,16 -56,9 +53,16 @@@ public class JdbcConnectionSelfTest ext
      /** Client node flag. */
      private boolean client;
  
 +    /**
 +     * @return Config URL to use in test.
 +     */
 +    protected String configURL() {
 +        return "modules/clients/src/test/config/jdbc-config.xml";
 +    }
 +
      /** {@inheritDoc} */
-     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-         IgniteConfiguration cfg = super.getConfiguration(gridName);
+     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
  
          cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CUSTOM_CACHE_NAME));
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ad971e3/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ad971e3/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 57b8d22,5a76ddd..85c8156
--- 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
@@@ -804,72 -828,13 +829,75 @@@ public abstract class GridAbstractTest 
      }
  
      /**
 +     * Starts new grid with given name.
 +     *
 +     * @param gridName Grid name.
 +     * @param client Client mode.
 +     * @param cfgUrl Config URL.
 +     * @return Started grid.
 +     * @throws Exception If failed.
 +     */
 +    protected Ignite startGridWithSpringCtx(String gridName, boolean client, String cfgUrl) throws Exception {
 +        IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> cfgMap =
 +                IgnitionEx.loadConfigurations(cfgUrl);
 +
 +        IgniteConfiguration cfg = F.first(cfgMap.get1());
 +
 +        cfg.setGridName(gridName);
 +        cfg.setClientMode(client);
 +
 +        return IgnitionEx.start(cfg, cfgMap.getValue());
 +    }
 +
 +    /**
 +     * Starts new node with given index.
 +     *
 +     * @param idx Index of the node to start.
 +     * @param client Client mode.
 +     * @param cfgUrl Config URL.
 +     * @return Started node.
 +     * @throws Exception If failed.
 +     */
 +    protected Ignite startGridWithSpringCtx(int idx, boolean client, String cfgUrl) throws Exception {
 +        return startGridWithSpringCtx(getTestGridName(idx), client, cfgUrl);
 +    }
 +
 +    /**
 +     * Start specified amount of nodes.
 +     *
 +     * @param cnt Nodes count.
 +     * @param client Client mode.
 +     * @param cfgUrl Config URL.
 +     * @return First started node.
 +     * @throws Exception If failed.
 +     */
 +    protected Ignite startGridsWithSpringCtx(int cnt, boolean client, String cfgUrl) throws Exception {
 +        assert cnt > 0;
 +
 +        Ignite ignite = null;
 +
 +        for (int i = 0; i < cnt; i++) {
 +            if (ignite == null)
 +                ignite = startGridWithSpringCtx(i, client, cfgUrl);
 +            else
 +                startGridWithSpringCtx(i, client, cfgUrl);
 +        }
 +
 +        checkTopology(cnt);
 +
 +        assert ignite != null;
 +
 +        return ignite;
 +    }
 +
 +    /**
       * Starts new grid at another JVM with given name.
       *
-      * @param gridName Grid name.
+      * @param igniteInstanceName Ignite instance name.
+      * @param cfg Ignite configuration.
       * @param ctx Spring context.
+      * @param locNode Local node.
+      * @param resetDiscovery Reset DiscoverySpi.
       * @return Started grid.
       * @throws Exception If failed.
       */