http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java index 877bbf3..409ff22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetricsSelfTest.java @@ -53,7 +53,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { private static final int NODES_CNT = 3; /** IP finder for the grid with the primary file system. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Primary GGFS instances. */ private static IgniteFs[] ggfsPrimary; @@ -140,11 +140,11 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { cfg.setGridName("grid-" + idx); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg); @@ -192,11 +192,11 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { cfg.setGridName("grid-secondary"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 47694ba..2413b78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); private static final AtomicInteger mgmtPort = new AtomicInteger(DFLT_MGMT_PORT); @@ -120,10 +120,10 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe protected IgniteConfiguration gridConfiguration() throws Exception { IgniteConfiguration cfg = getConfiguration(getTestGridName()); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java index a1ca6ad..331aff1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -44,7 +44,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe protected static final IgniteFsPath FILE = new IgniteFsPath("/file"); /** Shared IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** GGFS. */ protected static IgniteFs ggfs; @@ -82,11 +82,11 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe cfg.setGridName("grid"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java index 9fbe12f..9cde9f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerSelfTest.java @@ -49,7 +49,7 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; */ public class GridStreamerSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private boolean atLeastOnce = true; @@ -69,11 +69,11 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest { cfg.setStreamerConfiguration(streamerConfiguration()); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setPeerClassLoadingEnabled(p2pEnabled); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java index 33d2718..c4103f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java @@ -45,18 +45,18 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest { private static Ignite ignite1; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index dea2172..1631882 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -70,7 +70,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { public static final String EXT_RESOURCE_CLS_NAME = "org.apache.ignite.tests.p2p.TestUserResource"; /** Shared IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * A test message topic. @@ -175,11 +175,11 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { ((IgniteOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java index 2b694b9..2a49e53 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java @@ -47,7 +47,7 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest cfg.setDeploymentMode(depMode); - cfg.setFailoverSpi(new NeverFailoverSpi()); + cfg.setFailoverSpiConfiguration(new NeverFailoverSpiConfiguration()); cfg.setNetworkTimeout(10000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java index 8a218ef..5d71d13 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PUndeploySelfTest.java @@ -41,19 +41,14 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { /** Class Name of task. */ private static final String TEST_TASK_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; - /** */ - private Map<String, LocalDeploymentSpi> spis = new HashMap<>(); - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName, GridTestResources rsrcs) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName, rsrcs); - LocalDeploymentSpi spi = new LocalDeploymentSpi(); - - spis.put(gridName, spi); + LocalDeploymentSpiConfiguration spi = new LocalDeploymentSpiConfiguration(); - cfg.setDeploymentSpi(spi); + cfg.setDeploymentSpiConfiguration(spi); cfg.setDeploymentMode(depMode); @@ -86,8 +81,8 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { ignite2.compute().execute(task1.getName(), 2); - LocalDeploymentSpi spi1 = spis.get(ignite1.name()); - LocalDeploymentSpi spi2 = spis.get(ignite2.name()); + LocalDeploymentSpi spi1 = (LocalDeploymentSpi)ignite1.configuration().getDeploymentSpi(); + LocalDeploymentSpi spi2 = (LocalDeploymentSpi)ignite2.configuration().getDeploymentSpi(); assert spi1.findResource(task1.getName()) != null; assert spi2.findResource(task1.getName()) != null; @@ -134,8 +129,8 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { ignite1.compute().execute(task1.getName(), ignite2.cluster().localNode().id()); - LocalDeploymentSpi spi1 = spis.get(ignite1.name()); - LocalDeploymentSpi spi2 = spis.get(ignite2.name()); + LocalDeploymentSpi spi1 = (LocalDeploymentSpi)ignite1.configuration().getDeploymentSpi(); + LocalDeploymentSpi spi2 = (LocalDeploymentSpi)ignite2.configuration().getDeploymentSpi(); assert spi1.findResource(task1.getName()) != null; @@ -154,8 +149,6 @@ public class GridP2PUndeploySelfTest extends GridCommonAbstractTest { assert !ignite1.compute().localTasks().containsKey(task1.getName()); assert !ignite2.compute().localTasks().containsKey(task1.getName()); - - spis = null; } finally { stopGrid(2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java index 1589901..3fe6d70 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java @@ -35,9 +35,6 @@ import java.util.*; @GridCommonTest(group = "Task Session") public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAbstractTest { /** */ - protected static CheckpointSpi spi; - - /** */ private static final int SPLIT_COUNT = 5; /** */ @@ -51,7 +48,10 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb * @param globalState Global state. * @throws Exception If check failed. */ - private void checkFinishedState(String sesKey, String globalKey, String globalState) throws Exception { + private void checkFinishedState(Ignite ignite, String sesKey, String globalKey, String globalState) + throws Exception { + CheckpointSpi spi = ignite.configuration().getCheckpointSpi()[0]; + byte[] serState = spi.loadCheckpoint(sesKey); assert serState == null : "Session scope variable is not null: " + Arrays.toString(serState); @@ -83,11 +83,13 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb * @param cl Class loader. * @throws Exception If check failed. */ - private static void checkRunningState(String sesKey, String sesState, String globalKey, String globalState, - IgniteMarshaller marsh, ClassLoader cl) throws Exception { + private static void checkRunningState(Ignite ignite, String sesKey, String sesState, String globalKey, + String globalState, IgniteMarshaller marsh, ClassLoader cl) throws Exception { assert marsh != null; assert cl != null; + CheckpointSpi spi = ignite.configuration().getCheckpointSpi()[0]; + byte[] serState = spi.loadCheckpoint(sesKey); String state = marsh.unmarshal(serState, cl); @@ -119,22 +121,23 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb fut.getTaskSession().saveCheckpoint("future:global:key", "future:global:testval", ComputeTaskSessionScope.GLOBAL_SCOPE, 0); - int res = (Integer) fut.get(); + int res = (Integer)fut.get(); assert res == SPLIT_COUNT : "Invalid result: " + res; // Check fut states. - checkFinishedState("future:session:key", "future:global:key", "future:global:testval"); + checkFinishedState(ignite, "future:session:key", "future:global:key", "future:global:testval"); // Check states saved by jobs. for (int i = 0; i < SPLIT_COUNT; i++) - checkFinishedState("job:session:key:" + i, "job:global:key:" + i, "job:global:testval:" + i); + checkFinishedState(ignite, "job:session:key:" + i, "job:global:key:" + i, "job:global:testval:" + i); // Check states saved by map(..). for (int i = 0; i < SPLIT_COUNT; i++) - checkFinishedState("map:session:key:" + i, "map:global:key:" + i, "map:global:testval:" + i); + checkFinishedState(ignite, "map:session:key:" + i, "map:global:key:" + i, "map:global:testval:" + i); // Check states saved by reduce(..). for (int i = 0; i < SPLIT_COUNT; i++) - checkFinishedState("reduce:session:key:" + i, "reduce:global:key:" + i, "reduce:global:testval:" + i); + checkFinishedState(ignite, "reduce:session:key:" + i, "reduce:global:key:" + i, + "reduce:global:testval:" + i); } finally { G.stop(getTestGridName(), false); @@ -208,16 +211,16 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb // Check task and job states. for (int i = 0; i < SPLIT_COUNT; i++) { // Check task map state. - checkRunningState("map:session:key:" + i, "map:session:testval:" + i, "map:global:key:" + i, + checkRunningState(ignite, "map:session:key:" + i, "map:session:testval:" + i, "map:global:key:" + i, "map:global:testval:" + i, ignite.configuration().getMarshaller(), getClass().getClassLoader()); // Check task reduce state. - checkRunningState("reduce:session:key:" + i, "reduce:session:testval:" + i, + checkRunningState(ignite, "reduce:session:key:" + i, "reduce:session:testval:" + i, "reduce:global:key:" + i, "reduce:global:testval:" + i, ignite.configuration().getMarshaller(), getClass().getClassLoader()); // Check task map state. - checkRunningState("job:session:key:" + i, "job:session:testval:" + i, "job:global:key:" + i, + checkRunningState(ignite, "job:session:key:" + i, "job:session:testval:" + i, "job:global:key:" + i, "job:global:testval:" + i, ignite.configuration().getMarshaller(), getClass().getClassLoader()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java index 9410c1c..a0d61ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java @@ -36,7 +36,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract public void testSharedFsCheckpoint() throws Exception { IgniteConfiguration cfg = getConfiguration(); - cfg.setCheckpointSpi(spi = new SharedFsCheckpointSpi()); + cfg.setCheckpointSpiConfiguration(new SharedFsCheckpointSpiConfiguration()); checkCheckpoints(cfg); } @@ -53,7 +53,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract ds.setUser("sa"); ds.setPassword(""); - JdbcCheckpointSpi spi = new JdbcCheckpointSpi(); + JdbcCheckpointSpiConfiguration spi = new JdbcCheckpointSpiConfiguration(); spi.setDataSource(ds); spi.setCheckpointTableName("checkpoints"); @@ -62,9 +62,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract spi.setValueFieldType("longvarbinary"); spi.setExpireDateFieldName("create_date"); - GridSessionCheckpointSelfTest.spi = spi; - - cfg.setCheckpointSpi(spi); + cfg.setCheckpointSpiConfiguration(spi); checkCheckpoints(cfg); } @@ -81,15 +79,13 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract cacheCfg.setName(cacheName); - CacheCheckpointSpi spi = new CacheCheckpointSpi(); + CacheCheckpointSpiConfiguration spi = new CacheCheckpointSpiConfiguration(); spi.setCacheName(cacheName); cfg.setCacheConfiguration(cacheCfg); - cfg.setCheckpointSpi(spi); - - GridSessionCheckpointSelfTest.spi = spi; + cfg.setCheckpointSpiConfiguration(spi); checkCheckpoints(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java index 011618c..94f5007 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -53,11 +53,11 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java index ba88945..a4e8dd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java @@ -22,13 +22,13 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Grid cache checkpoint SPI config self test. */ -@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = CacheCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridCacheCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<CacheCheckpointSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", null); - checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", ""); + checkNegativeSpiProperty(new CacheCheckpointSpi(new CacheCheckpointSpiConfiguration()), "cacheName", null); + checkNegativeSpiProperty(new CacheCheckpointSpi(new CacheCheckpointSpiConfiguration()), "cacheName", ""); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java index d59b7bd..fb71377 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.GridSpiTest; /** * Grid cache checkpoint SPI self test. */ -@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = CacheCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridCacheCheckpointSpiSelfTest extends GridCheckpointSpiAbstractTest<CacheCheckpointSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java index 7380f04..277f45d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Grid cache checkpoint SPI start stop self test. */ -@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = CacheCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridCacheCheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<CacheCheckpointSpi> { /** {@inheritDoc} */ @Override protected void spiConfigure(CacheCheckpointSpi spi) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java index 4191c9b..f8557dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java @@ -26,17 +26,17 @@ import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.*; /** * Grid jdbc checkpoint SPI config self test. */ -@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = JdbcCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridJdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<JdbcCheckpointSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new JdbcCheckpointSpi(), "dataSource", null); + checkNegativeSpiProperty(new JdbcCheckpointSpi(new JdbcCheckpointSpiConfiguration()), "dataSource", null); DataSource ds = new jdbcDataSource(); - JdbcCheckpointSpi spi = new JdbcCheckpointSpi(); + JdbcCheckpointSpi spi = new JdbcCheckpointSpi(new JdbcCheckpointSpiConfiguration()); spi.setDataSource(ds); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java index 24fb396..8838cbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java @@ -24,7 +24,7 @@ import org.hsqldb.jdbc.*; /** * Grid jdbc checkpoint SPI custom config self test. */ -@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = JdbcCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridJdbcCheckpointSpiCustomConfigSelfTest extends GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java index b2e7e72..7646f5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java @@ -24,7 +24,7 @@ import org.hsqldb.jdbc.*; /** * Grid jdbc checkpoint SPI default config self test. */ -@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = JdbcCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridJdbcCheckpointSpiDefaultConfigSelfTest extends GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java index 9088a27..6480eff 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java @@ -24,7 +24,7 @@ import org.hsqldb.jdbc.*; /** * Grid jdbc checkpoint SPI start stop self test. */ -@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = JdbcCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridJdbcCheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<JdbcCheckpointSpi> { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java index b5230de..d1bb7f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiConfigSelfTest.java @@ -23,13 +23,15 @@ import java.util.*; /** * Grid shared file system checkpoint SPI config self test. */ -@GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = SharedFsCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridSharedFsCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<SharedFsCheckpointSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new SharedFsCheckpointSpi(), "directoryPaths", null); - checkNegativeSpiProperty(new SharedFsCheckpointSpi(), "directoryPaths", new LinkedList<String>()); + checkNegativeSpiProperty(new SharedFsCheckpointSpi(new SharedFsCheckpointSpiConfiguration()), + "directoryPaths", null); + checkNegativeSpiProperty(new SharedFsCheckpointSpi(new SharedFsCheckpointSpiConfiguration()), + "directoryPaths", new LinkedList<String>()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java index 407ba8c..4355203 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*; /** * Tests SPI in multi-threaded environment. */ -@GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = SharedFsCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends GridSpiAbstractTest<SharedFsCheckpointSpi> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java index a231e47..375d8a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest.java @@ -28,7 +28,7 @@ import java.util.*; /** * Tests multiple shared directories. */ -@GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = SharedFsCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest extends GridSpiAbstractTest<SharedFsCheckpointSpi> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiSelfTest.java index 307577c..9b8d482 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiSelfTest.java @@ -26,7 +26,7 @@ import java.util.Collection; /** * Grid shared file system checkpoint SPI self test. */ -@GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = SharedFsCheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class GridSharedFsCheckpointSpiSelfTest extends GridCheckpointSpiAbstractTest<SharedFsCheckpointSpi> { /** */ private static final String PATH = SharedFsCheckpointSpi.DFLT_DIR_PATH + "/" + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiStartStopSelfTest.java index 0507cc5..35e22f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Grid shared file system checkpoint SPI start stop self test. */ -@GridSpiTest(spi = SharedFsCheckpointSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = SharedFsCheckpointSpiConfiguration.class, group = "Collision SPI") public class GridSharedFsCheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<SharedFsCheckpointSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java index 3b7b311..56fc7f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiConfigSelfTest.java @@ -22,13 +22,15 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Unit tests for {@link FifoQueueCollisionSpi} config. */ -@GridSpiTest(spi = FifoQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = FifoQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridFifoQueueCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<FifoQueueCollisionSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new FifoQueueCollisionSpi(), "parallelJobsNumber", 0); - checkNegativeSpiProperty(new FifoQueueCollisionSpi(), "waitingJobsNumber", -1); + checkNegativeSpiProperty(new FifoQueueCollisionSpi(new FifoQueueCollisionSpiConfiguration()), + "parallelJobsNumber", 0); + checkNegativeSpiProperty(new FifoQueueCollisionSpi(new FifoQueueCollisionSpiConfiguration()), + "waitingJobsNumber", -1); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java index cb1d945..192a543 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.*; /** * Unit tests for {@link FifoQueueCollisionSpi}. */ -@GridSpiTest(spi = FifoQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = FifoQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQueueCollisionSpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiStartStopSelfTest.java index 3dcecd9..666c9c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Unit tests for {@link FifoQueueCollisionSpi} start-stop. */ -@GridSpiTest(spi = FifoQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = FifoQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridFifoQueueCollisionSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FifoQueueCollisionSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java index 2a6f6d4..e9401f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiAttributesSelfTest.java @@ -35,7 +35,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp /** * Job stealing attributes test. */ -@GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingCollisionSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingCollisionSpiAttributesSelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ private static GridTestNode rmtNode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java index 8090e9c..70d4178 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiConfigSelfTest.java @@ -22,15 +22,19 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Job stealing collision SPI config test. */ -@GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingCollisionSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<JobStealingCollisionSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new JobStealingCollisionSpi(), "messageExpireTime", 0); - checkNegativeSpiProperty(new JobStealingCollisionSpi(), "waitJobsThreshold", -1); - checkNegativeSpiProperty(new JobStealingCollisionSpi(), "activeJobsThreshold", -1); - checkNegativeSpiProperty(new JobStealingCollisionSpi(), "maximumStealingAttempts", 0); + checkNegativeSpiProperty(new JobStealingCollisionSpi(new JobStealingCollisionSpiConfiguration()), + "messageExpireTime", 0); + checkNegativeSpiProperty(new JobStealingCollisionSpi(new JobStealingCollisionSpiConfiguration()), + "waitJobsThreshold", -1); + checkNegativeSpiProperty(new JobStealingCollisionSpi(new JobStealingCollisionSpiConfiguration()), + "activeJobsThreshold", -1); + checkNegativeSpiProperty(new JobStealingCollisionSpi(new JobStealingCollisionSpiConfiguration()), + "maximumStealingAttempts", 0); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java index 9a63379..d23f424 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiCustomTopologySelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp /** * Job stealing collision SPI topology test. */ -@GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingCollisionSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingCollisionSpiCustomTopologySelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java index aff724c..0c174b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiSelfTest.java @@ -38,7 +38,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp /** * Job stealing SPI test. */ -@GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingCollisionSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingCollisionSpiSelfTest extends GridSpiAbstractTest<JobStealingCollisionSpi> { /** */ public GridJobStealingCollisionSpiSelfTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java index ca04056..e8395f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/jobstealing/GridJobStealingCollisionSpiStartStopSelfTest.java @@ -29,7 +29,7 @@ import static org.apache.ignite.internal.GridNodeAttributes.*; /** * Job stealing collision SPI start-stop test. */ -@GridSpiTest(spi = JobStealingCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingCollisionSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingCollisionSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<JobStealingCollisionSpi> { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java index db9d15a..ce6a151 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiConfigSelfTest.java @@ -22,17 +22,22 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Priority queue collision SPI config test. */ -@GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = PriorityQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridPriorityQueueCollisionSpiConfigSelfTest extends GridSpiAbstractConfigTest<PriorityQueueCollisionSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "parallelJobsNumber", 0); - checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "waitingJobsNumber", -1); - checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "starvationIncrement", -1); - checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "priorityAttributeKey", null); - checkNegativeSpiProperty(new PriorityQueueCollisionSpi(), "jobPriorityAttributeKey", null); + checkNegativeSpiProperty(new PriorityQueueCollisionSpi(new PriorityQueueCollisionSpiConfiguration()), + "parallelJobsNumber", 0); + checkNegativeSpiProperty(new PriorityQueueCollisionSpi(new PriorityQueueCollisionSpiConfiguration()), + "waitingJobsNumber", -1); + checkNegativeSpiProperty(new PriorityQueueCollisionSpi(new PriorityQueueCollisionSpiConfiguration()), + "starvationIncrement", -1); + checkNegativeSpiProperty(new PriorityQueueCollisionSpi(new PriorityQueueCollisionSpiConfiguration()), + "priorityAttributeKey", null); + checkNegativeSpiProperty(new PriorityQueueCollisionSpi(new PriorityQueueCollisionSpiConfiguration()), + "jobPriorityAttributeKey", null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java index a1565f5..459dc18 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java @@ -29,7 +29,7 @@ import static org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisi /** * Priority queue collision SPI test. */ -@GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = PriorityQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<PriorityQueueCollisionSpi> { /** {@inheritDoc} */ @Override protected void afterTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiStartStopSelfTest.java index 3008cf4..973a6fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Priority queue collision SPI start-stop test. */ -@GridSpiTest(spi = PriorityQueueCollisionSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = PriorityQueueCollisionSpiConfiguration.class, group = "Collision SPI") public class GridPriorityQueueCollisionSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<PriorityQueueCollisionSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index e35da3e..d6d4707 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.*; /** * */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java index b4be436..15adfd4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConfigSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * TCP communication SPI config test. */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiConfigSelfTest extends GridSpiAbstractConfigTest<TcpCommunicationSpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index 00e0021..bfc4426 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*; /** * */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ private static final Collection<GridTestResources> spiRsrcs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index b90242f..b9e5970 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*; /** * */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ private static final Collection<GridTestResources> spiRsrcs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java index 0cdb42d..3b1ced4 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiShmemSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiShmemSelfTest extends GridTcpCommunicationSpiAbstractTest { /** */ public GridTcpCommunicationSpiShmemSelfTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiStartStopSelfTest.java index b3f067d..1b6850d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiStartStopSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * TCP communication SPI config start-stop test. */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<TcpCommunicationSpi> { /** * @return Local port. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java index 5ca1194..fe2a158 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiTcpSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * */ -@GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") +@GridSpiTest(spiConfiguration = TcpCommunicationSpiConfiguration.class, group = "Communication SPI") public class GridTcpCommunicationSpiTcpSelfTest extends GridTcpCommunicationSpiAbstractTest { /** */ public GridTcpCommunicationSpiTcpSelfTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java index 04b9350..9c1df70 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; /** * Local deployment SPI test. */ -@GridSpiTest(spi = LocalDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = LocalDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridLocalDeploymentSpiSelfTest extends GridSpiAbstractTest<LocalDeploymentSpi> { /** */ private static Map<ClassLoader, Set<Class<? extends ComputeTask<?, ?>>>> tasks = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiStartStopSelfTest.java index cab2a6b..19ab200 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/deployment/local/GridLocalDeploymentSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Local deployment SPI start-stop test. */ -@GridSpiTest(spi = LocalDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = LocalDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridLocalDeploymentSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<LocalDeploymentSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java index 67277fd..dce7a99 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java @@ -32,7 +32,7 @@ public class GridTcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest private static final int TOP_SIZE = 1; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static volatile boolean client; @@ -42,27 +42,29 @@ public class GridTcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest IgniteConfiguration cfg = super.getConfiguration(gridName); if (client) { - TcpDiscoveryVmIpFinder clientIpFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(ipFinder); - String addr = new ArrayList<>(ipFinder.getRegisteredAddresses()).iterator().next().toString(); + TcpDiscoveryVmIpFinderConfiguration clientIpFinder = new TcpDiscoveryVmIpFinderConfiguration(); + + String addr = new ArrayList<>(finder.getRegisteredAddresses()).iterator().next().toString(); if (addr.startsWith("/")) addr = addr.substring(1); clientIpFinder.setAddresses(Arrays.asList(addr)); - TcpClientDiscoverySpi discoSpi = new TcpClientDiscoverySpi(); + TcpClientDiscoverySpiConfiguration discoSpi = new TcpClientDiscoverySpiConfiguration(); discoSpi.setIpFinder(clientIpFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); } else { - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); } cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java index 03ebe4b..f2d8d0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java @@ -38,7 +38,7 @@ public class GridTcpDiscoverySnapshotHistoryTest extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setDiscoverySpi(new TcpDiscoverySpi()); + cfg.setDiscoverySpiConfiguration(new TcpDiscoverySpiConfiguration()); cfg.setCacheConfiguration(); cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiConfigSelfTest.java index 6c75c86..db517d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiConfigSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * */ -@GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI") +@GridSpiTest(spiConfiguration = TcpDiscoverySpiConfiguration.class, group = "Discovery SPI") public class GridTcpDiscoverySpiConfigSelfTest extends GridSpiAbstractConfigTest<TcpDiscoverySpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java index 5479164..8dcb919 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java @@ -25,11 +25,11 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Random start stop test for {@link TcpDiscoverySpi}. */ -@GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI") +@GridSpiTest(spiConfiguration = TcpDiscoverySpiConfiguration.class, group = "Discovery SPI") public class GridTcpDiscoverySpiRandomStartStopTest extends GridAbstractDiscoveryRandomStartStopTest<TcpDiscoverySpi> { /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder; /** {@inheritDoc} */ @Override protected int getMaxInterval() { @@ -40,6 +40,9 @@ public class GridTcpDiscoverySpiRandomStartStopTest extends @Override protected void spiConfigure(TcpDiscoverySpi spi) throws Exception { super.spiConfigure(spi); + if (ipFinder == null) + ipFinder = new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); + spi.setIpFinder(ipFinder); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java index 2da9616..f413d05 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java @@ -26,17 +26,20 @@ import org.apache.ignite.testframework.junits.spi.*; * TCP discovery spi test. */ @SuppressWarnings({"JUnitTestCaseWithNoTests"}) -@GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI") +@GridSpiTest(spiConfiguration = TcpDiscoverySpiConfiguration.class, group = "Discovery SPI") public class GridTcpDiscoverySpiSelfTest extends GridAbstractDiscoverySelfTest<TcpDiscoverySpi> { /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected DiscoverySpi getSpi(int idx) { - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spiCfg = new TcpDiscoverySpiConfiguration(); + + spiCfg.setIpFinder(ipFinder); + + TcpDiscoverySpi spi = new TcpDiscoverySpi(spiCfg); spi.setMetricsProvider(createMetricsProvider()); - spi.setIpFinder(ipFinder); return spi; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java index 718c9fc..1b25cd3 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java @@ -31,14 +31,14 @@ import java.util.*; /** * Grid TCP discovery SPI start stop self test. */ -@GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI") +@GridSpiTest(spiConfiguration = TcpDiscoverySpiConfiguration.class, group = "Discovery SPI") public class GridTcpDiscoverySpiStartStopSelfTest extends GridSpiStartStopAbstractTest<TcpDiscoverySpi> { /** * @return IP finder. */ @GridSpiTestConfig - public TcpDiscoveryIpFinder getIpFinder() { - return new TcpDiscoveryVmIpFinder(true); + public TcpDiscoveryIpFinder getIpFinder() throws IgniteSpiException { + return new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java index 5797ec2..efd738d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.common.*; */ public class GridTcpDiscoverySpiWildcardSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int NODES = 5; @@ -36,11 +36,11 @@ public class GridTcpDiscoverySpiWildcardSelfTest extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setLocalHost(null); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java index 667dd29..8403426 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.*; /** * Memory event storage load test. */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "EventStorage SPI") +@GridSpiTest(spiConfiguration = MemoryEventStorageSpiConfiguration.class, group = "EventStorage SPI") public class GridMemoryEventStorageMultiThreadedSelfTest extends GridSpiAbstractTest<MemoryEventStorageSpi> { /** * @throws Exception If test failed http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java index e6a84aa..99d35bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiConfigSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Memory event storage SPI config test. */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") +@GridSpiTest(spiConfiguration = MemoryEventStorageSpiConfiguration.class, group = "Event Storage SPI") public class GridMemoryEventStorageSpiConfigSelfTest extends GridSpiAbstractConfigTest<MemoryEventStorageSpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java index 0675957..541b042 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java @@ -29,7 +29,7 @@ import static org.apache.ignite.events.IgniteEventType.*; /** * Tests for {@link MemoryEventStorageSpi}. */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") +@GridSpiTest(spiConfiguration = MemoryEventStorageSpiConfiguration.class, group = "Event Storage SPI") public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<MemoryEventStorageSpi> { /** */ private static final int EXPIRE_CNT = 100; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java index 41509b3..99ba9dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiStartStopSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Memory event storage SPI start-stop test. */ -@GridSpiTest(spi = MemoryEventStorageSpi.class, group = "Event Storage SPI") +@GridSpiTest(spiConfiguration = MemoryEventStorageSpiConfiguration.class, group = "Event Storage SPI") public class GridMemoryEventStorageSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<MemoryEventStorageSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java index db5db71..ee48553 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiConfigSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Always-failover SPI config test. */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = AlwaysFailoverSpiConfiguration.class, group = "Collision SPI") public class GridAlwaysFailoverSpiConfigSelfTest extends GridSpiAbstractConfigTest<AlwaysFailoverSpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java index 50ff490..b72084e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiSelfTest.java @@ -31,7 +31,7 @@ import static org.apache.ignite.spi.failover.always.AlwaysFailoverSpi.*; /** * Always-failover SPI test. */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Failover SPI") +@GridSpiTest(spiConfiguration = AlwaysFailoverSpiConfiguration.class, group = "Failover SPI") public class GridAlwaysFailoverSpiSelfTest extends GridSpiAbstractTest<AlwaysFailoverSpi> { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java index 3b771e0..b1b28f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/always/GridAlwaysFailoverSpiStartStopSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Always-failover SPI start-stop test. */ -@GridSpiTest(spi = AlwaysFailoverSpi.class, group = "Failover SPI") +@GridSpiTest(spiConfiguration = AlwaysFailoverSpiConfiguration.class, group = "Failover SPI") public class GridAlwaysFailoverSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<FailoverSpi> { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java index b9c88c1..23f1415 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/failover/jobstealing/GridJobStealingFailoverSpiConfigSelfTest.java @@ -22,12 +22,13 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Job stealing failover SPI config test. */ -@GridSpiTest(spi = JobStealingFailoverSpi.class, group = "Collision SPI") +@GridSpiTest(spiConfiguration = JobStealingFailoverSpiConfiguration.class, group = "Collision SPI") public class GridJobStealingFailoverSpiConfigSelfTest extends GridSpiAbstractConfigTest<JobStealingFailoverSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new JobStealingFailoverSpi(), "maximumFailoverAttempts", -1); + checkNegativeSpiProperty(new JobStealingFailoverSpi(new JobStealingFailoverSpiConfiguration()), + "maximumFailoverAttempts", -1); } }
