Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)

Browse Source 
Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isTrue\(\)
Replace with : assertThat($1).contains($2)

Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isFalse\(\)
Replace with : assertThat($1).doesNotContain($2)

Closes gh-31762
This commit is contained in:
Yanming Zhou
2023-12-06 12:45:06 +08:00
committed by Brian Clozel
parent 1a63257b12
commit e2852e7355
39 changed files with 234 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
spring-core/src/test/java/org/springframework/core/ConstantsTests.java
View File

@@ -56,44 +56,44 @@ class ConstantsTests {
void getNames() {
Constants c = new Constants(A.class);
Set<?> names = c.getNames("");
Set<String> names = c.getNames("");
assertThat(names).hasSize(c.getSize());
assertThat(names.contains("DOG")).isTrue();
assertThat(names.contains("CAT")).isTrue();
assertThat(names.contains("S1")).isTrue();
assertThat(names).contains("DOG");
assertThat(names).contains("CAT");
assertThat(names).contains("S1");
names = c.getNames("D");
assertThat(names).hasSize(1);
assertThat(names.contains("DOG")).isTrue();
assertThat(names).contains("DOG");
names = c.getNames("d");
assertThat(names).hasSize(1);
assertThat(names.contains("DOG")).isTrue();
assertThat(names).contains("DOG");
}
@Test
void getValues() {
Constants c = new Constants(A.class);
Set<?> values = c.getValues("");
Set<Object> values = c.getValues("");
assertThat(values).hasSize(7);
assertThat(values.contains(0)).isTrue();
assertThat(values.contains(66)).isTrue();
assertThat(values.contains("")).isTrue();
assertThat(values).contains(0);
assertThat(values).contains(66);
assertThat(values).contains("");
values = c.getValues("D");
assertThat(values).hasSize(1);
assertThat(values.contains(0)).isTrue();
assertThat(values).contains(0);
values = c.getValues("prefix");
assertThat(values).hasSize(2);
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
assertThat(values).contains(1);
assertThat(values).contains(2);
values = c.getValuesForProperty("myProperty");
assertThat(values).hasSize(2);
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
assertThat(values).contains(1);
assertThat(values).contains(2);
}
@Test
@@ -103,25 +103,25 @@ class ConstantsTests {
try {
Constants c = new Constants(A.class);
Set<?> values = c.getValues("");
Set<Object> values = c.getValues("");
assertThat(values).hasSize(7);
assertThat(values.contains(0)).isTrue();
assertThat(values.contains(66)).isTrue();
assertThat(values.contains("")).isTrue();
assertThat(values).contains(0);
assertThat(values).contains(66);
assertThat(values).contains("");
values = c.getValues("D");
assertThat(values).hasSize(1);
assertThat(values.contains(0)).isTrue();
assertThat(values).contains(0);
values = c.getValues("prefix");
assertThat(values).hasSize(2);
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
assertThat(values).contains(1);
assertThat(values).contains(2);
values = c.getValuesForProperty("myProperty");
assertThat(values).hasSize(2);
assertThat(values.contains(1)).isTrue();
assertThat(values.contains(2)).isTrue();
assertThat(values).contains(1);
assertThat(values).contains(2);
}
finally {
Locale.setDefault(oldLocale);
@@ -132,15 +132,15 @@ class ConstantsTests {
void suffixAccess() {
Constants c = new Constants(A.class);
Set<?> names = c.getNamesForSuffix("_PROPERTY");
Set<String> names = c.getNamesForSuffix("_PROPERTY");
assertThat(names).hasSize(2);
assertThat(names.contains("NO_PROPERTY")).isTrue();
assertThat(names.contains("YES_PROPERTY")).isTrue();
assertThat(names).contains("NO_PROPERTY");
assertThat(names).contains("YES_PROPERTY");
Set<?> values = c.getValuesForSuffix("_PROPERTY");
Set<Object> values = c.getValuesForSuffix("_PROPERTY");
assertThat(values).hasSize(2);
assertThat(values.contains(3)).isTrue();
assertThat(values.contains(4)).isTrue();
assertThat(values).contains(3);
assertThat(values).contains(4);
}
@Test

4
spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java vendored
View File

@@ -71,8 +71,8 @@ class PropertySourceTests {
ps1.getSource();
List<PropertySource<?>> propertySources = new ArrayList<>();
assertThat(propertySources.add(ps1)).isTrue();
assertThat(propertySources.contains(ps1)).isTrue();
assertThat(propertySources.contains(PropertySource.named("ps1"))).isTrue();
assertThat(propertySources).contains(ps1);
assertThat(propertySources).contains(PropertySource.named("ps1"));
PropertySource<?> ps1replacement = new MapPropertySource("ps1", map2); // notice - different map
assertThat(propertySources.add(ps1replacement)).isTrue(); // true because linkedlist allows duplicates

4
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@@ -172,7 +172,7 @@ class ResourceTests {
@Test
void hasDescription() {
Resource resource = new ByteArrayResource("testString".getBytes(), "my description");
assertThat(resource.getDescription().contains("my description")).isTrue();
assertThat(resource.getDescription()).contains("my description");
}
}
@@ -212,7 +212,7 @@ class ResourceTests {
void hasDescription() {
InputStream is = new ByteArrayInputStream("testString".getBytes());
Resource resource = new InputStreamResource(is, "my description");
assertThat(resource.getDescription().contains("my description")).isTrue();
assertThat(resource.getDescription()).contains("my description");
}
}

8
spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
View File

@@ -488,17 +488,17 @@ class ConcurrentReferenceHashMapTests {
this.map.put(3, "3");
Set<Map.Entry<Integer, String>> entrySet = this.map.entrySet();
Set<Map.Entry<Integer, String>> copy = new HashMap<>(this.map).entrySet();
copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
copy.forEach(entry -> assertThat(entrySet).contains(entry));
this.map.put(1, "A");
this.map.put(2, "B");
this.map.put(3, "C");
copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
copy.forEach(entry -> assertThat(entrySet).doesNotContain(entry));
this.map.put(1, "1");
this.map.put(2, "2");
this.map.put(3, "3");
copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
copy.forEach(entry -> assertThat(entrySet).contains(entry));
entrySet.clear();
copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
copy.forEach(entry -> assertThat(entrySet).doesNotContain(entry));
}
@Test