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

4
spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
View File

@@ -137,10 +137,10 @@ public class ScopedProxyTests {
assertThat(scope.getMap().containsKey("scopedTarget.scopedList")).isTrue();
assertThat(scope.getMap().get("scopedTarget.scopedList").getClass()).isEqualTo(ArrayList.class);
ArrayList<?> deserialized = (ArrayList<?>) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
ArrayList<Object> deserialized = (ArrayList<Object>) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
assertThat(deserialized).isNotNull();
assertThat(AopUtils.isCglibProxy(deserialized)).isTrue();
assertThat(deserialized.contains("myFriend")).isTrue();
assertThat(deserialized).contains("myFriend");
boolean condition = deserialized instanceof ScopedObject;
assertThat(condition).isTrue();
ScopedObject scopedDeserialized = (ScopedObject) deserialized;

2
spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
View File

@@ -122,7 +122,7 @@ public class CustomNamespaceHandlerTests {
@Test
public void testProxyingDecoratorNoInstance() throws Exception {
String[] beanNames = this.beanFactory.getBeanNamesForType(ApplicationListener.class);
assertThat(Arrays.asList(beanNames).contains("debuggingTestBeanNoInstance")).isTrue();
assertThat(Arrays.asList(beanNames)).contains("debuggingTestBeanNoInstance");
assertThat(this.beanFactory.getType("debuggingTestBeanNoInstance")).isEqualTo(ApplicationListener.class);
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
this.beanFactory.getBean("debuggingTestBeanNoInstance"))

4
spring-context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java vendored
View File

@@ -56,9 +56,9 @@ public class NoOpCacheManagerTests {
@Test
public void testCacheName() throws Exception {
String name = "bucket";
assertThat(this.manager.getCacheNames().contains(name)).isFalse();
assertThat(this.manager.getCacheNames()).doesNotContain(name);
this.manager.getCache(name);
assertThat(this.manager.getCacheNames().contains(name)).isTrue();
assertThat(this.manager.getCacheNames()).contains(name);
}
@Test

2
spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java vendored
View File

@@ -299,7 +299,7 @@ public class AnnotationCacheOperationSourceTests {
assertThat(actual.getCacheManager()).as("Wrong cache manager").isEqualTo(cacheManager);
assertThat(actual.getCacheResolver()).as("Wrong cache resolver").isEqualTo(cacheResolver);
assertThat(actual.getCacheNames()).as("Wrong number of cache names").hasSameSizeAs(cacheNames);
Arrays.stream(cacheNames).forEach(cacheName -> assertThat(actual.getCacheNames().contains(cacheName)).as("Cache '" + cacheName + "' not found in " + actual.getCacheNames()).isTrue());
Arrays.stream(cacheNames).forEach(cacheName -> assertThat(actual.getCacheNames()).as("Cache '" + cacheName + "' not found in " + actual.getCacheNames()).contains(cacheName));
}

4
spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java vendored
View File

@@ -71,11 +71,11 @@ public class ExpressionEvaluatorTests {
Iterator<CacheOperation> it = ops.iterator();
CacheOperation next = it.next();
assertThat(next).isInstanceOf(CacheableOperation.class);
assertThat(next.getCacheNames().contains("test")).isTrue();
assertThat(next.getCacheNames()).contains("test");
assertThat(next.getKey()).isEqualTo("#a");
next = it.next();
assertThat(next).isInstanceOf(CacheableOperation.class);
assertThat(next.getCacheNames().contains("test")).isTrue();
assertThat(next.getCacheNames()).contains("test");
assertThat(next.getKey()).isEqualTo("#b");
}

4
spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
View File

@@ -637,7 +637,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
@Override
public void onApplicationEvent(MyEvent event) {
assertThat(this.otherListener.seenEvents.contains(event)).isTrue();
assertThat(this.otherListener.seenEvents).contains(event);
}
}
@@ -689,7 +689,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
@Override
public void onApplicationEvent(MyEvent event) {
assertThat(this.otherListener.seenEvents.contains(event)).isTrue();
assertThat(this.otherListener.seenEvents).contains(event);
}
}

28
spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
View File

@@ -77,7 +77,7 @@ class PayloadApplicationEventTests {
PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this,
new NumberHolder<>(42), ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class));
ac.publishEvent(event);
assertThat(ac.getBean(NumberHolderListener.class).events.contains(event.getPayload())).isTrue();
assertThat(ac.getBean(NumberHolderListener.class).events).contains(event.getPayload());
ac.close();
}
@@ -91,7 +91,7 @@ class PayloadApplicationEventTests {
PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this,
new NumberHolder<>(42), ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class));
ac.publishEvent(event);
assertThat(parent.getBean(NumberHolderListener.class).events.contains(event.getPayload())).isTrue();
assertThat(parent.getBean(NumberHolderListener.class).events).contains(event.getPayload());
ac.close();
parent.close();
}
@@ -99,7 +99,7 @@ class PayloadApplicationEventTests {
@Test
@SuppressWarnings("resource")
void testPayloadObjectWithPayloadType() {
final Object payload = new NumberHolder<>(42);
final NumberHolder payload = new NumberHolder<>(42);
AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(NumberHolderListener.class) {
@Override
@@ -110,14 +110,14 @@ class PayloadApplicationEventTests {
}
};
assertThat(ac.getBean(NumberHolderListener.class).events.contains(payload)).isTrue();
assertThat(ac.getBean(NumberHolderListener.class).events).contains(payload);
ac.close();
}
@Test
@SuppressWarnings("resource")
void testPayloadObjectWithPayloadTypeOnParentContext() {
final Object payload = new NumberHolder<>(42);
final NumberHolder payload = new NumberHolder<>(42);
ConfigurableApplicationContext parent = new AnnotationConfigApplicationContext(NumberHolderListener.class);
ConfigurableApplicationContext ac = new GenericApplicationContext(parent) {
@@ -130,7 +130,7 @@ class PayloadApplicationEventTests {
};
ac.refresh();
assertThat(parent.getBean(NumberHolderListener.class).events.contains(payload)).isTrue();
assertThat(parent.getBean(NumberHolderListener.class).events).contains(payload);
ac.close();
parent.close();
}
@@ -142,7 +142,7 @@ class PayloadApplicationEventTests {
AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
ac.publishEvent(event);
assertThat(ac.getBean(AuditableListener.class).events.contains(event)).isTrue();
assertThat(ac.getBean(AuditableListener.class).events).contains(event);
ac.close();
}
@@ -155,7 +155,7 @@ class PayloadApplicationEventTests {
AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
ac.publishEvent(event);
assertThat(parent.getBean(AuditableListener.class).events.contains(event)).isTrue();
assertThat(parent.getBean(AuditableListener.class).events).contains(event);
ac.close();
parent.close();
}
@@ -174,7 +174,7 @@ class PayloadApplicationEventTests {
AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
ac.publishEvent(event);
assertThat(events.contains(event)).isTrue();
assertThat(events).contains(event);
ac.close();
}
@@ -194,7 +194,7 @@ class PayloadApplicationEventTests {
AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
ac.publishEvent(event);
assertThat(events.contains(event)).isTrue();
assertThat(events).contains(event);
ac.close();
parent.close();
}
@@ -213,7 +213,7 @@ class PayloadApplicationEventTests {
String payload = "xyz";
ac.publishEvent(payload);
assertThat(events.contains(payload)).isTrue();
assertThat(events).contains(payload);
ac.close();
}
@@ -233,7 +233,7 @@ class PayloadApplicationEventTests {
String payload = "xyz";
ac.publishEvent(payload);
assertThat(events.contains(payload)).isTrue();
assertThat(events).contains(payload);
ac.close();
parent.close();
}
@@ -245,7 +245,7 @@ class PayloadApplicationEventTests {
String payload = "xyz";
ac.publishEvent(payload);
assertThat(ac.getBean(PlainPayloadListener.class).events.contains(payload)).isTrue();
assertThat(ac.getBean(PlainPayloadListener.class).events).contains(payload);
ac.close();
}
@@ -258,7 +258,7 @@ class PayloadApplicationEventTests {
String payload = "xyz";
ac.publishEvent(payload);
assertThat(parent.getBean(PlainPayloadListener.class).events.contains(payload)).isTrue();
assertThat(parent.getBean(PlainPayloadListener.class).events).contains(payload);
ac.close();
parent.close();
}

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

@@ -54,8 +54,8 @@ class BshScriptFactoryTests {
void staticScript() {
ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
Calculator calc = (Calculator) ctx.getBean("calculator");
Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -86,7 +86,7 @@ class BshScriptFactoryTests {
@Test
void staticScriptWithNullReturnValue() {
ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfig")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithConfig");
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfig");
messenger.setMessage(null);
@@ -98,7 +98,7 @@ class BshScriptFactoryTests {
@Test
void staticScriptWithTwoInterfacesSpecified() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithConfigExtra")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithConfigExtra");
ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerWithConfigExtra");
messenger.setMessage(null);
@@ -112,7 +112,7 @@ class BshScriptFactoryTests {
@Test
void staticWithScriptReturningInstance() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
String desiredMessage = "Hello World!";
@@ -126,7 +126,7 @@ class BshScriptFactoryTests {
@Test
void staticScriptImplementingInterface() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bshContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerImpl")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerImpl");
Messenger messenger = (Messenger) ctx.getBean("messengerImpl");
String desiredMessage = "Hello World!";
@@ -249,9 +249,9 @@ class BshScriptFactoryTests {
TestBean testBean = (TestBean) ctx.getBean("testBean");
Collection<String> beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class));
assertThat(beanNames.contains("messenger")).isTrue();
assertThat(beanNames.contains("messengerImpl")).isTrue();
assertThat(beanNames.contains("messengerInstance")).isTrue();
assertThat(beanNames).contains("messenger");
assertThat(beanNames).contains("messengerImpl");
assertThat(beanNames).contains("messengerInstance");
Messenger messenger = (Messenger) ctx.getBean("messenger");
assertThat(messenger.getMessage()).isEqualTo("Hello World!");
@@ -271,11 +271,11 @@ class BshScriptFactoryTests {
assertThat(messengerByName.getTestBean()).isEqualTo(testBean);
Collection<Messenger> beans = ctx.getBeansOfType(Messenger.class).values();
assertThat(beans.contains(messenger)).isTrue();
assertThat(beans.contains(messengerImpl)).isTrue();
assertThat(beans.contains(messengerInstance)).isTrue();
assertThat(beans.contains(messengerByType)).isTrue();
assertThat(beans.contains(messengerByName)).isTrue();
assertThat(beans).contains(messenger);
assertThat(beans).contains(messengerImpl);
assertThat(beans).contains(messengerInstance);
assertThat(beans).contains(messengerByType);
assertThat(beans).contains(messengerByName);
ctx.close();
assertThat(messenger.getMessage()).isNull();

2
spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java
View File

@@ -66,7 +66,7 @@ public class GroovyScriptEvaluatorTests {
evaluator.getCompilerConfiguration().setBytecodePostprocessor(processor);
Object result = evaluator.evaluate(new StaticScriptSource("return 3 * 2"));
assertThat(result).isEqualTo(6);
assertThat(processor.processed.contains("Script1")).isTrue();
assertThat(processor.processed).contains("Script1");
}
@Test

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

@@ -69,8 +69,8 @@ public class GroovyScriptFactoryTests {
public void testStaticScript() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
Calculator calc = (Calculator) ctx.getBean("calculator");
Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -102,8 +102,8 @@ public class GroovyScriptFactoryTests {
public void testStaticScriptUsingJsr223() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class)).contains("calculator")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Calculator.class))).contains("calculator");
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
Calculator calc = (Calculator) ctx.getBean("calculator");
Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -174,7 +174,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testStaticScriptWithInstance() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -189,7 +189,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testStaticScriptWithInstanceUsingJsr223() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstance");
Messenger messenger = (Messenger) ctx.getBean("messengerInstance");
assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -204,7 +204,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testStaticScriptWithInlineDefinedInstance() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstanceInline")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline");
Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline");
assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -219,7 +219,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testStaticScriptWithInlineDefinedInstanceUsingJsr223() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContextWithJsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstanceInline")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerInstanceInline");
Messenger messenger = (Messenger) ctx.getBean("messengerInstanceInline");
assertThat(AopUtils.isAopProxy(messenger)).as("Shouldn't get proxy when refresh is disabled").isFalse();
@@ -415,7 +415,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testRefreshableFromTag() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
CallCounter countingAspect = (CallCounter) ctx.getBean("getMessageAspect");
@@ -434,7 +434,7 @@ public class GroovyScriptFactoryTests {
public void testRefreshableFromTagProxyTargetClass() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-proxy-target-class.xml",
getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
@@ -471,7 +471,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testJsr223FromTag() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messenger");
Messenger messenger = (Messenger) ctx.getBean("messenger");
assertThat(AopUtils.isAopProxy(messenger)).isFalse();
assertThat(messenger.getMessage()).isEqualTo("Hello World!");
@@ -480,7 +480,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testJsr223FromTagWithInterface() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerWithInterface")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("messengerWithInterface");
Messenger messenger = (Messenger) ctx.getBean("messengerWithInterface");
assertThat(AopUtils.isAopProxy(messenger)).isFalse();
}
@@ -488,7 +488,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testRefreshableJsr223FromTag() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("refreshableMessenger");
Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
assertThat(AopUtils.isAopProxy(messenger)).isTrue();
boolean condition = messenger instanceof Refreshable;
@@ -499,7 +499,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testInlineJsr223FromTag() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("inlineMessenger")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessenger");
Messenger messenger = (Messenger) ctx.getBean("inlineMessenger");
assertThat(AopUtils.isAopProxy(messenger)).isFalse();
}
@@ -507,7 +507,7 @@ public class GroovyScriptFactoryTests {
@Test
public void testInlineJsr223FromTagWithInterface() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd-jsr223.xml", getClass());
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("inlineMessengerWithInterface")).isTrue();
assertThat(Arrays.asList(ctx.getBeanNamesForType(Messenger.class))).contains("inlineMessengerWithInterface");
Messenger messenger = (Messenger) ctx.getBean("inlineMessengerWithInterface");
assertThat(AopUtils.isAopProxy(messenger)).isFalse();
}

