Polish "Test Micrometer config to property exposure"

See spring-projectsgh-33743
wilkinsona · Jul 21, 2023 · c2b43e7 · c2b43e7
1 parent be1f1c8
commit c2b43e7
Show file tree

Hide file tree

Showing 25 changed files with 233 additions and 270 deletions.
diff --git a/...gframework/boot/actuate/autoconfigure/metrics/export/TestConfigsToPropertiesExposure.java b/...gframework/boot/actuate/autoconfigure/metrics/export/TestConfigsToPropertiesExposure.java
diff --git a/...actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java b/...actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java
@@ -16,10 +16,8 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.export.appoptics;
 
-import io.micrometer.appoptics.AppOpticsConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +30,10 @@
 class AppOpticsPropertiesConfigAdapterTests
 		extends StepRegistryPropertiesConfigAdapterTests<AppOpticsProperties, AppOpticsPropertiesConfigAdapter> {
 
+	AppOpticsPropertiesConfigAdapterTests() {
+		super(AppOpticsPropertiesConfigAdapter.class);
+	}
+
 	@Override
 	protected AppOpticsProperties createProperties() {
 		return new AppOpticsProperties();
@@ -70,10 +72,4 @@ void whenPropertiesFloorTimesIsSetAdapterFloorTimesReturnsIt() {
 		assertThat(createConfigAdapter(properties).floorTimes()).isTrue();
 	}
 
-	@Test
-	void allDefaultConfigMethodsAreOverriddenByAtlasPropertiesConfigAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(AppOpticsConfig.class,
-				AppOpticsPropertiesConfigAdapter.class, "connectTimeout");
-	}
-
 }
diff --git a/...rk/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesConfigAdapterTests.java b/...rk/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesConfigAdapterTests.java
@@ -18,10 +18,9 @@
 
 import java.time.Duration;
 
-import com.netflix.spectator.atlas.AtlasConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,7 +29,12 @@
  *
  * @author Mirko Sobeck
  */
