Skip to content

Commit 5c6a912

Browse files
wilkinsonawilkinsona
committed
Polish "Test Micrometer config to property exposure"
See gh-33743
1 parent 19e7005 commit 5c6a912

22 files changed

+223
-265
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/TestConfigsToPropertiesExposure.java

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.appoptics;
1818

19-
import io.micrometer.appoptics.AppOpticsConfig;
2019
import org.junit.jupiter.api.Test;
2120

22-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
2321
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapterTests;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +30,10 @@
3230
class AppOpticsPropertiesConfigAdapterTests
3331
extends StepRegistryPropertiesConfigAdapterTests<AppOpticsProperties, AppOpticsPropertiesConfigAdapter> {
3432

33+
AppOpticsPropertiesConfigAdapterTests() {
34+
super(AppOpticsPropertiesConfigAdapter.class);
35+
}
36+
3537
@Override
3638
protected AppOpticsProperties createProperties() {
3739
return new AppOpticsProperties();
@@ -70,10 +72,4 @@ void whenPropertiesFloorTimesIsSetAdapterFloorTimesReturnsIt() {
7072
assertThat(createConfigAdapter(properties).floorTimes()).isTrue();
7173
}
7274

73-
@Test
74-
void allDefaultConfigMethodsAreOverriddenByAtlasPropertiesConfigAdapter() {
75-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(AppOpticsConfig.class,
76-
AppOpticsPropertiesConfigAdapter.class, "connectTimeout");
77-
}
78-
7975
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesConfigAdapterTests.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818

1919
import java.time.Duration;
2020

21-
import com.netflix.spectator.atlas.AtlasConfig;
2221
import org.junit.jupiter.api.Test;
2322

24-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
23+
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
2524

2625
import static org.assertj.core.api.Assertions.assertThat;
2726

@@ -30,7 +29,12 @@
3029
*
3130
* @author Mirko Sobeck
3231
*/
33-
class AtlasPropertiesConfigAdapterTests {
32+
class AtlasPropertiesConfigAdapterTests
33+
extends AbstractPropertiesConfigAdapterTests<AtlasProperties, AtlasPropertiesConfigAdapter> {
34+
35+
AtlasPropertiesConfigAdapterTests() {
36+
super(AtlasPropertiesConfigAdapter.class);
37+
}
3438

3539
@Test
3640
void whenPropertiesStepIsSetAdapterStepReturnsIt() {
@@ -134,10 +138,10 @@ void whenPropertiesLwcIgnorePublishStepIsSetAdapterLwcIgnorePublishStepReturnsIt
134138
}
135139

136140
@Test
137-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
138-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(AtlasConfig.class,
139-
AtlasPropertiesConfigAdapter.class, "lwcIgnorePublishStep", "initialPollingDelay", "autoStart",
140-
"lwcStep", "validTagCharacters");
141+
@Override
142+
protected void adapterOverridesAllConfigMethods() {
143+
adapterOverridesAllConfigMethodsExcept("autoStart", "commonTags", "debugRegistry", "publisher", "rollupPolicy",
144+
"validTagCharacters");
141145
}
142146

143147
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogPropertiesConfigAdapterTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
1818

19-
import io.micrometer.datadog.DatadogConfig;
2019
import org.junit.jupiter.api.Test;
2120

22-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
2321
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapterTests;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
@@ -33,6 +31,10 @@
3331
class DatadogPropertiesConfigAdapterTests
3432
extends StepRegistryPropertiesConfigAdapterTests<DatadogProperties, DatadogPropertiesConfigAdapter> {
3533

34+
DatadogPropertiesConfigAdapterTests() {
35+
super(DatadogPropertiesConfigAdapter.class);
36+
}
37+
3638
@Override
3739
protected DatadogProperties createProperties() {
3840
return new DatadogProperties();
@@ -78,10 +80,4 @@ void whenPropertiesUriIsSetAdapterUriReturnsIt() {
7880
assertThat(createConfigAdapter(properties).uri()).isEqualTo("https://app.example.com/api/v1/series");
7981
}
8082

81-
@Test
82-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
83-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(DatadogConfig.class,
84-
DatadogPropertiesConfigAdapter.class);
85-
}
86-
8783
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapterTests.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
import java.util.HashMap;
2020

2121
import io.micrometer.dynatrace.DynatraceApiVersion;
22-
import io.micrometer.dynatrace.DynatraceConfig;
2322
import org.junit.jupiter.api.Test;
2423

25-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
24+
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
2625

2726
import static org.assertj.core.api.Assertions.assertThat;
2827

@@ -32,7 +31,12 @@
3231
* @author Andy Wilkinson
3332
* @author Georg Pirklbauer
3433
*/
35-
class DynatracePropertiesConfigAdapterTests {
34+
class DynatracePropertiesConfigAdapterTests
35+
extends AbstractPropertiesConfigAdapterTests<DynatraceProperties, DynatracePropertiesConfigAdapter> {
36+
37+
DynatracePropertiesConfigAdapterTests() {
38+
super(DynatracePropertiesConfigAdapter.class);
39+
}
3640

3741
@Test
3842
void whenPropertiesUriIsSetAdapterUriReturnsIt() {
@@ -164,10 +168,4 @@ void defaultValues() {
164168
assertThat(properties.getGroup()).isNull();
165169
}
166170

167-
@Test
168-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
169-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(DynatraceConfig.class,
170-
DynatracePropertiesConfigAdapter.class, "documentType");
171-
}
172-
173171
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticPropertiesConfigAdapterTests.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.elastic;
1818

19-
import io.micrometer.elastic.ElasticConfig;
2019
import org.junit.jupiter.api.Test;
2120

22-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
21+
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
2322

2423
import static org.assertj.core.api.Assertions.assertThat;
2524

@@ -28,7 +27,12 @@
2827
*
2928
* @author Andy Wilkinson
3029
*/
31-
class ElasticPropertiesConfigAdapterTests {
30+
class ElasticPropertiesConfigAdapterTests
31+
extends AbstractPropertiesConfigAdapterTests<ElasticProperties, ElasticPropertiesConfigAdapter> {
32+
33+
ElasticPropertiesConfigAdapterTests() {
34+
super(ElasticPropertiesConfigAdapter.class);
35+
}
3236

3337
@Test
3438
void whenPropertiesHostsIsSetAdapterHostsReturnsIt() {
@@ -100,10 +104,4 @@ void whenPropertiesApiKeyCredentialsIsSetAdapterPipelineReturnsIt() {
100104
assertThat(new ElasticPropertiesConfigAdapter(properties).apiKeyCredentials()).isEqualTo("secret");
101105
}
102106

103-
@Test
104-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
105-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(ElasticConfig.class,
106-
ElasticPropertiesConfigAdapter.class, "documentType");
107-
}
108-
109107
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesConfigAdapterTests.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
import java.util.concurrent.TimeUnit;
2121

2222
import info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode;
23-
import io.micrometer.ganglia.GangliaConfig;
2423
import org.junit.jupiter.api.Test;
2524

26-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
25+
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
2726

2827
import static org.assertj.core.api.Assertions.assertThat;
2928

@@ -32,7 +31,12 @@
3231
*
3332
* @author Mirko Sobeck
3433
*/
35-
class GangliaPropertiesConfigAdapterTests {
34+
class GangliaPropertiesConfigAdapterTests
35+
extends AbstractPropertiesConfigAdapterTests<GangliaProperties, GangliaPropertiesConfigAdapter> {
36+
37+
GangliaPropertiesConfigAdapterTests() {
38+
super(GangliaPropertiesConfigAdapter.class);
39+
}
3640

3741
@Test
3842
void whenPropertiesEnabledIsSetAdapterEnabledReturnsIt() {
@@ -84,10 +88,4 @@ void whenPropertiesPortIsSetAdapterPortReturnsIt() {
8488
assertThat(new GangliaPropertiesConfigAdapter(properties).port()).isEqualTo(4242);
8589
}
8690

87-
@Test
88-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
89-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(GangliaConfig.class,
90-
GangliaPropertiesConfigAdapter.class, "protocolVersion");
91-
}
92-
9391
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapterTests.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
import java.time.Duration;
2020
import java.util.concurrent.TimeUnit;
2121

22-
import io.micrometer.graphite.GraphiteConfig;
2322
import io.micrometer.graphite.GraphiteProtocol;
2423
import org.junit.jupiter.api.Test;
2524

26-
import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
25+
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
2726

2827
import static org.assertj.core.api.Assertions.assertThat;
2928

@@ -32,7 +31,12 @@
3231
*
3332
* @author Mirko Sobeck
3433
*/
35-
class GraphitePropertiesConfigAdapterTests {
34+
class GraphitePropertiesConfigAdapterTests
35+
extends AbstractPropertiesConfigAdapterTests<GraphiteProperties, GraphitePropertiesConfigAdapter> {
36+
37+
GraphitePropertiesConfigAdapterTests() {
38+
super(GraphitePropertiesConfigAdapter.class);
39+
}
3640

3741
@Test
3842
void whenPropertiesEnabledIsSetAdapterEnabledReturnsIt() {
@@ -97,10 +101,4 @@ void whenPropertiesTagsAsPrefixIsSetAdapterTagsAsPrefixReturnsIt() {
97101
assertThat(new GraphitePropertiesConfigAdapter(properties).tagsAsPrefix()).isEqualTo(new String[] { "worker" });
98102
}
99103

100-
@Test
101-
void allConfigDefaultMethodsAreOverriddenByAdapter() {
102-
TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(GraphiteConfig.class,
103-
GraphitePropertiesConfigAdapter.class);
104-
}
105-
106104
}

0 commit comments

Comments
 (0)