26
spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
View File

@@ -159,19 +159,19 @@ class ValidatorFactoryTests {
assertThat(fieldError.getField()).isEqualTo("name");
List<String> errorCodes = Arrays.asList(fieldError.getCodes());
assertThat(errorCodes).hasSize(4);
assertThat(errorCodes.contains("NotNull.person.name")).isTrue();
assertThat(errorCodes.contains("NotNull.name")).isTrue();
assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
assertThat(errorCodes.contains("NotNull")).isTrue();
assertThat(errorCodes).contains("NotNull.person.name");
assertThat(errorCodes).contains("NotNull.name");
assertThat(errorCodes).contains("NotNull.java.lang.String");
assertThat(errorCodes).contains("NotNull");
fieldError = result.getFieldError("address.street");
assertThat(fieldError.getField()).isEqualTo("address.street");
errorCodes = Arrays.asList(fieldError.getCodes());
assertThat(errorCodes).hasSize(5);
assertThat(errorCodes.contains("NotNull.person.address.street")).isTrue();
assertThat(errorCodes.contains("NotNull.address.street")).isTrue();
assertThat(errorCodes.contains("NotNull.street")).isTrue();
assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
assertThat(errorCodes.contains("NotNull")).isTrue();
assertThat(errorCodes).contains("NotNull.person.address.street");
assertThat(errorCodes).contains("NotNull.address.street");
assertThat(errorCodes).contains("NotNull.street");
assertThat(errorCodes).contains("NotNull.java.lang.String");
assertThat(errorCodes).contains("NotNull");
validator.destroy();
}
@@ -191,8 +191,8 @@ class ValidatorFactoryTests {
ObjectError globalError = result.getGlobalError();
List<String> errorCodes = Arrays.asList(globalError.getCodes());
assertThat(errorCodes).hasSize(2);
assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
assertThat(errorCodes.contains("NameAddressValid")).isTrue();
assertThat(errorCodes).contains("NameAddressValid.person");
assertThat(errorCodes).contains("NameAddressValid");
validator.destroy();
}
@@ -213,8 +213,8 @@ class ValidatorFactoryTests {
ObjectError globalError = result.getGlobalError();
List<String> errorCodes = Arrays.asList(globalError.getCodes());
assertThat(errorCodes).hasSize(2);
assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
assertThat(errorCodes.contains("NameAddressValid")).isTrue();
assertThat(errorCodes).contains("NameAddressValid.person");
assertThat(errorCodes).contains("NameAddressValid");
validator.destroy();
ctx.close();