-class AtlasPropertiesConfigAdapterTests {
+class AtlasPropertiesConfigAdapterTests
+		extends AbstractPropertiesConfigAdapterTests<AtlasProperties, AtlasPropertiesConfigAdapter> {
+
+	AtlasPropertiesConfigAdapterTests() {
+		super(AtlasPropertiesConfigAdapter.class);
+	}
 
 	@Test
 	void whenPropertiesStepIsSetAdapterStepReturnsIt() {
@@ -120,10 +124,10 @@ void whenPropertiesEvalUriIsSetAdapterEvalUriReturnsIt() {
 	}
 
 	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(AtlasConfig.class,
-				AtlasPropertiesConfigAdapter.class, "lwcIgnorePublishStep", "initialPollingDelay", "autoStart",
-				"lwcStep", "validTagCharacters");
+	@Override
+	protected void adapterOverridesAllConfigMethods() {
+		adapterOverridesAllConfigMethodsExcept("autoStart", "commonTags", "debugRegistry", "publisher", "rollupPolicy",
+				"validTagCharacters");
 	}
 
 }
diff --git a/...springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesTests.java b/...springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,8 @@ void defaultValuesAreConsistent() {
 		assertThat(properties.getUri()).isEqualTo(config.uri());
 		assertThat(properties.getMeterTimeToLive()).isEqualTo(config.meterTTL());
 		assertThat(properties.isLwcEnabled()).isEqualTo(config.lwcEnabled());
+		assertThat(properties.isLwcIgnorePublishStep()).isEqualTo(config.lwcIgnorePublishStep());
+		assertThat(properties.getLwcStep()).isEqualTo(config.lwcStep());
 		assertThat(properties.getConfigRefreshFrequency()).isEqualTo(config.configRefreshFrequency());
 		assertThat(properties.getConfigTimeToLive()).isEqualTo(config.configTTL());
 		assertThat(properties.getConfigUri()).isEqualTo(config.configUri());

diff --git a/...oot/actuate/autoconfigure/metrics/export/datadog/DatadogPropertiesConfigAdapterTests.java b/...oot/actuate/autoconfigure/metrics/export/datadog/DatadogPropertiesConfigAdapterTests.java
@@ -16,10 +16,8 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.export.datadog;
 
-import io.micrometer.datadog.DatadogConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,6 +31,10 @@
 class DatadogPropertiesConfigAdapterTests
 		extends StepRegistryPropertiesConfigAdapterTests<DatadogProperties, DatadogPropertiesConfigAdapter> {
 
+	DatadogPropertiesConfigAdapterTests() {
+		super(DatadogPropertiesConfigAdapter.class);
+	}
+
 	@Override
 	protected DatadogProperties createProperties() {
 		return new DatadogProperties();
@@ -78,10 +80,4 @@ void whenPropertiesUriIsSetAdapterUriReturnsIt() {
 		assertThat(createConfigAdapter(properties).uri()).isEqualTo("https://app.example.com/api/v1/series");
 	}
 
-	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(DatadogConfig.class,
-				DatadogPropertiesConfigAdapter.class);
-	}
-
 }
diff --git a/...actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapterTests.java b/...actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapterTests.java
@@ -19,10 +19,9 @@
 import java.util.HashMap;
 
 import io.micrometer.dynatrace.DynatraceApiVersion;
-import io.micrometer.dynatrace.DynatraceConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +31,12 @@
  * @author Andy Wilkinson
  * @author Georg Pirklbauer
  */
-class DynatracePropertiesConfigAdapterTests {
+class DynatracePropertiesConfigAdapterTests
+		extends AbstractPropertiesConfigAdapterTests<DynatraceProperties, DynatracePropertiesConfigAdapter> {
+
+	DynatracePropertiesConfigAdapterTests() {
+		super(DynatracePropertiesConfigAdapter.class);
+	}
 
 	@Test
 	void whenPropertiesUriIsSetAdapterUriReturnsIt() {
@@ -164,10 +168,4 @@ void defaultValues() {
 		assertThat(properties.getGroup()).isNull();
 	}
 
-	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(DynatraceConfig.class,
-				DynatracePropertiesConfigAdapter.class, "documentType");
-	}
-
 }
diff --git a/...oot/actuate/autoconfigure/metrics/export/elastic/ElasticPropertiesConfigAdapterTests.java b/...oot/actuate/autoconfigure/metrics/export/elastic/ElasticPropertiesConfigAdapterTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.export.elastic;
 
-import io.micrometer.elastic.ElasticConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,7 +27,12 @@
  *
  * @author Andy Wilkinson
  */
-class ElasticPropertiesConfigAdapterTests {
+class ElasticPropertiesConfigAdapterTests
+		extends AbstractPropertiesConfigAdapterTests<ElasticProperties, ElasticPropertiesConfigAdapter> {
+
+	ElasticPropertiesConfigAdapterTests() {
+		super(ElasticPropertiesConfigAdapter.class);
+	}
 
 	@Test
 	void whenPropertiesHostsIsSetAdapterHostsReturnsIt() {
@@ -100,10 +104,4 @@ void whenPropertiesApiKeyCredentialsIsSetAdapterPipelineReturnsIt() {
 		assertThat(new ElasticPropertiesConfigAdapter(properties).apiKeyCredentials()).isEqualTo("secret");
 	}
 
-	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(ElasticConfig.class,
-				ElasticPropertiesConfigAdapter.class, "documentType");
-	}
-
 }
diff --git a/...oot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesConfigAdapterTests.java b/...oot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesConfigAdapterTests.java
@@ -20,10 +20,9 @@
 import java.util.concurrent.TimeUnit;
 
 import info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode;
-import io.micrometer.ganglia.GangliaConfig;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +31,12 @@
  *
  * @author Mirko Sobeck
  */
-class GangliaPropertiesConfigAdapterTests {
+class GangliaPropertiesConfigAdapterTests
+		extends AbstractPropertiesConfigAdapterTests<GangliaProperties, GangliaPropertiesConfigAdapter> {
+
+	GangliaPropertiesConfigAdapterTests() {
+		super(GangliaPropertiesConfigAdapter.class);
+	}
 
 	@Test
 	void whenPropertiesEnabledIsSetAdapterEnabledReturnsIt() {
@@ -84,10 +88,4 @@ void whenPropertiesPortIsSetAdapterPortReturnsIt() {
 		assertThat(new GangliaPropertiesConfigAdapter(properties).port()).isEqualTo(4242);
 	}
 
-	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(GangliaConfig.class,
-				GangliaPropertiesConfigAdapter.class, "protocolVersion");
-	}
-
 }
diff --git a/...t/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapterTests.java b/...t/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapterTests.java
@@ -19,11 +19,10 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
-import io.micrometer.graphite.GraphiteConfig;
 import io.micrometer.graphite.GraphiteProtocol;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.metrics.export.TestConfigsToPropertiesExposure;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.AbstractPropertiesConfigAdapterTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +31,12 @@
  *
  * @author Mirko Sobeck
  */
-class GraphitePropertiesConfigAdapterTests {
+class GraphitePropertiesConfigAdapterTests
+		extends AbstractPropertiesConfigAdapterTests<GraphiteProperties, GraphitePropertiesConfigAdapter> {
+
+	GraphitePropertiesConfigAdapterTests() {
+		super(GraphitePropertiesConfigAdapter.class);
+	}
 
 	@Test
 	void whenPropertiesEnabledIsSetAdapterEnabledReturnsIt() {
@@ -97,10 +101,4 @@ void whenPropertiesTagsAsPrefixIsSetAdapterTagsAsPrefixReturnsIt() {
 		assertThat(new GraphitePropertiesConfigAdapter(properties).tagsAsPrefix()).isEqualTo(new String[] { "worker" });
 	}
 
-	@Test
-	void allConfigDefaultMethodsAreOverriddenByAdapter() {
-		TestConfigsToPropertiesExposure.assertThatAllConfigDefaultMethodsAreOverriddenByAdapter(GraphiteConfig.class,
-				GraphitePropertiesConfigAdapter.class);
-	}
-
 }