http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1a8f165/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java index d583498..4aa06b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java @@ -95,7 +95,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { * @return Test metrics. */ private ClusterMetrics createMetrics() { - DiscoveryMetricsAdapter metrics = new DiscoveryMetricsAdapter(); + ClusterMetricsSnapshot metrics = new ClusterMetricsSnapshot(); metrics.setAvailableProcessors(1); metrics.setAverageActiveJobs(2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1a8f165/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java index e529ebe..fbcbdd1 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java @@ -139,8 +139,8 @@ public class GridSpiTestContext implements IgniteSpiContext { * @param activeJobs Active jobs count. * @return Metrics adapter. */ - private DiscoveryMetricsAdapter createMetrics(int waitingJobs, int activeJobs) { - DiscoveryMetricsAdapter metrics = new DiscoveryMetricsAdapter(); + private ClusterMetricsSnapshot createMetrics(int waitingJobs, int activeJobs) { + ClusterMetricsSnapshot metrics = new ClusterMetricsSnapshot(); metrics.setCurrentWaitingJobs(waitingJobs); metrics.setCurrentActiveJobs(activeJobs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1a8f165/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java index 1bc4a6f..efaa144 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java @@ -347,7 +347,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr protected DiscoveryMetricsProvider createMetricsProvider() { return new DiscoveryMetricsProvider() { /** {@inheritDoc} */ - @Override public ClusterMetrics metrics() { return new DiscoveryMetricsAdapter(); } + @Override public ClusterMetrics metrics() { return new ClusterMetricsSnapshot(); } }; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1a8f165/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java index bc984f5..8b15202 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java @@ -105,7 +105,7 @@ public class GridTopologyHeapSizeSelfTest extends GridCommonAbstractTest { * @return Node. */ private GridTestNode getNode(String mac, int pid) { - DiscoveryMetricsAdapter metrics = new DiscoveryMetricsAdapter(); + ClusterMetricsSnapshot metrics = new ClusterMetricsSnapshot(); metrics.setHeapMemoryMaximum(1024 * 1024 * 1024); metrics.setHeapMemoryInitialized(1024 * 1024 * 1024);