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

Replace assertThat(x.get(i)). with assertThat(x).element(i).

Browse Source 
Search for   : assertThat\((.+)\.get\((\d+)\)\)\.
Replace with : assertThat($1).element($2).

Closes gh-31759
This commit is contained in:
Yanming Zhou
2023-12-06 14:25:18 +08:00
committed by Brian Clozel
parent 785ad399e9
commit 59815cefce
94 changed files with 549 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
View File

@@ -1086,8 +1086,8 @@ public abstract class AbstractAopProxyTests {
// NameReverter saved it back
assertThat(it.getName()).isEqualTo(name1);
assertThat(saver.names).hasSize(2);
assertThat(saver.names.get(0)).isEqualTo(name2);
assertThat(saver.names.get(1)).isEqualTo(name1);
assertThat(saver.names).element(0).isEqualTo(name2);
assertThat(saver.names).element(1).isEqualTo(name1);
}
@SuppressWarnings("serial")

4
spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
View File

@@ -426,8 +426,8 @@ public class ProxyFactoryBeanTests {
tb.setName("Tristan");
tb.toString();
assertThat(PointcutForVoid.methodNames).as("Recorded wrong number of invocations").hasSize(2);
assertThat(PointcutForVoid.methodNames.get(0)).isEqualTo("setAge");
assertThat(PointcutForVoid.methodNames.get(1)).isEqualTo("setName");
assertThat(PointcutForVoid.methodNames).element(0).isEqualTo("setAge");
assertThat(PointcutForVoid.methodNames).element(1).isEqualTo("setName");
}
@Test

2
spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java vendored
View File

@@ -89,7 +89,7 @@ public class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests<Con
content.remove(0);
List<String> entry = (List<String>) serializeCache.get(key).get();
assertThat(entry).hasSize(3);
assertThat(entry.get(0)).isEqualTo("one");
assertThat(entry).element(0).isEqualTo("one");
}
@Test

4
spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
View File

