Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.x Make OciMetricsDataTest.beforeEach non private #7332

Merged
merged 1 commit into from
Aug 14, 2023
Merged

2.x Make OciMetricsDataTest.beforeEach non private #7332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions ...metrics/metrics/src/test/java/io/helidon/integrations/oci/metrics/OciMetricsDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates.
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,7 +34,7 @@

import com.oracle.bmc.monitoring.model.MetricDataDetails;

public class OciMetricsDataTest {
class OciMetricsDataTest {
private final OciMetricsSupport.NameFormatter nameFormatter = new OciMetricsSupport.NameFormatter() { };
private final Type[] types = {Type.BASE, Type.VENDOR, Type.APPLICATION};
private final String dimensionScopeName = "scope";
Expand All @@ -45,21 +45,15 @@ public class OciMetricsDataTest {
private final MetricRegistry appMetricRegistry = rf.getRegistry(Type.APPLICATION);

@BeforeEach
private void beforeEach() {
// clear all registry
void clearAllRegistry() {
for (Type 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 meterName = "DummyMeter";
String timerName = "DummyTimer";
Expand Down Expand Up @@ -94,7 +88,7 @@ public void testMetricRegistries() {
}

@Test
public void testOciMonitoringParameters() {
void testOciMonitoringParameters() {
String compartmentId = "dummy.compartmentId";
String namespace = "dummy-namespace";
String resourceGroup = "dummy_resourceGroup";
Expand All @@ -112,7 +106,7 @@ public void testOciMonitoringParameters() {
}

@Test
public void testDimensions() {
void testDimensions() {
String dummyTagName = "DummyTag";
String dummyTagValue = "DummyValue";

Expand Down