Add more automated tests

5 files changed, 10 insertions, 11 deletions

diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
index 11c419c..919fb95 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java
@@ -317,6 +317,10 @@ public class SparkPlatform {
         return this.serverNormalOperationStartTime;
     }
 
+    public boolean hasEnabled() {
+        return this.enabled.get();
+    }
+
     public Path resolveSaveFile(String prefix, String extension) {
         Path pluginFolder = this.plugin.getPluginDirectory();
         try {
diff --git a/spark-common/src/main/java/me/lucko/spark/common/heapdump/HeapDumpSummary.java b/spark-common/src/main/java/me/lucko/spark/common/heapdump/HeapDumpSummary.java
index 4d34d4a..52140d5 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/heapdump/HeapDumpSummary.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/heapdump/HeapDumpSummary.java
@@ -20,12 +20,12 @@
 
 package me.lucko.spark.common.heapdump;
 
-import com.google.common.annotations.VisibleForTesting;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.command.sender.CommandSender;
 import me.lucko.spark.proto.SparkHeapProtos.HeapData;
 import me.lucko.spark.proto.SparkHeapProtos.HeapEntry;
 import me.lucko.spark.proto.SparkHeapProtos.HeapMetadata;
+import org.jetbrains.annotations.VisibleForTesting;
 import org.objectweb.asm.Type;
 
 import javax.management.JMX;
diff --git a/spark-common/src/main/java/me/lucko/spark/common/monitor/net/NetworkInterfaceInfo.java b/spark-common/src/main/java/me/lucko/spark/common/monitor/net/NetworkInterfaceInfo.java
index c2ba1da..01bd3a7 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/monitor/net/NetworkInterfaceInfo.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/monitor/net/NetworkInterfaceInfo.java
@@ -20,10 +20,10 @@
 
 package me.lucko.spark.common.monitor.net;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import me.lucko.spark.common.monitor.LinuxProc;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.VisibleForTesting;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncProfilerAccess.java b/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncProfilerAccess.java
index 7dcb131..84aaa95 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncProfilerAccess.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/sampler/async/AsyncProfilerAccess.java
@@ -73,14 +73,10 @@ public class AsyncProfilerAccess {
 
         try {
             profiler = load(platform);
-
             if (isEventSupported(profiler, ProfilingEvent.ALLOC, false)) {
                 allocationProfilingEvent = ProfilingEvent.ALLOC;
             }
-
-            if (isEventSupported(profiler, ProfilingEvent.CPU, false)) {
-                profilingEvent = ProfilingEvent.CPU;
-            } else if (isEventSupported(profiler, ProfilingEvent.WALL, true)) {
+            if (isEventSupported(profiler, ProfilingEvent.WALL, true)) {
                 profilingEvent = ProfilingEvent.WALL;
             }
         } catch (Exception e) {
@@ -213,8 +209,7 @@ public class AsyncProfilerAccess {
         return false;
     }
 
-    enum ProfilingEvent {
-        CPU(Events.CPU),
+    public enum ProfilingEvent {
         WALL(Events.WALL),
         ALLOC(Events.ALLOC);
 
diff --git a/spark-common/src/main/java/me/lucko/spark/common/util/JavaVersion.java b/spark-common/src/main/java/me/lucko/spark/common/util/JavaVersion.java
index 1dad75b..23120ea 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/util/JavaVersion.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/util/JavaVersion.java
@@ -20,9 +20,9 @@
 
 package me.lucko.spark.common.util;
 
-import com.google.common.annotations.VisibleForTesting;
+import org.jetbrains.annotations.VisibleForTesting;
 
-public class JavaVersion {
+public enum JavaVersion {
     ;
 
     private static final int JAVA_VERSION;