You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/12/11 01:45:43 UTC
[geode] 01/01: GEODE-6143: remove PowerMock from VMStatsMonitorTest
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-3
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c4995143ddd536cce59174ee788114352fe7eea4
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Mon Dec 10 17:44:22 2018 -0800
GEODE-6143: remove PowerMock from VMStatsMonitorTest
---
.../internal/beans/stats/VMStatsMonitor.java | 11 ++++++----
.../internal/beans/stats/VMStatsMonitorTest.java | 24 +++-------------------
2 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
index 431996d..6830448 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
@@ -60,21 +60,24 @@ public class VMStatsMonitor extends MBeanStatsMonitor {
return lastProcessCpuTime;
}
- public VMStatsMonitor(String name) {
+ public VMStatsMonitor(String name, boolean processCPUTimeAvailable) {
super(name);
- processCPUTimeAvailable = MBeanJMXAdapter.isAttributeAvailable(PROCESS_CPU_TIME_ATTRIBUTE,
- ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME);
+ this.processCPUTimeAvailable = processCPUTimeAvailable;
if (!processCPUTimeAvailable) {
cpuUsage = VALUE_NOT_AVAILABLE;
}
}
+ public VMStatsMonitor(String name) {
+ this(name, MBeanJMXAdapter.isAttributeAvailable(PROCESS_CPU_TIME_ATTRIBUTE,
+ ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME));
+ }
+
long currentTimeMillis() {
return TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
}
/**
- *
* @param systemTime Current system time.
* @param cpuTime Last gathered cpu time.
* @return The time (as a percentage) that this member's process time with respect to Statistics
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitorTest.java
index 5180971..cd33aa1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitorTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.beans.stats;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -26,47 +25,30 @@ import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.test.junit.categories.StatisticsTest;
@Category(StatisticsTest.class)
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("*.UnitTest")
-@PrepareForTest(MBeanJMXAdapter.class)
public class VMStatsMonitorTest {
@Rule
public TestName testName = new TestName();
private VMStatsMonitor vmStatsMonitor;
- @Before
- public void setUp() {
- PowerMockito.mockStatic(MBeanJMXAdapter.class);
- }
-
@Test
public void statisticInitialValueShouldBeZeroWhenTheProcessCpuTimeJmxAttributeIsAvailable() {
- when(MBeanJMXAdapter.isAttributeAvailable(anyString(), anyString())).thenReturn(true);
- vmStatsMonitor = new VMStatsMonitor(testName.getMethodName());
+ vmStatsMonitor = new VMStatsMonitor(testName.getMethodName(), true);
assertThat(vmStatsMonitor).isNotNull();
assertThat(vmStatsMonitor.getCpuUsage()).isEqualTo(0);
}
@Test
public void statisticInitialValueShouldBeUndefinedWhenTheProcessCpuTimeJmxAttributeIsNotAvailable() {
- when(MBeanJMXAdapter.isAttributeAvailable(anyString(), anyString())).thenReturn(false);
- vmStatsMonitor = new VMStatsMonitor(testName.getMethodName());
+ vmStatsMonitor = new VMStatsMonitor(testName.getMethodName(), false);
assertThat(vmStatsMonitor).isNotNull();
assertThat(vmStatsMonitor.getCpuUsage()).isEqualTo(VMStatsMonitor.VALUE_NOT_AVAILABLE);
}
@@ -107,7 +89,7 @@ public class VMStatsMonitorTest {
@Test
public void refreshStatsShouldUpdateCpuUsage() {
ZonedDateTime now = ZonedDateTime.now();
- when(MBeanJMXAdapter.isAttributeAvailable(anyString(), anyString())).thenReturn(true);
+ vmStatsMonitor = new VMStatsMonitor(testName.getMethodName(), true);
vmStatsMonitor = spy(new VMStatsMonitor(testName.getMethodName()));
assertThat(vmStatsMonitor).isNotNull();
assertThat(vmStatsMonitor.getCpuUsage()).isEqualTo(0);