@@ -491,8 +491,8 @@ public class ClassPathBeanDefinitionScannerTests {
assertThat(fooService.lookupFoo(123)).isEqualTo("bar");
assertThat(fooService.beanFactory).isSameAs(context.getDefaultListableBeanFactory());
assertThat(fooService.listableBeanFactory).hasSize(2);
assertThat(fooService.listableBeanFactory.get(0)).isSameAs(context.getDefaultListableBeanFactory());
assertThat(fooService.listableBeanFactory.get(1)).isSameAs(myBf);
assertThat(fooService.listableBeanFactory).element(0).isSameAs(context.getDefaultListableBeanFactory());
assertThat(fooService.listableBeanFactory).element(1).isSameAs(myBf);
assertThat(fooService.resourceLoader).isSameAs(context);
assertThat(fooService.resourcePatternResolver).isSameAs(context);
assertThat(fooService.eventPublisher).isSameAs(context);

4
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java
View File

@@ -119,8 +119,8 @@ class ConfigurationClassPostProcessorAotContributionTests {
freshContext.refresh();
TestAwareCallbackBean bean = freshContext.getBean(TestAwareCallbackBean.class);
assertThat(bean.instances).hasSize(2);
assertThat(bean.instances.get(0)).isEqualTo(freshContext);
assertThat(bean.instances.get(1)).isInstanceOfSatisfying(AnnotationMetadata.class, metadata ->
assertThat(bean.instances).element(0).isEqualTo(freshContext);
assertThat(bean.instances).element(1).isInstanceOfSatisfying(AnnotationMetadata.class, metadata ->
assertThat(metadata.getClassName()).isEqualTo(TestAwareCallbackConfiguration.class.getName()));
freshContext.close();
});

4
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@@ -1050,7 +1050,7 @@ class ConfigurationClassPostProcessorTests {
CollectionArgumentConfiguration bean = ctx.getBean(CollectionArgumentConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
assertThat(bean.testBeans).element(0).isSameAs(ctx.getBean(TestBean.class));
ctx.close();
}
@@ -1088,7 +1088,7 @@ class ConfigurationClassPostProcessorTests {
CollectionInjectionConfiguration bean = ctx.getBean(CollectionInjectionConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
assertThat(bean.testBeans).element(0).isSameAs(ctx.getBean(TestBean.class));
ctx.close();
}

8
spring-context/src/test/java/org/springframework/context/annotation/Spr12636Tests.java
View File

@@ -50,8 +50,8 @@ public class Spr12636Tests {
this.context = new AnnotationConfigApplicationContext(
UserServiceTwo.class, UserServiceOne.class, UserServiceCollector.class);
UserServiceCollector bean = this.context.getBean(UserServiceCollector.class);
assertThat(bean.userServices.get(0)).isSameAs(context.getBean("serviceOne", UserService.class));
assertThat(bean.userServices.get(1)).isSameAs(context.getBean("serviceTwo", UserService.class));
assertThat(bean.userServices).element(0).isSameAs(context.getBean("serviceOne", UserService.class));
assertThat(bean.userServices).element(1).isSameAs(context.getBean("serviceTwo", UserService.class));
}
@@ -67,8 +67,8 @@ public class Spr12636Tests {
assertThat(AopUtils.isAopProxy(serviceTwo)).isTrue();
UserServiceCollector bean = this.context.getBean(UserServiceCollector.class);
assertThat(bean.userServices.get(0)).isSameAs(serviceOne);
assertThat(bean.userServices.get(1)).isSameAs(serviceTwo);
assertThat(bean.userServices).element(0).isSameAs(serviceOne);
assertThat(bean.userServices).element(1).isSameAs(serviceTwo);
}
@Configuration

12
spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
View File

@@ -376,7 +376,7 @@ class DefaultLifecycleProcessorTests {
context.stop();
assertThat(stoppedBeans).hasSize(1);
assertThat(bean.isRunning()).isFalse();
assertThat(stoppedBeans.get(0)).isEqualTo(bean);
assertThat(stoppedBeans).element(0).isEqualTo(bean);
context.close();
}
@@ -393,7 +393,7 @@ class DefaultLifecycleProcessorTests {
context.stop();
assertThat(stoppedBeans).hasSize(1);
assertThat(bean.isRunning()).isFalse();
assertThat(stoppedBeans.get(0)).isEqualTo(bean);
assertThat(stoppedBeans).element(0).isEqualTo(bean);
context.close();
}
@@ -467,9 +467,9 @@ class DefaultLifecycleProcessorTests {
assertThat(startedBeans).hasSize(4);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(Integer.MIN_VALUE);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(99);
assertThat(startedBeans.get(1)).isEqualTo(bean99);
assertThat(startedBeans).element(1).isEqualTo(bean99);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(2);
assertThat(startedBeans.get(2)).isEqualTo(bean2);
assertThat(startedBeans).element(2).isEqualTo(bean2);
assertThat(getPhase(startedBeans.get(3))).isEqualTo(Integer.MAX_VALUE);
context.stop();
context.close();
@@ -510,9 +510,9 @@ class DefaultLifecycleProcessorTests {
assertThat(stoppedBeans).hasSize(6);
assertThat(getPhase(stoppedBeans.get(0))).isEqualTo(Integer.MAX_VALUE);
assertThat(getPhase(stoppedBeans.get(1))).isEqualTo(2);
assertThat(stoppedBeans.get(1)).isEqualTo(bean2);
assertThat(stoppedBeans).element(1).isEqualTo(bean2);
assertThat(getPhase(stoppedBeans.get(2))).isEqualTo(99);
assertThat(stoppedBeans.get(2)).isEqualTo(bean99);
assertThat(stoppedBeans).element(2).isEqualTo(bean99);
assertThat(getPhase(stoppedBeans.get(3))).isEqualTo(7);
assertThat(getPhase(stoppedBeans.get(4))).isEqualTo(1);
assertThat(getPhase(stoppedBeans.get(5))).isEqualTo(Integer.MIN_VALUE);

20
spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
View File

@@ -402,28 +402,28 @@ class ResourceBundleMessageSourceTests {
List<String> filenames = ms.calculateFilenamesForLocale("messages", Locale.ENGLISH);
assertThat(filenames).hasSize(1);
assertThat(filenames.get(0)).isEqualTo("messages_en");
assertThat(filenames).element(0).isEqualTo("messages_en");
filenames = ms.calculateFilenamesForLocale("messages", Locale.UK);
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages_en");
assertThat(filenames.get(0)).isEqualTo("messages_en_GB");
assertThat(filenames).element(1).isEqualTo("messages_en");
assertThat(filenames).element(0).isEqualTo("messages_en_GB");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "GB", "POSIX"));
assertThat(filenames).hasSize(3);
assertThat(filenames.get(2)).isEqualTo("messages_en");
assertThat(filenames.get(1)).isEqualTo("messages_en_GB");
assertThat(filenames.get(0)).isEqualTo("messages_en_GB_POSIX");
assertThat(filenames).element(2).isEqualTo("messages_en");
assertThat(filenames).element(1).isEqualTo("messages_en_GB");
assertThat(filenames).element(0).isEqualTo("messages_en_GB_POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "", "POSIX"));
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages_en");
assertThat(filenames.get(0)).isEqualTo("messages_en__POSIX");
assertThat(filenames).element(1).isEqualTo("messages_en");
assertThat(filenames).element(0).isEqualTo("messages_en__POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "UK", "POSIX"));
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages__UK");
assertThat(filenames.get(0)).isEqualTo("messages__UK_POSIX");
assertThat(filenames).element(1).isEqualTo("messages__UK");
assertThat(filenames).element(0).isEqualTo("messages__UK_POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "", "POSIX"));
assertThat(filenames).isEmpty();

4
spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
View File

@@ -33,8 +33,8 @@ class Spr7283Tests {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass());
List<?> list = ctx.getBean("list", List.class);
assertThat(list).hasSize(2);
assertThat(list.get(0)).isInstanceOf(A.class);
assertThat(list.get(1)).isInstanceOf(B.class);
assertThat(list).element(0).isInstanceOf(A.class);
assertThat(list).element(1).isInstanceOf(B.class);
ctx.close();
}

4
spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
View File

@@ -699,8 +699,8 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
ObjectName desired = ObjectNameManager.getInstance(OBJECT_NAME);
assertThat(listener.getRegistered()).as("Incorrect number of registrations").hasSize(1);
assertThat(listener.getUnregistered()).as("Incorrect number of unregistrations").hasSize(1);
assertThat(listener.getRegistered().get(0)).as("Incorrect ObjectName in register").isEqualTo(desired);
assertThat(listener.getUnregistered().get(0)).as("Incorrect ObjectName in unregister").isEqualTo(desired);
assertThat(listener.getRegistered()).element(0).as("Incorrect ObjectName in register").isEqualTo(desired);
assertThat(listener.getUnregistered()).element(0).as("Incorrect ObjectName in unregister").isEqualTo(desired);
}

8
spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@@ -480,7 +480,7 @@ class DataBinderTests {
LocaleContextHolder.setLocale(Locale.GERMAN);
try {
binder.bind(pvs);
assertThat(tb.getIntegerList().get(0)).isEqualTo(1);
assertThat(tb.getIntegerList()).element(0).isEqualTo(1);
assertThat(binder.getBindingResult().getFieldValue("integerList[0]")).isEqualTo("1");
}
finally {
@@ -2007,8 +2007,8 @@ class DataBinderTests {
assertThat(binder.getBindingResult().hasErrors()).isFalse();
@SuppressWarnings("unchecked")
List<Object> list = (List<Object>) form.getF().get("list");
assertThat(list.get(0)).isEqualTo("firstValue");
assertThat(list.get(1)).isEqualTo("secondValue");
assertThat(list).element(0).isEqualTo("firstValue");
assertThat(list).element(1).isEqualTo("secondValue");
assertThat(list).hasSize(2);
}
@@ -2043,7 +2043,7 @@ class DataBinderTests {
binder.bind(pvs);
assertThat(tb.getIntegerList()).hasSize(257);
assertThat(tb.getIntegerList().get(256)).isEqualTo(Integer.valueOf(1));
assertThat(tb.getIntegerList()).element(256).isEqualTo(Integer.valueOf(1));
assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(1);
}