Replace AssertJ's deprecated hasOnlyOneElementSatisfying

maniacs-sfa · Aug 28, 2020 · 02d441d · 02d441d
1 parent 4aed85c
commit 02d441d
Show file tree

Hide file tree

Showing 43 changed files with 141 additions and 141 deletions.
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java b/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java
@@ -321,7 +321,7 @@ private void checkRepoArg(Index index, Class<?> baseClass, Class<?> soughtClass,
     private void checkRepoArg(Index index, Class<?> baseClass, Class<?> soughtClass, String expectedArg) {
         List<Type> args = JandexUtil.resolveTypeParameters(name(baseClass), name(soughtClass),
                 index);
-        assertThat(args).hasOnlyOneElementSatisfying(t -> {
+        assertThat(args).singleElement().satisfies(t -> {
             assertThat(t.toString()).isEqualTo(expectedArg);
         });
     }

diff --git a/...untime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java b/...untime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java
@@ -78,11 +78,11 @@ void testWithMissingKeysAndIgnoreFailureConfigured() throws IOException {
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("some.first", "whatever"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("third")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("third")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("some.third", "other"));
         });
@@ -108,11 +108,11 @@ void testRawKeysWithoutPrefix() throws IOException {
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hello"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.name", "quarkus"));
         });
@@ -137,11 +137,11 @@ void testRawKeysWithPrefix() throws IOException {
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hello"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.name", "quarkus"));
         });
@@ -165,12 +165,12 @@ void testPropertiesKeysWithoutPrefix() throws IOException {
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hi"),
                     entry("greeting.name", "quarkus"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("other.key", "value"));
         });
@@ -195,12 +195,12 @@ void testPropertiesKeysWithPrefix() throws IOException {
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hi"),
                     entry("greeting.name", "quarkus"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("other.key", "value"));
         });

diff --git a/...ime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java b/...ime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java
@@ -31,7 +31,7 @@ void testOnlyLiteralData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"),
                     entry("some.other", "someOtherValue"));
             assertThat(c.getName()).contains("testOnlyLiteralData");
@@ -45,7 +45,7 @@ void testOnlySingleMatchingPropertiesData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingPropertiesData");
@@ -69,7 +69,7 @@ void testOnlySingleMatchingYamlData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingYamlData");
@@ -102,20 +102,20 @@ void testWithAllKindsOfData() {
 
         assertThat(configSources).hasSize(4);
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("literal"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yaml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key2", "value2"),
                             entry("some.otherKey", "someOtherValue"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key3", "value3"));
                 });
     }

diff --git a/...untime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java b/...untime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java
@@ -32,7 +32,7 @@ void testOnlyLiteralData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"),
                     entry("some.other", "someOtherValue"));
             assertThat(c.getName()).contains("testOnlyLiteralData");
@@ -46,7 +46,7 @@ void testOnlySingleMatchingPropertiesData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata().getName(), secret.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingPropertiesData");
@@ -70,7 +70,7 @@ void testOnlySingleMatchingYamlData() {
 
         List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingYamlData");
@@ -103,20 +103,20 @@ void testWithAllKindsOfData() {
 
         assertThat(configSources).hasSize(4);
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("literal"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yaml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key2", "value2"),
                             entry("some.otherKey", "someOtherValue"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key3", "value3"));
                 });
     }

diff --git a/...ent/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java b/...ent/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java
@@ -59,7 +59,7 @@ public void testNamedDataSourceInjection() {
 
     private void assertProperConnection(MongoClient client, int expectedPort) {
         assertThat(client).isInstanceOfSatisfying(MongoClientImpl.class, c -> {
-            assertThat(c.getCluster().getSettings().getHosts()).hasOnlyOneElementSatisfying(sa -> {
+            assertThat(c.getCluster().getSettings().getHosts()).singleElement().satisfies(sa -> {
                 assertThat(sa.getPort()).isEqualTo(expectedPort);
             });
         });

diff --git a/...deployment/src/test/java/io/quarkus/mongodb/LegacyNamedReactiveMongoClientConfigTest.java b/...deployment/src/test/java/io/quarkus/mongodb/LegacyNamedReactiveMongoClientConfigTest.java
@@ -77,7 +77,7 @@ private void assertProperConnection(ReactiveMongoClient client, int expectedPort
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
-            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).hasOnlyOneElementSatisfying(sa -> {
+            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).singleElement().satisfies(sa -> {
                 assertThat(sa.getPort()).isEqualTo(expectedPort);
             });
         });

diff --git a/...lient/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java b/...lient/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java
@@ -76,7 +76,7 @@ private void assertProperConnection(ReactiveMongoClient client, int expectedPort
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
-            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).hasOnlyOneElementSatisfying(sa -> {
+            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).singleElement().satisfies(sa -> {
                 assertThat(sa.getPort()).isEqualTo(expectedPort);
             });
         });

diff --git a/...ng-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java b/...ng-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java
@@ -34,7 +34,7 @@ public class MissingRestControllerTest {
     public void testBuildLogs() {
         List<LogRecord> buildLogRecords = prodModeTestResults.getRetainedBuildLogRecords();
         assertThat(buildLogRecords).isNotEmpty();
-        assertThat(buildLogRecords).hasOnlyOneElementSatisfying(r -> {
+        assertThat(buildLogRecords).singleElement().satisfies(r -> {
             assertThat(r.getMessage())
                     .contains("a mapping annotation but the class itself")
                     .contains(NonAnnotatedController.class.getName())

diff --git a/...etes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java b/...etes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java
@@ -71,9 +71,9 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getImagePullPolicy()).isEqualTo("Always"); // expect the default value
-                            assertThat(container.getPorts()).hasOnlyOneElementSatisfying(p -> {
+                            assertThat(container.getPorts()).singleElement().satisfies(p -> {
                                 assertThat(p.getContainerPort()).isEqualTo(8080);
                             });
                         });
@@ -87,7 +87,7 @@ public void assertGeneratedResources() throws IOException {
                 assertThat(m.getNamespace()).isNull();
             });
             assertThat(s.getSpec()).satisfies(spec -> {
-                assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                     assertThat(p.getPort()).isEqualTo(8080);
                 });
             });

diff --git a/...netes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java b/...netes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> openshiftList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
 
-        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata()).satisfies(m -> {
                 assertThat(m.getName()).isEqualTo("basic-openshift");
                 assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
@@ -54,7 +54,7 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isNull();

diff --git a/...tandard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java b/...tandard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("container-concurrency", "100"));

diff --git a/...s-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java b/...s-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("requests-per-second-target-default", "150"));

diff --git a/...s/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java b/...s/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata().getAnnotations()).contains(entry("autoscaling.knative.dev/minScale", "3"));
                 assertThat(s.getMetadata().getAnnotations()).contains(entry("autoscaling.knative.dev/maxScale", "5"));

diff --git a/...s/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java b/...s/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("enable-scale-to-zero", "false"));