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

Use modern language features in tests

Browse Source
This commit is contained in:
Sam Brannen
2022-02-03 15:35:32 +01:00
parent 32cd73261a
commit b3f786728e
58 changed files with 117 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
View File

@@ -195,14 +195,22 @@ public class PagedListHolderTests {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof MockFilter)) return false;
if (this == o) {
return true;
}
if (!(o instanceof MockFilter mockFilter)) {
return false;
}
final MockFilter mockFilter = (MockFilter) o;
if (!age.equals(mockFilter.age)) return false;
if (!extendedInfo.equals(mockFilter.extendedInfo)) return false;
if (!name.equals(mockFilter.name)) return false;
if (!age.equals(mockFilter.age)) {
return false;
}
if (!extendedInfo.equals(mockFilter.extendedInfo)) {
return false;
}
if (!name.equals(mockFilter.name)) {
return false;
}
return true;
}

3
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java
View File

@@ -44,10 +44,9 @@ public class NestedTestBean implements INestedTestBean {
@Override
public boolean equals(Object obj) {
if (!(obj instanceof NestedTestBean)) {
if (!(obj instanceof NestedTestBean ntb)) {
return false;
}
NestedTestBean ntb = (NestedTestBean) obj;
return this.company.equals(ntb.company);
}

3
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java
View File

@@ -64,10 +64,9 @@ public class SerializablePerson implements Person, Serializable {
@Override
public boolean equals(Object other) {
if (!(other instanceof SerializablePerson)) {
if (!(other instanceof SerializablePerson p)) {
return false;
}
SerializablePerson p = (SerializablePerson) other;
return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
}

3
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java
View File

@@ -468,10 +468,9 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
if (this == other) {
return true;
}
if (!(other instanceof TestBean)) {
if (!(other instanceof TestBean tb2)) {
return false;
}
TestBean tb2 = (TestBean) other;
return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
}

4
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java
View File

@@ -261,11 +261,9 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void aliasing() {
BeanFactory bf = getBeanFactory();
if (!(bf instanceof ConfigurableBeanFactory)) {
if (!(bf instanceof ConfigurableBeanFactory cbf)) {
return;
}
ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) bf;
String alias = "rods alias";
assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() ->