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

Use idiomatic AssertJ map assertions

Browse Source 
See gh-31752
This commit is contained in:
Yanming Zhou
2023-12-05 10:35:18 +08:00
committed by Stéphane Nicoll
parent 47fe61ef79
commit 6f11716b6f
6 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
View File

@@ -78,8 +78,8 @@ class BshScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close();
}
@@ -91,7 +91,7 @@ class BshScriptFactoryTests {
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig");
messenger.setMessage(null);
assertThat(messenger.getMessage()).isNull();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close();
}
@@ -103,7 +103,7 @@ class BshScriptFactoryTests {
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra");
messenger.setMessage(null);
assertThat(messenger.getMessage()).isNull();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close();
assertThat(messenger.getMessage()).isNull();
@@ -117,7 +117,7 @@ class BshScriptFactoryTests {
Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close();
assertThat(messenger.getMessage()).isNull();
@@ -131,7 +131,7 @@ class BshScriptFactoryTests {
Messenger messenger = (Messenger) ctx.getBean("messengerImpl");
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
ctx.close();
assertThat(messenger.getMessage()).isNull();

20
spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
View File

@@ -94,8 +94,8 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -127,8 +127,8 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Calculator.class).values().contains(calc)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Calculator.class)).containsValue(calc);
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -183,7 +183,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -198,7 +198,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -213,7 +213,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -228,7 +228,7 @@ public class GroovyScriptFactoryTests {
String desiredMessage = "Hello World!";
assertThat(messenger.getMessage()).as("Message is incorrect").isEqualTo(desiredMessage);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test
@@ -427,7 +427,7 @@ public class GroovyScriptFactoryTests {
assertThat(messenger.getMessage()).isEqualTo("Hello World!");
assertThat(countingAspect.getCalls()).isEqualTo(1);
assertThat(ctx.getBeansOfType(Messenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(Messenger.class)).containsValue(messenger);
}
@Test // SPR-6268
@@ -443,7 +443,7 @@ public class GroovyScriptFactoryTests {
assertThat(condition).isTrue();
assertThat(messenger.getMessage()).isEqualTo("Hello World!");
assertThat(ctx.getBeansOfType(ConcreteMessenger.class).values().contains(messenger)).isTrue();
assertThat(ctx.getBeansOfType(ConcreteMessenger.class)).containsValue((ConcreteMessenger) messenger);
// Check that AnnotationUtils works with concrete proxied script classes
assertThat(AnnotationUtils.findAnnotation(messenger.getClass(), Component.class)).isNotNull();