4.x Make OciMetricsDataTest.beforeEach public (#7333)

helidon-io · Aug 14, 2023 · e65fef5 · e65fef5
1 parent e253a3f
commit e65fef5
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/...metrics/metrics/src/test/java/io/helidon/integrations/oci/metrics/OciMetricsDataTest.java b/...metrics/metrics/src/test/java/io/helidon/integrations/oci/metrics/OciMetricsDataTest.java
@@ -32,11 +32,9 @@
 import io.helidon.metrics.Registry;
 import io.helidon.metrics.api.RegistryFactory;
 
-import org.eclipse.microprofile.metrics.MetricRegistry.Type;
-
 import com.oracle.bmc.monitoring.model.MetricDataDetails;
 
-public class OciMetricsDataTest {
+class OciMetricsDataTest {
     private final OciMetricsSupport.NameFormatter nameFormatter = new OciMetricsSupport.NameFormatter() { };
     private final String[] types = {Registry.BASE_SCOPE, Registry.VENDOR_SCOPE, Registry.APPLICATION_SCOPE};
     private final String dimensionScopeName = "scope";
@@ -47,21 +45,15 @@ public class OciMetricsDataTest {
     private final MetricRegistry appMetricRegistry = rf.getRegistry(Registry.APPLICATION_SCOPE);
 
     @BeforeEach
-    private void beforeEach() {
-        // clear all registry
+    void clearAllRegistry() {
         for (String type: types) {
             MetricRegistry metricRegistry = rf.getRegistry(type);
-            metricRegistry.removeMatching(new MetricFilter() {
-                @Override
-                public boolean matches(MetricID metricID, Metric metric) {
-                    return true;
-                }
-            });
+            metricRegistry.removeMatching(MetricFilter.ALL);
         }
     }
 
     @Test
-    public void testMetricRegistries() {
+    void testMetricRegistries() {
         String counterName = "DummyCounter";
         String timerName = "DummyTimer";
 
@@ -91,7 +83,7 @@ public void testMetricRegistries() {
     }
 
     @Test
-    public void testOciMonitoringParameters() {
+    void testOciMonitoringParameters() {
         String compartmentId = "dummy.compartmentId";
         String namespace = "dummy-namespace";
         String resourceGroup = "dummy_resourceGroup";
@@ -109,7 +101,7 @@ public void testOciMonitoringParameters() {
     }
 
     @Test
-    public void testDimensions() {
+    void testDimensions() {
         String dummyTagName = "DummyTag";
         String dummyTagValue = "DummyValue";