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

Refactor AssertJ assertions into more idiomatic ones

Browse Source 
This commit refactors some AssertJ assertions into more idiomatic and
readable ones. Using the dedicated assertion instead of a generic one
will produce more meaningful error messages. 

For instance, consider collection size:
```
// expected: 5 but was: 2
assertThat(collection.size()).equals(5);
// Expected size: 5 but was: 2 in: [1, 2]
assertThat(collection).hasSize(5);
```

Closes gh-30104
This commit is contained in:
Krzysztof Krasoń
2023-04-04 17:34:07 +02:00
committed by GitHub
parent dd97ee4e99
commit 1734deca1e
371 changed files with 3177 additions and 3076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -205,11 +205,11 @@ abstract class AbstractPropertyAccessorTests {
kerry.setSpouse(target);
AbstractPropertyAccessor accessor = createAccessor(target);
Integer KA = (Integer) accessor.getPropertyValue("spouse.age");
assertThat(KA == 35).as("kerry is 35").isTrue();
assertThat(KA).as("kerry is 35").isEqualTo(35);
Integer RA = (Integer) accessor.getPropertyValue("spouse.spouse.age");
assertThat(RA == 31).as("rod is 31, not" + RA).isTrue();
assertThat(RA).as("rod is 31, not" + RA).isEqualTo(31);
ITestBean spousesSpouse = (ITestBean) accessor.getPropertyValue("spouse.spouse");
assertThat(target == spousesSpouse).as("spousesSpouse = initial point").isTrue();
assertThat(target).as("spousesSpouse = initial point").isSameAs(spousesSpouse);
}
@Test
@@ -242,7 +242,7 @@ abstract class AbstractPropertyAccessorTests {
accessor.setConversionService(new DefaultConversionService());
accessor.setAutoGrowNestedPaths(true);
accessor.setPropertyValue("listOfMaps[0]['luckyNumber']", "9");
assertThat(target.listOfMaps.get(0).get("luckyNumber")).isEqualTo("9");
assertThat(target.listOfMaps.get(0)).containsEntry("luckyNumber", "9");
}
@Test
@@ -298,13 +298,14 @@ abstract class AbstractPropertyAccessorTests {
accessor.setPropertyValue("spouse.company", "Lewisham");
assertThat(kerry.getName()).as("kerry name is Kerry").isEqualTo("Kerry");
assertThat(target.getSpouse() == kerry).as("nested set worked").isTrue();
assertThat(target.getSpouse()).as("nested set worked").isSameAs(kerry);
assertThat(kerry.getSpouse()).as("no back relation").isNull();
accessor.setPropertyValue(new PropertyValue("spouse.spouse", target));
assertThat(kerry.getSpouse() == target).as("nested set worked").isTrue();
assertThat(kerry.getSpouse()).as("nested set worked").isSameAs(target);
AbstractPropertyAccessor kerryAccessor = createAccessor(kerry);
assertThat("Lewisham".equals(kerryAccessor.getPropertyValue("spouse.spouse.spouse.spouse.company"))).as("spouse.spouse.spouse.spouse.company=Lewisham").isTrue();
assertThat(kerryAccessor.getPropertyValue("spouse.spouse.spouse.spouse.company")).as("spouse.spouse.spouse.spouse.company=Lewisham")
.isEqualTo("Lewisham");
}
@Test
@@ -315,13 +316,13 @@ abstract class AbstractPropertyAccessorTests {
AbstractPropertyAccessor accessor = createAccessor(target);
accessor.setPropertyValue("spouse", kerry);
assertThat(target.getSpouse() == kerry).as("nested set worked").isTrue();
assertThat(target.getSpouse()).as("nested set worked").isSameAs(kerry);
assertThat(kerry.getSpouse()).as("no back relation").isNull();
accessor.setPropertyValue(new PropertyValue("spouse.spouse", target));
assertThat(kerry.getSpouse() == target).as("nested set worked").isTrue();
assertThat(kerry.getAge() == 0).as("kerry age not set").isTrue();
assertThat(kerry.getSpouse()).as("nested set worked").isSameAs(target);
assertThat(kerry.getAge()).as("kerry age not set").isEqualTo(0);
accessor.setPropertyValue(new PropertyValue("spouse.age", 35));
assertThat(kerry.getAge() == 35).as("Set primitive on spouse").isTrue();
assertThat(kerry.getAge()).as("Set primitive on spouse").isEqualTo(35);
assertThat(accessor.getPropertyValue("spouse")).isEqualTo(kerry);
assertThat(accessor.getPropertyValue("spouse.spouse")).isEqualTo(target);
@@ -359,7 +360,7 @@ abstract class AbstractPropertyAccessorTests {
accessor.getPropertyValue("spouse.bla");
}
catch (NotReadablePropertyException ex) {
assertThat(ex.getMessage().contains(TestBean.class.getName())).isTrue();
assertThat(ex.getMessage()).contains(TestBean.class.getName());
}
}
@@ -442,12 +443,12 @@ abstract class AbstractPropertyAccessorTests {
target.setAge(age);
target.setName(name);
AbstractPropertyAccessor accessor = createAccessor(target);
assertThat(target.getAge() == age).as("age is OK").isTrue();
assertThat(name.equals(target.getName())).as("name is OK").isTrue();
assertThat(target.getAge()).as("age is OK").isEqualTo(age);
assertThat(name).as("name is OK").isEqualTo(target.getName());
accessor.setPropertyValues(new MutablePropertyValues());
// Check its unchanged
assertThat(target.getAge() == age).as("age is OK").isTrue();
assertThat(name.equals(target.getName())).as("name is OK").isTrue();
assertThat(target.getAge()).as("age is OK").isEqualTo(age);
assertThat(name).as("name is OK").isEqualTo(target.getName());
}
@@ -463,9 +464,9 @@ abstract class AbstractPropertyAccessorTests {
pvs.addPropertyValue(new PropertyValue("name", newName));
pvs.addPropertyValue(new PropertyValue("touchy", newTouchy));
accessor.setPropertyValues(pvs);
assertThat(target.getName().equals(newName)).as("Name property should have changed").isTrue();
assertThat(target.getTouchy().equals(newTouchy)).as("Touchy property should have changed").isTrue();
assertThat(target.getAge() == newAge).as("Age property should have changed").isTrue();
assertThat(target.getName()).as("Name property should have changed").isEqualTo(newName);
assertThat(target.getTouchy()).as("Touchy property should have changed").isEqualTo(newTouchy);
assertThat(target.getAge()).as("Age property should have changed").isEqualTo(newAge);
}
@Test
@@ -480,7 +481,7 @@ abstract class AbstractPropertyAccessorTests {
accessor.setPropertyValue(new PropertyValue("touchy", newTouchy));
assertThat(target.getName()).as("Name property should have changed").isEqualTo(newName);
assertThat(target.getTouchy()).as("Touchy property should have changed").isEqualTo(newTouchy);
assertThat(target.getAge() == newAge).as("Age property should have changed").isTrue();
assertThat(target.getAge()).as("Age property should have changed").isEqualTo(newAge);
}
@Test
@@ -559,11 +560,11 @@ abstract class AbstractPropertyAccessorTests {
}
});
accessor.setPropertyValue("name", new String[] {});
assertThat(target.getName()).isEqualTo("");
assertThat(target.getName()).isEmpty();
accessor.setPropertyValue("name", new String[] {"a1", "b2"});
assertThat(target.getName()).isEqualTo("a1-b2");
accessor.setPropertyValue("name", null);
assertThat(target.getName()).isEqualTo("");
assertThat(target.getName()).isEmpty();
}
@Test
@@ -577,7 +578,7 @@ abstract class AbstractPropertyAccessorTests {
accessor.setPropertyValue("bool2", "false");
assertThat(Boolean.FALSE.equals(accessor.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
assertThat(!target.getBool2()).as("Correct bool2 value").isTrue();
assertThat(target.getBool2()).as("Correct bool2 value").isFalse();
}
@Test
@@ -729,7 +730,7 @@ abstract class AbstractPropertyAccessorTests {
String freedomVal = target.properties.getProperty("freedom");
String peaceVal = target.properties.getProperty("peace");
assertThat(peaceVal).as("peace==war").isEqualTo("war");
assertThat(freedomVal.equals("slavery")).as("Freedom==slavery").isTrue();
assertThat(freedomVal).as("Freedom==slavery").isEqualTo("slavery");
}
@Test
@@ -1344,7 +1345,7 @@ abstract class AbstractPropertyAccessorTests {
pvs.addPropertyValue(new PropertyValue("more.garbage", new Object()));
AbstractPropertyAccessor accessor = createAccessor(target);
accessor.setPropertyValues(pvs, true);
assertThat(target.getName().equals("rod")).as("Set valid and ignored invalid").isTrue();
assertThat(target.getName()).as("Set valid and ignored invalid").isEqualTo("rod");
assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
accessor.setPropertyValues(pvs, false)); // Don't ignore: should fail
}

8
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public abstract class AbstractPropertyValuesTests {
* Must contain: forname=Tony surname=Blair age=50
*/
protected void doTestTony(PropertyValues pvs) {
assertThat(pvs.getPropertyValues().length == 3).as("Contains 3").isTrue();
assertThat(pvs.getPropertyValues()).as("Contains 3").hasSize(3);
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
@@ -45,13 +45,13 @@ public abstract class AbstractPropertyValuesTests {
m.put("age", "50");
for (PropertyValue element : ps) {
Object val = m.get(element.getName());
assertThat(val != null).as("Can't have unexpected value").isTrue();
assertThat(val).as("Can't have unexpected value").isNotNull();
boolean condition = val instanceof String;
assertThat(condition).as("Val i string").isTrue();
assertThat(val.equals(element.getValue())).as("val matches expected").isTrue();
m.remove(element.getName());
}
assertThat(m.size() == 0).as("Map size is 0").isTrue();
assertThat(m).as("Map size is 0").isEmpty();
}
}

66
spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@ class BeanUtilsTests {
PropertyDescriptor[] actual = Introspector.getBeanInfo(TestBean.class).getPropertyDescriptors();
PropertyDescriptor[] descriptors = BeanUtils.getPropertyDescriptors(TestBean.class);
assertThat(descriptors).as("Descriptors should not be null").isNotNull();
assertThat(descriptors.length).as("Invalid number of descriptors returned").isEqualTo(actual.length);
assertThat(descriptors).as("Invalid number of descriptors returned").hasSameSizeAs(actual);
}
@Test
@@ -161,13 +161,13 @@ class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
TestBean tb2 = new TestBean();
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
assertThat(tb2.getName()).as("Name empty").isNull();
assertThat(tb2.getAge()).as("Age empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy empty").isNull();
BeanUtils.copyProperties(tb, tb2);
assertThat(tb2.getName().equals(tb.getName())).as("Name copied").isTrue();
assertThat(tb2.getAge() == tb.getAge()).as("Age copied").isTrue();
assertThat(tb2.getTouchy().equals(tb.getTouchy())).as("Touchy copied").isTrue();
assertThat(tb2.getName()).as("Name copied").isEqualTo(tb.getName());
assertThat(tb2.getAge()).as("Age copied").isEqualTo(tb.getAge());
assertThat(tb2.getTouchy()).as("Touchy copied").isEqualTo(tb.getTouchy());
}
@Test
@@ -177,13 +177,13 @@ class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
TestBean tb2 = new TestBean();
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
assertThat(tb2.getName()).as("Name empty").isNull();
assertThat(tb2.getAge()).as("Age empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy empty").isNull();
BeanUtils.copyProperties(tb, tb2);
assertThat(tb2.getName().equals(tb.getName())).as("Name copied").isTrue();
assertThat(tb2.getAge() == tb.getAge()).as("Age copied").isTrue();
assertThat(tb2.getTouchy().equals(tb.getTouchy())).as("Touchy copied").isTrue();
assertThat(tb2.getName()).as("Name copied").isEqualTo(tb.getName());
assertThat(tb2.getAge()).as("Age copied").isEqualTo(tb.getAge());
assertThat(tb2.getTouchy()).as("Touchy copied").isEqualTo(tb.getTouchy());
}
@Test
@@ -193,13 +193,13 @@ class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
DerivedTestBean tb2 = new DerivedTestBean();
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
assertThat(tb2.getName()).as("Name empty").isNull();
assertThat(tb2.getAge()).as("Age empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy empty").isNull();
BeanUtils.copyProperties(tb, tb2);
assertThat(tb2.getName().equals(tb.getName())).as("Name copied").isTrue();
assertThat(tb2.getAge() == tb.getAge()).as("Age copied").isTrue();
assertThat(tb2.getTouchy().equals(tb.getTouchy())).as("Touchy copied").isTrue();
assertThat(tb2.getName()).as("Name copied").isEqualTo(tb.getName());
assertThat(tb2.getAge()).as("Age copied").isEqualTo(tb.getAge());
assertThat(tb2.getTouchy()).as("Touchy copied").isEqualTo(tb.getTouchy());
}
/**
@@ -342,37 +342,37 @@ class BeanUtilsTests {
@Test
void copyPropertiesWithEditable() throws Exception {
TestBean tb = new TestBean();
assertThat(tb.getName() == null).as("Name empty").isTrue();
assertThat(tb.getName()).as("Name empty").isNull();
tb.setAge(32);
tb.setTouchy("bla");
TestBean tb2 = new TestBean();
tb2.setName("rod");
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
assertThat(tb2.getAge()).as("Age empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy empty").isNull();
// "touchy" should not be copied: it's not defined in ITestBean
BeanUtils.copyProperties(tb, tb2, ITestBean.class);
assertThat(tb2.getName() == null).as("Name copied").isTrue();
assertThat(tb2.getAge() == 32).as("Age copied").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy still empty").isTrue();
assertThat(tb2.getName()).as("Name copied").isNull();
assertThat(tb2.getAge()).as("Age copied").isEqualTo(32);
assertThat(tb2.getTouchy()).as("Touchy still empty").isNull();
}
@Test
void copyPropertiesWithIgnore() throws Exception {
TestBean tb = new TestBean();
assertThat(tb.getName() == null).as("Name empty").isTrue();
assertThat(tb.getName()).as("Name empty").isNull();
tb.setAge(32);
tb.setTouchy("bla");
TestBean tb2 = new TestBean();
tb2.setName("rod");
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
assertThat(tb2.getAge()).as("Age empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy empty").isNull();
// "spouse", "touchy", "age" should not be copied
BeanUtils.copyProperties(tb, tb2, "spouse", "touchy", "age");
assertThat(tb2.getName() == null).as("Name copied").isTrue();
assertThat(tb2.getAge() == 0).as("Age still empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy still empty").isTrue();
assertThat(tb2.getName()).as("Name copied").isNull();
assertThat(tb2.getAge()).as("Age still empty").isEqualTo(0);
assertThat(tb2.getTouchy()).as("Touchy still empty").isNull();
}
@Test
@@ -381,7 +381,7 @@ class BeanUtilsTests {
source.setName("name");
TestBean target = new TestBean();
BeanUtils.copyProperties(source, target, "specialProperty");
assertThat("name").isEqualTo(target.getName());
assertThat(target.getName()).isEqualTo("name");
}
@Test

8
spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -90,15 +90,15 @@ public class BeanWrapperAutoGrowingTests {
@Test
public void getPropertyValueAutoGrow2dArray() {
assertNotNull(wrapper.getPropertyValue("multiArray[0][0]"));
assertThat(wrapper.getPropertyValue("multiArray[0][0]")).isNotNull();
assertThat(bean.getMultiArray()[0]).hasSize(1);
assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
}
@Test
public void getPropertyValueAutoGrow3dArray() {
assertNotNull(wrapper.getPropertyValue("threeDimensionalArray[1][2][3]"));
assertThat(bean.getThreeDimensionalArray()[1].length).isEqualTo(3);
assertThat(wrapper.getPropertyValue("threeDimensionalArray[1][2][3]")).isNotNull();
assertThat(bean.getThreeDimensionalArray()[1]).hasNumberOfRows(3);
assertThat(bean.getThreeDimensionalArray()[1][2][3]).isInstanceOf(Bean.class);
}

16
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -161,8 +161,8 @@ class BeanWrapperGenericsTests {
value2.add(Boolean.TRUE);
input.put("2", value2);
bw.setPropertyValue("collectionMap", input);
assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
assertThat(gb.getCollectionMap().get(2) instanceof ArrayList).isTrue();
assertThat(gb.getCollectionMap().get(1)).isInstanceOf(HashSet.class);
assertThat(gb.getCollectionMap().get(2)).isInstanceOf(ArrayList.class);
}
@Test
@@ -174,7 +174,7 @@ class BeanWrapperGenericsTests {
HashSet<Integer> value1 = new HashSet<>();
value1.add(1);
bw.setPropertyValue("collectionMap[1]", value1);
assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
assertThat(gb.getCollectionMap().get(1)).isInstanceOf(HashSet.class);
}
@Test
@@ -320,7 +320,7 @@ class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfInteger", map);
Object obj = gb.getMapOfInteger().get("testKey");
assertThat(obj instanceof Integer).isTrue();
assertThat(obj).isInstanceOf(Integer.class);
}
@Test
@@ -334,7 +334,7 @@ class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfListOfInteger", map);
Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
assertThat(obj instanceof Integer).isTrue();
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(1);
}
@@ -350,7 +350,7 @@ class BeanWrapperGenericsTests {
bw.setPropertyValue("listOfMapOfInteger", list);
Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
assertThat(obj instanceof Integer).isTrue();
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(5);
}
@@ -365,7 +365,7 @@ class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfListOfListOfInteger", map);
Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
assertThat(obj instanceof Integer).isTrue();
assertThat(obj).isInstanceOf(Integer.class);
assertThat(((Integer) obj).intValue()).isEqualTo(1);
}

10
spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -246,16 +246,16 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
accessor.setPropertyValue("object", tb);
assertThat(target.value).isSameAs(tb);
assertThat(target.getObject().get()).isSameAs(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object")).get()).isSameAs(tb);
assertThat(target.getObject()).containsSame(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object"))).containsSame(tb);
assertThat(target.value.getName()).isEqualTo("x");
assertThat(target.getObject().get().getName()).isEqualTo("x");
assertThat(accessor.getPropertyValue("object.name")).isEqualTo("x");
accessor.setPropertyValue("object.name", "y");
assertThat(target.value).isSameAs(tb);
assertThat(target.getObject().get()).isSameAs(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object")).get()).isSameAs(tb);
assertThat(target.getObject()).containsSame(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object"))).containsSame(tb);
assertThat(target.value.getName()).isEqualTo("y");
assertThat(target.getObject().get().getName()).isEqualTo("y");
assertThat(accessor.getPropertyValue("object.name")).isEqualTo("y");

6
spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -585,7 +585,7 @@ class ExtendedBeanInfoTests {
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
assertThat(ebi.getPropertyDescriptors()).hasSize(bi.getPropertyDescriptors().length);
assertThat(ebi.getPropertyDescriptors()).hasSameSizeAs(bi.getPropertyDescriptors());
}
@Test
@@ -711,7 +711,7 @@ class ExtendedBeanInfoTests {
BeanInfo bi = Introspector.getBeanInfo(TestBean.class);
BeanInfo ebi = new ExtendedBeanInfo(bi);
assertThat(ebi.getPropertyDescriptors()).hasSize(bi.getPropertyDescriptors().length);
assertThat(ebi.getPropertyDescriptors()).hasSameSizeAs(bi.getPropertyDescriptors());
}
@Test

16
spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
pvs.addPropertyValue(new PropertyValue("age", "50"));
MutablePropertyValues pvs2 = pvs;
PropertyValues changes = pvs2.changesSince(pvs);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty").isTrue();
assertThat(changes.getPropertyValues().length).as("changes are empty").isEqualTo(0);
}
@Test
@@ -82,26 +82,28 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
MutablePropertyValues pvs2 = new MutablePropertyValues(pvs);
PropertyValues changes = pvs2.changesSince(pvs);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty, not of length " + changes.getPropertyValues().length).isTrue();
assertThat(changes.getPropertyValues().length).as("changes are empty, not of length " + changes.getPropertyValues().length)
.isEqualTo(0);
pvs2.addPropertyValue(new PropertyValue("forname", "Gordon"));
changes = pvs2.changesSince(pvs);
assertThat(changes.getPropertyValues().length).as("1 change").isEqualTo(1);
PropertyValue fn = changes.getPropertyValue("forname");
assertThat(fn != null).as("change is forname").isTrue();
assertThat(fn).as("change is forname").isNotNull();
assertThat(fn.getValue().equals("Gordon")).as("new value is gordon").isTrue();
MutablePropertyValues pvs3 = new MutablePropertyValues(pvs);
changes = pvs3.changesSince(pvs);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty, not of length " + changes.getPropertyValues().length).isTrue();
assertThat(changes.getPropertyValues().length).as("changes are empty, not of length " + changes.getPropertyValues().length)
.isEqualTo(0);
// add new
pvs3.addPropertyValue(new PropertyValue("foo", "bar"));
pvs3.addPropertyValue(new PropertyValue("fi", "fum"));
changes = pvs3.changesSince(pvs);
assertThat(changes.getPropertyValues().length == 2).as("2 change").isTrue();
assertThat(changes.getPropertyValues().length).as("2 change").isEqualTo(2);
fn = changes.getPropertyValue("foo");
assertThat(fn != null).as("change in foo").isTrue();
assertThat(fn).as("change in foo").isNotNull();
assertThat(fn.getValue().equals("bar")).as("new value is bar").isTrue();
}

8
spring-beans/src/test/java/org/springframework/beans/PropertyAccessorUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ public class PropertyAccessorUtilsTests {
@Test
public void getPropertyName() {
assertThat(PropertyAccessorUtils.getPropertyName("")).isEqualTo("");
assertThat(PropertyAccessorUtils.getPropertyName("[user]")).isEqualTo("");
assertThat(PropertyAccessorUtils.getPropertyName("")).isEmpty();
assertThat(PropertyAccessorUtils.getPropertyName("[user]")).isEmpty();
assertThat(PropertyAccessorUtils.getPropertyName("user")).isEqualTo("user");
}
@@ -69,7 +69,7 @@ public class PropertyAccessorUtilsTests {
@Test
public void canonicalPropertyName() {
assertThat(PropertyAccessorUtils.canonicalPropertyName(null)).isEqualTo("");
assertThat(PropertyAccessorUtils.canonicalPropertyName(null)).isEmpty();
assertThat(PropertyAccessorUtils.canonicalPropertyName("map")).isEqualTo("map");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[key1]")).isEqualTo("map[key1]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map['key1']")).isEqualTo("map[key1]");

13
spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ public class BeanFactoryUtilsTests {
StaticListableBeanFactory lbf = new StaticListableBeanFactory();
lbf.addBean("t1", new TestBean());
lbf.addBean("t2", new TestBean());
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(lbf) == 2).isTrue();
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(lbf)).isEqualTo(2);
}
/**
@@ -94,9 +94,10 @@ public class BeanFactoryUtilsTests {
@Test
public void testHierarchicalCountBeansWithOverride() {
// Leaf count
assertThat(this.listableBeanFactory.getBeanDefinitionCount() == 1).isTrue();
assertThat(this.listableBeanFactory.getBeanDefinitionCount()).isEqualTo(1);
// Count minus duplicate
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory) == 8).as("Should count 8 beans, not " + BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory)).isTrue();
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory)).as("Should count 8 beans, not " + BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory))
.isEqualTo(8);
}
@Test
@@ -113,7 +114,7 @@ public class BeanFactoryUtilsTests {
assertThat(names).hasSize(1);
assertThat(names.contains("indexedBean")).isTrue();
// Distinguish from default ListableBeanFactory behavior
assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class).length == 0).isTrue();
assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class)).isEmpty();
}
@Test
@@ -288,7 +289,7 @@ public class BeanFactoryUtilsTests {
assertThat(names).hasSize(1);
assertThat(names.contains("annotatedBean")).isTrue();
// Distinguish from default ListableBeanFactory behavior
assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class).length == 0).isTrue();
assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class)).isEmpty();
}
@Test

108
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -137,7 +137,7 @@ class DefaultListableBeanFactoryTests {
KnowsIfInstantiated.clearInstantiationRecord();
Properties p = new Properties();
p.setProperty("x1.(class)", KnowsIfInstantiated.class.getName());
assertThat(!KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isTrue();
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isFalse();
registerBeanDefinitions(p);
lbf.preInstantiateSingletons();
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton was instantiated").isTrue();
@@ -149,12 +149,12 @@ class DefaultListableBeanFactoryTests {
Properties p = new Properties();
p.setProperty("x1.(class)", KnowsIfInstantiated.class.getName());
p.setProperty("x1.(lazy-init)", "true");
assertThat(!KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isTrue();
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isFalse();
registerBeanDefinitions(p);
assertThat(!KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isTrue();
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isFalse();
lbf.preInstantiateSingletons();
assertThat(!KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isTrue();
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton not instantiated").isFalse();
lbf.getBean("x1");
assertThat(KnowsIfInstantiated.wasInstantiated()).as("singleton was instantiated").isTrue();
}
@@ -166,13 +166,13 @@ class DefaultListableBeanFactoryTests {
// Reset static state
DummyFactory.reset();
p.setProperty("x1.singleton", "false");
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
registerBeanDefinitions(p);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
lbf.preInstantiateSingletons();
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
lbf.getBean("x1");
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
assertThat(lbf.containsBean("x1")).isTrue();
@@ -190,7 +190,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("x1.singleton", "false");
registerBeanDefinitions(p);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
assertBeanNamesForType(TestBean.class, false, false);
assertThat(lbf.getBeanNamesForAnnotation(SuppressWarnings.class)).isEmpty();
@@ -209,7 +209,7 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClassWithGenerics(FactoryBean.class, String.class))).isFalse();
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
assertThat(lbf.getType("&x1")).isEqualTo(DummyFactory.class);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
}
@Test
@@ -222,7 +222,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("x1.singleton", "true");
registerBeanDefinitions(p);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
assertBeanNamesForType(TestBean.class, false, false);
assertThat(lbf.getBeanNamesForAnnotation(SuppressWarnings.class)).isEmpty();
@@ -241,7 +241,7 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClassWithGenerics(FactoryBean.class, String.class))).isFalse();
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
assertThat(lbf.getType("&x1")).isEqualTo(DummyFactory.class);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
}
@Test
@@ -253,7 +253,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("x1.singleton", "false");
registerBeanDefinitions(p);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
assertBeanNamesForType(TestBean.class, false, false);
assertThat(lbf.getBeanNamesForAnnotation(SuppressWarnings.class)).isEmpty();
@@ -272,7 +272,7 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClassWithGenerics(FactoryBean.class, String.class))).isFalse();
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
assertThat(lbf.getType("&x1")).isEqualTo(DummyFactory.class);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
}
@Test
@@ -303,7 +303,7 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.isTypeMatch("&x1", Object.class)).isTrue();
assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
assertThat(lbf.getType("&x1")).isEqualTo(DummyFactory.class);
assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
lbf.registerAlias("x1", "x2");
assertThat(lbf.containsBean("x2")).isTrue();
@@ -449,9 +449,9 @@ class DefaultListableBeanFactoryTests {
@Test
void empty() {
assertThat(lbf.getBeanDefinitionNames() != null).as("No beans defined --> array != null").isTrue();
assertThat(lbf.getBeanDefinitionNames().length == 0).as("No beans defined after no arg constructor").isTrue();
assertThat(lbf.getBeanDefinitionCount() == 0).as("No beans defined after no arg constructor").isTrue();
assertThat(lbf.getBeanDefinitionNames()).as("No beans defined --> array != null").isNotNull();
assertThat(lbf.getBeanDefinitionNames()).as("No beans defined after no arg constructor").isEmpty();
assertThat(lbf.getBeanDefinitionCount()).as("No beans defined after no arg constructor").isEqualTo(0);
}
@Test
@@ -459,7 +459,7 @@ class DefaultListableBeanFactoryTests {
Properties p = new Properties();
registerBeanDefinitions(p);
assertThat(lbf.getBeanDefinitionCount() == 0).as("No beans defined after ignorable invalid").isTrue();
assertThat(lbf.getBeanDefinitionCount()).as("No beans defined after ignorable invalid").isEqualTo(0);
}
@Test
@@ -469,7 +469,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("qwert", "er");
registerBeanDefinitions(p, "test");
assertThat(lbf.getBeanDefinitionCount() == 0).as("No beans defined after harmless ignorable rubbish").isTrue();
assertThat(lbf.getBeanDefinitionCount()).as("No beans defined after harmless ignorable rubbish").isEqualTo(0);
}
@Test
@@ -480,7 +480,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("test.age", "48");
int count = registerBeanDefinitions(p);
assertThat(count == 1).as("1 beans registered, not " + count).isTrue();
assertThat(count).as("1 beans registered, not " + count).isEqualTo(1);
testPropertiesPopulation(lbf);
}
@@ -493,7 +493,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty(PREFIX + "test.age", "0x30");
int count = registerBeanDefinitions(p, PREFIX);
assertThat(count == 1).as("1 beans registered, not " + count).isTrue();
assertThat(count).as("1 beans registered, not " + count).isEqualTo(1);
testPropertiesPopulation(lbf);
}
@@ -524,13 +524,13 @@ class DefaultListableBeanFactoryTests {
p.setProperty(PREFIX + "kerry.spouse(ref)", "rod");
int count = registerBeanDefinitions(p, PREFIX);
assertThat(count == 2).as("2 beans registered, not " + count).isTrue();
assertThat(count).as("2 beans registered, not " + count).isEqualTo(2);
TestBean kerry = lbf.getBean("kerry", TestBean.class);
assertThat("Kerry".equals(kerry.getName())).as("Kerry name is Kerry").isTrue();
assertThat(kerry.getName()).as("Kerry name is Kerry").isEqualTo("Kerry");
ITestBean spouse = kerry.getSpouse();
assertThat(spouse != null).as("Kerry spouse is non null").isTrue();
assertThat("Rod".equals(spouse.getName())).as("Kerry spouse name is Rod").isTrue();
assertThat(spouse).as("Kerry spouse is non null").isNotNull();
assertThat(spouse.getName()).as("Kerry spouse name is Rod").isEqualTo("Rod");
}
@Test
@@ -541,7 +541,7 @@ class DefaultListableBeanFactoryTests {
p.setProperty("tb.someMap[my.key]", "my.value");
int count = registerBeanDefinitions(p);
assertThat(count == 1).as("1 beans registered, not " + count).isTrue();
assertThat(count).as("1 beans registered, not " + count).isEqualTo(1);
assertThat(lbf.getBeanDefinitionCount()).isEqualTo(1);
TestBean tb = lbf.getBean("tb", TestBean.class);
@@ -682,8 +682,8 @@ class DefaultListableBeanFactoryTests {
registerBeanDefinitions(p);
TestBean kerry1 = (TestBean) lbf.getBean("kerry");
TestBean kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1 != null).as("Non null").isTrue();
assertThat(kerry1 == kerry2).as("Singletons equal").isTrue();
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1).as("Singletons equal").isSameAs(kerry2);
p = new Properties();
p.setProperty("kerry.(class)", TestBean.class.getName());
@@ -692,8 +692,8 @@ class DefaultListableBeanFactoryTests {
registerBeanDefinitions(p);
kerry1 = (TestBean) lbf.getBean("kerry");
kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1 != null).as("Non null").isTrue();
assertThat(kerry1 != kerry2).as("Prototypes NOT equal").isTrue();
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1).as("Prototypes NOT equal").isNotSameAs(kerry2);
p = new Properties();
p.setProperty("kerry.(class)", TestBean.class.getName());
@@ -702,8 +702,8 @@ class DefaultListableBeanFactoryTests {
registerBeanDefinitions(p);
kerry1 = (TestBean) lbf.getBean("kerry");
kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1 != null).as("Non null").isTrue();
assertThat(kerry1 == kerry2).as("Specified singletons equal").isTrue();
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1).as("Specified singletons equal").isSameAs(kerry2);
}
@Test
@@ -737,7 +737,7 @@ class DefaultListableBeanFactoryTests {
TestBean kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1.getName()).isEqualTo("kerry");
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1 == kerry2).as("Singletons equal").isTrue();
assertThat(kerry1).as("Singletons equal").isSameAs(kerry2);
p = new Properties();
p.setProperty("wife.(class)", TestBean.class.getName());
@@ -750,8 +750,8 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.isSingleton("kerry")).isFalse();
kerry1 = (TestBean) lbf.getBean("kerry");
kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1 != null).as("Non null").isTrue();
assertThat(kerry1 != kerry2).as("Prototypes NOT equal").isTrue();
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1).as("Prototypes NOT equal").isNotSameAs(kerry2);
p = new Properties();
p.setProperty("kerry.(class)", TestBean.class.getName());
@@ -760,8 +760,8 @@ class DefaultListableBeanFactoryTests {
registerBeanDefinitions(p);
kerry1 = (TestBean) lbf.getBean("kerry");
kerry2 = (TestBean) lbf.getBean("kerry");
assertThat(kerry1 != null).as("Non null").isTrue();
assertThat(kerry1 == kerry2).as("Specified singletons equal").isTrue();
assertThat(kerry1).as("Non null").isNotNull();
assertThat(kerry1).as("Specified singletons equal").isSameAs(kerry2);
}
@Test
@@ -972,7 +972,7 @@ class DefaultListableBeanFactoryTests {
TestBean k = (TestBean) lbf.getBean("k");
TestBean r = (TestBean) lbf.getBean("r");
assertThat(k.getSpouse() == r).isTrue();
assertThat(k.getSpouse()).isSameAs(r);
}
@Test
@@ -984,7 +984,7 @@ class DefaultListableBeanFactoryTests {
registerBeanDefinitions(p);
TestBean r = (TestBean) lbf.getBean("r");
assertThat(r.getName().equals(name)).isTrue();
assertThat(r.getName()).isEqualTo(name);
}
@Test
@@ -1000,7 +1000,7 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("testBean", bd);
TestBean testBean = (TestBean) lbf.getBean("testBean");
assertThat(testBean.getMyFloat() == 1.1f).isTrue();
assertThat(testBean.getMyFloat()).isEqualTo(1.1f);
}
@Test
@@ -1024,7 +1024,7 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("testBean", bd);
TestBean testBean = (TestBean) lbf.getBean("testBean");
assertThat(testBean.getMyFloat() == 1.1f).isTrue();
assertThat(testBean.getMyFloat()).isEqualTo(1.1f);
}
@Test
@@ -1041,7 +1041,7 @@ class DefaultListableBeanFactoryTests {
lbf.registerSingleton("myFloat", "1,1");
TestBean testBean = (TestBean) lbf.getBean("testBean");
assertThat(testBean.getMyFloat() == 1.1f).isTrue();
assertThat(testBean.getMyFloat()).isEqualTo(1.1f);
}
@Test
@@ -1058,7 +1058,7 @@ class DefaultListableBeanFactoryTests {
TestBean testBean = (TestBean) lbf.getBean("testBean");
assertThat(testBean.getName()).isEqualTo("myName");
assertThat(testBean.getAge()).isEqualTo(5);
assertThat(testBean.getMyFloat() == 1.1f).isTrue();
assertThat(testBean.getMyFloat()).isEqualTo(1.1f);
}
@Test
@@ -1076,7 +1076,7 @@ class DefaultListableBeanFactoryTests {
TestBean testBean = (TestBean) lbf.getBean("testBean");
assertThat(testBean.getName()).isEqualTo("myName");
assertThat(testBean.getAge()).isEqualTo(5);
assertThat(testBean.getMyFloat() == 1.1f).isTrue();
assertThat(testBean.getMyFloat()).isEqualTo(1.1f);
}
@Test
@@ -1300,7 +1300,7 @@ class DefaultListableBeanFactoryTests {
assertThat(lbf.getBeanDefinitionCount()).isEqualTo(1);
Object registered = lbf.autowire(NoDependencies.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false);
assertThat(lbf.getBeanDefinitionCount()).isEqualTo(1);
assertThat(registered instanceof NoDependencies).isTrue();
assertThat(registered).isInstanceOf(NoDependencies.class);
}
@Test
@@ -1371,8 +1371,8 @@ class DefaultListableBeanFactoryTests {
lbf.autowire(ConstructorDependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, true);
Object spouse = lbf.getBean("spouse");
assertThat(bean.getSpouse1() == spouse).isTrue();
assertThat(BeanFactoryUtils.beanOfType(lbf, TestBean.class) == spouse).isTrue();
assertThat(bean.getSpouse1()).isSameAs(spouse);
assertThat(BeanFactoryUtils.beanOfType(lbf, TestBean.class)).isSameAs(spouse);
}
@Test
@@ -1384,7 +1384,7 @@ class DefaultListableBeanFactoryTests {
TestBean spouse = (TestBean) lbf.getBean("spouse");
assertThat(bean.getSpouse()).isEqualTo(spouse);
assertThat(BeanFactoryUtils.beanOfType(lbf, TestBean.class) == spouse).isTrue();
assertThat(BeanFactoryUtils.beanOfType(lbf, TestBean.class)).isSameAs(spouse);
}
@Test
@@ -2248,7 +2248,7 @@ class DefaultListableBeanFactoryTests {
for (int i = 0; i < 1000; i++) {
TestBean bean = (TestBean) lbf.getBean("bean" + i);
TestBean otherBean = (TestBean) lbf.getBean("bean" + (i < 99 ? i + 1 : 0));
assertThat(bean.getSpouse() == otherBean).isTrue();
assertThat(bean.getSpouse()).isSameAs(otherBean);
}
}
@@ -2350,8 +2350,8 @@ class DefaultListableBeanFactoryTests {
factory.registerBeanDefinition("tb2", bd2);
factory.registerBeanDefinition("tb3", new RootBeanDefinition(TestBean.class));
assertThat(((AbstractBeanDefinition) factory.getMergedBeanDefinition("tb1")).getLazyInit()).isEqualTo(Boolean.TRUE);
assertThat(((AbstractBeanDefinition) factory.getMergedBeanDefinition("tb2")).getLazyInit()).isEqualTo(Boolean.FALSE);
assertThat(((AbstractBeanDefinition) factory.getMergedBeanDefinition("tb1")).getLazyInit()).isTrue();
assertThat(((AbstractBeanDefinition) factory.getMergedBeanDefinition("tb2")).getLazyInit()).isFalse();
assertThat(((AbstractBeanDefinition) factory.getMergedBeanDefinition("tb3")).getLazyInit()).isNull();
factory.preInstantiateSingletons();
@@ -2405,7 +2405,7 @@ class DefaultListableBeanFactoryTests {
assertThat(tb.getBeanName()).isEqualTo("myBeanName");
DerivedTestBean tb2 = (DerivedTestBean) lbf.getBean("test");
assertThat(tb != tb2).isTrue();
assertThat(tb).isNotSameAs(tb2);
assertThat(tb2.getName()).isEqualTo("myName");
assertThat(tb2.getBeanName()).isEqualTo("myBeanName");
}
@@ -2424,7 +2424,7 @@ class DefaultListableBeanFactoryTests {
assertThat(tb.getBeanName()).isEqualTo("myBeanName");
DerivedTestBean tb2 = (DerivedTestBean) lbf.getBean("test");
assertThat(tb != tb2).isTrue();
assertThat(tb).isNotSameAs(tb2);
assertThat(tb2.getName()).isEqualTo("myName");
assertThat(tb2.getBeanName()).isEqualTo("myBeanName");
}
@@ -2747,7 +2747,7 @@ class DefaultListableBeanFactoryTests {
bd.setFactoryMethodName("empty");
lbf.registerBeanDefinition("optionalBean", bd);
assertThat((Optional<?>) lbf.getBean(Optional.class)).isSameAs(Optional.empty());
assertThat((Optional<?>) lbf.getBean(Optional.class)).isEmpty();
}
@Test

26
spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -494,7 +494,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalFieldInjectionBean bean = (OptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@@ -503,7 +503,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalFieldInjectionBean.class));
OptionalFieldInjectionBean bean = (OptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test
@@ -512,7 +512,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalMethodInjectionBean bean = (OptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@@ -521,7 +521,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalMethodInjectionBean.class));
OptionalMethodInjectionBean bean = (OptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test
@@ -530,7 +530,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalListFieldInjectionBean bean = (OptionalListFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get().get(0)).isSameAs(bf.getBean("testBean"));
}
@@ -539,7 +539,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListFieldInjectionBean.class));
OptionalListFieldInjectionBean bean = (OptionalListFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test
@@ -548,7 +548,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalListMethodInjectionBean bean = (OptionalListMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get().get(0)).isSameAs(bf.getBean("testBean"));
}
@@ -557,7 +557,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListMethodInjectionBean.class));
OptionalListMethodInjectionBean bean = (OptionalListMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test
@@ -566,7 +566,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
ProviderOfOptionalFieldInjectionBean bean = (ProviderOfOptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@@ -575,7 +575,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalFieldInjectionBean.class));
ProviderOfOptionalFieldInjectionBean bean = (ProviderOfOptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test
@@ -584,7 +584,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
ProviderOfOptionalMethodInjectionBean bean = (ProviderOfOptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean()).isPresent();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@@ -593,7 +593,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalMethodInjectionBean.class));
ProviderOfOptionalMethodInjectionBean bean = (ProviderOfOptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertThat(bean.getTestBean().isPresent()).isFalse();
assertThat(bean.getTestBean()).isNotPresent();
}
@Test

2
spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java
View File

@@ -406,7 +406,7 @@ class BeanDefinitionMethodGeneratorTests {
compile(method, (actual, compiled) -> {
ManagedList<RootBeanDefinition> actualPropertyValue = (ManagedList<RootBeanDefinition>) actual
.getPropertyValues().get("someList");
assertThat(actualPropertyValue).isNotNull().hasSize(2);
assertThat(actualPropertyValue).hasSize(2);
assertThat(actualPropertyValue.get(0).getPropertyValues().get("name")).isEqualTo("one");
assertThat(actualPropertyValue.get(1).getPropertyValues().get("name")).isEqualTo("two");
assertThat(compiled.getSourceFileFromPackage(TestBean.class.getPackageName()))

8
spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
View File

@@ -67,7 +67,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) objectFactory.getObject();
Date date2 = (Date) objectFactory.getObject();
assertThat(date1 != date2).isTrue();
assertThat(date1).isNotSameAs(date2);
}
@Test
@@ -79,7 +79,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) objectFactory.getObject();
Date date2 = (Date) objectFactory.getObject();
assertThat(date1 != date2).isTrue();
assertThat(date1).isNotSameAs(date2);
}
@Test
@@ -89,7 +89,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) provider.get();
Date date2 = (Date) provider.get();
assertThat(date1 != date2).isTrue();
assertThat(date1).isNotSameAs(date2);
}
@Test
@@ -101,7 +101,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) provider.get();
Date date2 = (Date) provider.get();
assertThat(date1 != date2).isTrue();
assertThat(date1).isNotSameAs(date2);
}
@Test

4
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ public class PropertiesFactoryBeanTests {
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(props.getProperty("key2")).isEqualTo("value2");
Properties newProps = pfb.getObject();
assertThat(props != newProps).isTrue();
assertThat(props).isNotSameAs(newProps);
assertThat(newProps.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(newProps.getProperty("key2")).isEqualTo("value2");
}

10
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public class PropertyPathFactoryBeanTests {
Object result2 = xbf.getBean("otb.spouse");
boolean condition = result1 instanceof TestBean;
assertThat(condition).isTrue();
assertThat(result1 == result2).isTrue();
assertThat(result1).isSameAs(result2);
assertThat(((TestBean) result1).getAge()).isEqualTo(99);
}
@@ -73,9 +73,9 @@ public class PropertyPathFactoryBeanTests {
assertThat(((TestBean) result1).getAge()).isEqualTo(11);
assertThat(((TestBean) result2).getAge()).isEqualTo(11);
assertThat(((TestBean) result3).getAge()).isEqualTo(11);
assertThat(result1 != result2).isTrue();
assertThat(result1 != result3).isTrue();
assertThat(result2 != result3).isTrue();
assertThat(result1).isNotSameAs(result2);
assertThat(result1).isNotSameAs(result3);
assertThat(result2).isNotSameAs(result3);
}
@Test

4
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -276,7 +276,7 @@ public class PropertyResourceConfigurerTests {
}
catch (BeanInitializationException ex) {
// prove that the processor chokes on the invalid key
assertThat(ex.getMessage().toLowerCase().contains("argh")).isTrue();
assertThat(ex.getMessage().toLowerCase()).contains("argh");
}
}
}

2
spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
View File

@@ -165,7 +165,7 @@ public class ServiceLocatorFactoryBeanTests {
assertThat(testBean4).isNotSameAs(testBean2);
assertThat(testBean4).isNotSameAs(testBean3);
assertThat(factory.toString().contains("TestServiceLocator3")).isTrue();
assertThat(factory.toString()).contains("TestServiceLocator3");
}
@Disabled @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory

6
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -180,7 +180,7 @@ class YamlPropertiesFactoryBeanTests {
factory.setResources(new ByteArrayResource("foo: bar\nspam:".getBytes()));
Properties properties = factory.getObject();
assertThat(properties.getProperty("foo")).isEqualTo("bar");
assertThat(properties.getProperty("spam")).isEqualTo("");
assertThat(properties.getProperty("spam")).isEmpty();
}
@Test
@@ -189,7 +189,7 @@ class YamlPropertiesFactoryBeanTests {
factory.setResources(new ByteArrayResource("a: alpha\ntest: []".getBytes()));
Properties properties = factory.getObject();
assertThat(properties.getProperty("a")).isEqualTo("alpha");
assertThat(properties.getProperty("test")).isEqualTo("");
assertThat(properties.getProperty("test")).isEmpty();
}
@Test

4
spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class CustomProblemReporterTests {
@Test
public void testErrorsAreCollated() {
this.reader.loadBeanDefinitions(qualifiedResource(CustomProblemReporterTests.class, "context.xml"));
assertThat(this.problemReporter.getErrors().length).as("Incorrect number of errors collated").isEqualTo(4);
assertThat(this.problemReporter.getErrors()).as("Incorrect number of errors collated").hasSize(4);
TestBean bean = (TestBean) this.beanFactory.getBean("validBean");
assertThat(bean).isNotNull();

18
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class BeanDefinitionTests {
otherBd.setScope("request");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@Test
@@ -66,7 +66,7 @@ public class BeanDefinitionTests {
otherBd.getPropertyValues().add("age", "99");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@Test
@@ -88,7 +88,7 @@ public class BeanDefinitionTests {
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@Test
@@ -111,7 +111,7 @@ public class BeanDefinitionTests {
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5, "long");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@Test
@@ -132,17 +132,17 @@ public class BeanDefinitionTests {
otherBd.setParentName("parent");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
bd.getPropertyValues();
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
bd.getConstructorArgumentValues();
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@Test
@@ -163,7 +163,7 @@ public class BeanDefinitionTests {
BeanDefinitionHolder otherHolder = new BeanDefinitionHolder(bd, "bd");
assertThat(holder.equals(otherHolder)).isTrue();
assertThat(otherHolder.equals(holder)).isTrue();
assertThat(holder.hashCode() == otherHolder.hashCode()).isTrue();
assertThat(holder.hashCode()).isEqualTo(otherHolder.hashCode());
}
@Test

8
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public class ManagedMapTests {
ManagedMap child = ManagedMap.ofEntries(Map.entry("tree", "three"));
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(3);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(3);
}
@Test
@@ -70,7 +70,7 @@ public class ManagedMapTests {
ManagedMap child = new ManagedMap();
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(2);
}
@Test
@@ -81,7 +81,7 @@ public class ManagedMapTests {
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
// child value for 'one' must override parent value...
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(2);
assertThat(mergedMap.get("one")).as("Parent value not being overridden during merge().").isEqualTo("fork");
}

8
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class ManagedPropertiesTests {
child.setProperty("three", "three");
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(3);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(3);
}
@Test
@@ -74,7 +74,7 @@ public class ManagedPropertiesTests {
ManagedProperties child = new ManagedProperties();
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(2);
}
@Test
@@ -87,7 +87,7 @@ public class ManagedPropertiesTests {
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
// child value for 'one' must override parent value...
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap).as("merge() obviously did not work.").hasSize(2);
assertThat(mergedMap.get("one")).as("Parent value not being overridden during merge().").isEqualTo("fork");
}

6
spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,8 +73,8 @@ public class Spr8954Tests {
@SuppressWarnings("rawtypes")
Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class);
assertThat(1).isEqualTo(fbBeans.size());
assertThat("&foo").isEqualTo(fbBeans.keySet().iterator().next());
assertThat(fbBeans.size()).isEqualTo(1);
assertThat(fbBeans.keySet().iterator().next()).isEqualTo("&foo");
Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class);
assertThat(aiBeans).hasSize(1);

8
spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,13 +56,13 @@ public class BeanNameGenerationTests {
GeneratedNameBean child1 = topLevel1.getChild();
assertThat(child1.getBeanName()).isNotNull();
assertThat(child1.getBeanName().startsWith(className)).isTrue();
assertThat(child1.getBeanName()).startsWith(className);
GeneratedNameBean child2 = topLevel2.getChild();
assertThat(child2.getBeanName()).isNotNull();
assertThat(child2.getBeanName().startsWith(className)).isTrue();
assertThat(child2.getBeanName()).startsWith(className);
assertThat(child1.getBeanName().equals(child2.getBeanName())).isFalse();
assertThat(child1.getBeanName()).isNotEqualTo(child2.getBeanName());
}
}

18
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public class CollectionMergingTests {
public void mergeList() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithList");
List list = bean.getSomeList();
assertThat(list.size()).as("Incorrect size").isEqualTo(3);
assertThat(list).as("Incorrect size").hasSize(3);
assertThat(list.get(0)).isEqualTo("Rob Harrop");
assertThat(list.get(1)).isEqualTo("Rod Johnson");
assertThat(list.get(2)).isEqualTo("Juergen Hoeller");
@@ -75,7 +75,7 @@ public class CollectionMergingTests {
public void mergeSet() {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSet");
Set set = bean.getSomeSet();
assertThat(set.size()).as("Incorrect size").isEqualTo(2);
assertThat(set).as("Incorrect size").hasSize(2);
assertThat(set.contains("Rob Harrop")).isTrue();
assertThat(set.contains("Sally Greenwood")).isTrue();
}
@@ -99,7 +99,7 @@ public class CollectionMergingTests {
public void mergeMap() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMap");
Map map = bean.getSomeMap();
assertThat(map.size()).as("Incorrect size").isEqualTo(3);
assertThat(map).as("Incorrect size").hasSize(3);
assertThat(map.get("Rob")).isEqualTo("Sally");
assertThat(map.get("Rod")).isEqualTo("Kerry");
assertThat(map.get("Juergen")).isEqualTo("Eva");
@@ -121,7 +121,7 @@ public class CollectionMergingTests {
public void mergeProperties() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithProps");
Properties props = bean.getSomeProperties();
assertThat(props.size()).as("Incorrect size").isEqualTo(3);
assertThat(props).as("Incorrect size").hasSize(3);
assertThat(props.getProperty("Rob")).isEqualTo("Sally");
assertThat(props.getProperty("Rod")).isEqualTo("Kerry");
assertThat(props.getProperty("Juergen")).isEqualTo("Eva");
@@ -131,7 +131,7 @@ public class CollectionMergingTests {
public void mergeListInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithListInConstructor");
List list = bean.getSomeList();
assertThat(list.size()).as("Incorrect size").isEqualTo(3);
assertThat(list).as("Incorrect size").hasSize(3);
assertThat(list.get(0)).isEqualTo("Rob Harrop");
assertThat(list.get(1)).isEqualTo("Rod Johnson");
assertThat(list.get(2)).isEqualTo("Juergen Hoeller");
@@ -152,7 +152,7 @@ public class CollectionMergingTests {
public void mergeSetInConstructor() {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetInConstructor");
Set set = bean.getSomeSet();
assertThat(set.size()).as("Incorrect size").isEqualTo(2);
assertThat(set).as("Incorrect size").hasSize(2);
assertThat(set.contains("Rob Harrop")).isTrue();
assertThat(set.contains("Sally Greenwood")).isTrue();
}
@@ -176,7 +176,7 @@ public class CollectionMergingTests {
public void mergeMapInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapInConstructor");
Map map = bean.getSomeMap();
assertThat(map.size()).as("Incorrect size").isEqualTo(3);
assertThat(map).as("Incorrect size").hasSize(3);
assertThat(map.get("Rob")).isEqualTo("Sally");
assertThat(map.get("Rod")).isEqualTo("Kerry");
assertThat(map.get("Juergen")).isEqualTo("Eva");
@@ -198,7 +198,7 @@ public class CollectionMergingTests {
public void mergePropertiesInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithPropsInConstructor");
Properties props = bean.getSomeProperties();
assertThat(props.size()).as("Incorrect size").isEqualTo(3);
assertThat(props).as("Incorrect size").hasSize(3);
assertThat(props.getProperty("Rob")).isEqualTo("Sally");
assertThat(props.getProperty("Rod")).isEqualTo("Kerry");
assertThat(props.getProperty("Juergen")).isEqualTo("Eva");

8
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -81,15 +81,15 @@ public class CollectionsWithDefaultTypesTests {
@SuppressWarnings("rawtypes")
public void testBuildCollectionFromMixtureOfReferencesAndValues() throws Exception {
MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble");
assertThat(jumble.getJumble().size() == 3).as("Expected 3 elements, not " + jumble.getJumble().size()).isTrue();
assertThat(jumble.getJumble()).as("Expected 3 elements, not " + jumble.getJumble().size()).hasSize(3);
List l = (List) jumble.getJumble();
assertThat(l.get(0).equals("literal")).isTrue();
Integer[] array1 = (Integer[]) l.get(1);
assertThat(array1[0].equals(2)).isTrue();
assertThat(array1[1].equals(4)).isTrue();
int[] array2 = (int[]) l.get(2);
assertThat(array2[0] == 3).isTrue();
assertThat(array2[1] == 5).isTrue();
assertThat(array2[0]).isEqualTo(3);
assertThat(array2[1]).isEqualTo(5);
}
}

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -282,7 +282,7 @@ public class FactoryMethodTests {
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype", tbArg2);
assertThat(fm2.getTestBean().getName()).isEqualTo("arg2");
assertThat(fm2.getNum()).isEqualTo(fm1.getNum());
assertThat("testBeanOnlyPrototypeDISetterString").isEqualTo(fm2.getStringValue());
assertThat(fm2.getStringValue()).isEqualTo("testBeanOnlyPrototypeDISetterString");
assertThat(fm2.getStringValue()).isEqualTo(fm2.getStringValue());
// The TestBean reference is resolved to a prototype in the factory
assertThat(fm2.getTestBean()).isSameAs(fm2.getTestBean());

70
spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ public class UtilNamespaceHandlerTests {
void testNestedProperties() {
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
Properties props = bean.getSomeProperties();
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
}
@Test
@@ -111,7 +111,7 @@ public class UtilNamespaceHandlerTests {
Map<?, ?> map = (Map) this.beanFactory.getBean("simpleMap");
assertThat(map.get("foo")).isEqualTo("bar");
Map<?, ?> map2 = (Map) this.beanFactory.getBean("simpleMap");
assertThat(map == map2).isTrue();
assertThat(map).isSameAs(map2);
}
@Test
@@ -120,7 +120,7 @@ public class UtilNamespaceHandlerTests {
assertThat(map.get("foo")).isEqualTo("bar");
Map<?, ?> map2 = (Map) this.beanFactory.getBean("scopedMap");
assertThat(map2.get("foo")).isEqualTo("bar");
assertThat(map != map2).isTrue();
assertThat(map).isNotSameAs(map2);
}
@Test
@@ -128,7 +128,7 @@ public class UtilNamespaceHandlerTests {
List<?> list = (List) this.beanFactory.getBean("simpleList");
assertThat(list.get(0)).isEqualTo("Rob Harrop");
List<?> list2 = (List) this.beanFactory.getBean("simpleList");
assertThat(list == list2).isTrue();
assertThat(list).isSameAs(list2);
}
@Test
@@ -137,7 +137,7 @@ public class UtilNamespaceHandlerTests {
assertThat(list.get(0)).isEqualTo("Rob Harrop");
List<?> list2 = (List) this.beanFactory.getBean("scopedList");
assertThat(list2.get(0)).isEqualTo("Rob Harrop");
assertThat(list != list2).isTrue();
assertThat(list).isNotSameAs(list2);
}
@Test
@@ -145,7 +145,7 @@ public class UtilNamespaceHandlerTests {
Set<?> set = (Set) this.beanFactory.getBean("simpleSet");
assertThat(set.contains("Rob Harrop")).isTrue();
Set<?> set2 = (Set) this.beanFactory.getBean("simpleSet");
assertThat(set == set2).isTrue();
assertThat(set).isSameAs(set2);
}
@Test
@@ -154,7 +154,7 @@ public class UtilNamespaceHandlerTests {
assertThat(set.contains("Rob Harrop")).isTrue();
Set<?> set2 = (Set) this.beanFactory.getBean("scopedSet");
assertThat(set2.contains("Rob Harrop")).isTrue();
assertThat(set != set2).isTrue();
assertThat(set).isNotSameAs(set2);
}
@Test
@@ -194,9 +194,9 @@ public class UtilNamespaceHandlerTests {
assertThat(bean2.getSomeList()).isEqualTo(list);
assertThat(bean2.getSomeSet()).isEqualTo(set);
assertThat(bean2.getSomeMap()).isEqualTo(map);
assertThat(list == bean2.getSomeList()).isFalse();
assertThat(set == bean2.getSomeSet()).isFalse();
assertThat(map == bean2.getSomeMap()).isFalse();
assertThat(list).isNotSameAs(bean2.getSomeList());
assertThat(set).isNotSameAs(bean2.getSomeSet());
assertThat(map).isNotSameAs(bean2.getSomeMap());
}
@Test
@@ -216,11 +216,11 @@ public class UtilNamespaceHandlerTests {
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
assertThat(Arrays.equals(bean.getStringArray(), bean2.getStringArray())).isTrue();
assertThat(bean.getStringArray() == bean2.getStringArray()).isFalse();
assertThat(bean.getStringArray()).isNotSameAs(bean2.getStringArray());
assertThat(bean2.getSomeList()).isEqualTo(list);
assertThat(bean2.getSomeSet()).isEqualTo(set);
assertThat(list == bean2.getSomeList()).isFalse();
assertThat(set == bean2.getSomeSet()).isFalse();
assertThat(list).isNotSameAs(bean2.getSomeList());
assertThat(set).isNotSameAs(bean2.getSomeSet());
}
@Test
@@ -244,9 +244,9 @@ public class UtilNamespaceHandlerTests {
assertThat(bean2.getSomeList()).isEqualTo(list);
assertThat(bean2.getSomeSet()).isEqualTo(set);
assertThat(bean2.getSomeMap()).isEqualTo(map);
assertThat(list == bean2.getSomeList()).isFalse();
assertThat(set == bean2.getSomeSet()).isFalse();
assertThat(map == bean2.getSomeMap()).isFalse();
assertThat(list).isNotSameAs(bean2.getSomeList());
assertThat(set).isNotSameAs(bean2.getSomeSet());
assertThat(map).isNotSameAs(bean2.getSomeMap());
}
@Test
@@ -338,56 +338,56 @@ public class UtilNamespaceHandlerTests {
@Test
void testLoadProperties() {
Properties props = (Properties) this.beanFactory.getBean("myProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isNull();
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").doesNotContainKey("foo2");
Properties props2 = (Properties) this.beanFactory.getBean("myProperties");
assertThat(props == props2).isTrue();
assertThat(props).isSameAs(props2);
}
@Test
void testScopedProperties() {
Properties props = (Properties) this.beanFactory.getBean("myScopedProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isNull();
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").doesNotContainKey("foo2");
Properties props2 = (Properties) this.beanFactory.getBean("myScopedProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isNull();
assertThat(props != props2).isTrue();
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").doesNotContainKey("foo2");
assertThat(props).isNotSameAs(props2);
}
@Test
void testLocalProperties() {
Properties props = (Properties) this.beanFactory.getBean("myLocalProperties");
assertThat(props.get("foo")).as("Incorrect property value").isNull();
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2");
assertThat(props).as("Incorrect property value").doesNotContainKey("foo");
assertThat(props).as("Incorrect property value").containsEntry("foo2", "bar2");
}
@Test
void testMergedProperties() {
Properties props = (Properties) this.beanFactory.getBean("myMergedProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2");
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").containsEntry("foo2", "bar2");
}
@Test
void testLocalOverrideDefault() {
Properties props = (Properties) this.beanFactory.getBean("defaultLocalOverrideProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2");
}
@Test
void testLocalOverrideFalse() {
Properties props = (Properties) this.beanFactory.getBean("falseLocalOverrideProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
assertThat(props).as("Incorrect property value").containsEntry("foo", "bar");
assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2");
}
@Test
void testLocalOverrideTrue() {
Properties props = (Properties) this.beanFactory.getBean("trueLocalOverrideProperties");
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("local");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
assertThat(props).as("Incorrect property value").containsEntry("foo", "local");
assertThat(props).as("Incorrect property value").containsEntry("foo2", "local2");
}
}

114
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,25 +91,25 @@ public class XmlBeanCollectionTests {
//assertTrue("5 beans in reftypes, not " + this.beanFactory.getBeanDefinitionCount(), this.beanFactory.getBeanDefinitionCount() == 5);
TestBean jen = (TestBean) this.beanFactory.getBean("jenny");
TestBean dave = (TestBean) this.beanFactory.getBean("david");
assertThat(jen.getSpouse() == dave).isTrue();
assertThat(jen.getSpouse()).isSameAs(dave);
}
@Test
public void testPropertyWithLiteralValueSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose");
assertThat(verbose.getName().equals("verbose")).isTrue();
assertThat(verbose.getName()).isEqualTo("verbose");
}
@Test
public void testPropertyWithIdRefLocalAttrSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose2");
assertThat(verbose.getName().equals("verbose")).isTrue();
assertThat(verbose.getName()).isEqualTo("verbose");
}
@Test
public void testPropertyWithIdRefBeanAttrSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose3");
assertThat(verbose.getName().equals("verbose")).isTrue();
assertThat(verbose.getName()).isEqualTo("verbose");
}
@Test
@@ -122,10 +122,10 @@ public class XmlBeanCollectionTests {
// Our bean doesn't modify the collection:
// of course it could be a different copy in a real object.
Object[] friends = rod.getFriends().toArray();
assertThat(friends.length == 2).isTrue();
assertThat(friends.length).isEqualTo(2);
assertThat(friends[0] == jen).as("First friend must be jen, not " + friends[0]).isTrue();
assertThat(friends[1] == dave).isTrue();
assertThat(friends[0]).as("First friend must be jen, not " + friends[0]).isSameAs(jen);
assertThat(friends[1]).isSameAs(dave);
// Should be ordered
}
@@ -136,34 +136,34 @@ public class XmlBeanCollectionTests {
TestBean rod = (TestBean) this.beanFactory.getBean("pRod");
Object[] friends = rod.getFriends().toArray();
assertThat(friends.length == 2).isTrue();
assertThat(friends[0].toString().equals(jen.toString())).as("First friend must be jen, not " + friends[0]).isTrue();
assertThat(friends[0] != jen).as("Jen not same instance").isTrue();
assertThat(friends[1].toString().equals(dave.toString())).isTrue();
assertThat(friends[1] != dave).as("Dave not same instance").isTrue();
assertThat(friends.length).isEqualTo(2);
assertThat(friends[0].toString()).as("First friend must be jen, not " + friends[0]).isEqualTo(jen.toString());
assertThat(friends[0]).as("Jen not same instance").isNotSameAs(jen);
assertThat(friends[1].toString()).isEqualTo(dave.toString());
assertThat(friends[1]).as("Dave not same instance").isNotSameAs(dave);
assertThat(dave.getSpouse().getName()).isEqualTo("Jen");
TestBean rod2 = (TestBean) this.beanFactory.getBean("pRod");
Object[] friends2 = rod2.getFriends().toArray();
assertThat(friends2.length == 2).isTrue();
assertThat(friends2[0].toString().equals(jen.toString())).as("First friend must be jen, not " + friends2[0]).isTrue();
assertThat(friends2[0] != friends[0]).as("Jen not same instance").isTrue();
assertThat(friends2[1].toString().equals(dave.toString())).isTrue();
assertThat(friends2[1] != friends[1]).as("Dave not same instance").isTrue();
assertThat(friends2.length).isEqualTo(2);
assertThat(friends2[0].toString()).as("First friend must be jen, not " + friends2[0]).isEqualTo(jen.toString());
assertThat(friends2[0]).as("Jen not same instance").isNotSameAs(friends[0]);
assertThat(friends2[1].toString()).isEqualTo(dave.toString());
assertThat(friends2[1]).as("Dave not same instance").isNotSameAs(friends[1]);
}
@Test
public void testRefSubelementsBuildCollectionFromSingleElement() throws Exception {
TestBean loner = (TestBean) this.beanFactory.getBean("loner");
TestBean dave = (TestBean) this.beanFactory.getBean("david");
assertThat(loner.getFriends().size() == 1).isTrue();
assertThat(loner.getFriends().size()).isEqualTo(1);
assertThat(loner.getFriends().contains(dave)).isTrue();
}
@Test
public void testBuildCollectionFromMixtureOfReferencesAndValues() throws Exception {
MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble");
assertThat(jumble.getJumble().size() == 5).as("Expected 5 elements, not " + jumble.getJumble().size()).isTrue();
assertThat(jumble.getJumble().size()).as("Expected 5 elements, not " + jumble.getJumble().size()).isEqualTo(5);
List l = (List) jumble.getJumble();
assertThat(l.get(0).equals(this.beanFactory.getBean("david"))).isTrue();
assertThat(l.get(1).equals("literal")).isTrue();
@@ -185,25 +185,25 @@ public class XmlBeanCollectionTests {
@Test
public void testEmptyMap() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyMap");
assertThat(hasMap.getMap().size() == 0).isTrue();
assertThat(hasMap.getMap().size()).isEqualTo(0);
}
@Test
public void testMapWithLiteralsOnly() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("literalMap");
assertThat(hasMap.getMap().size() == 3).isTrue();
assertThat(hasMap.getMap().size()).isEqualTo(3);
assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue();
assertThat(hasMap.getMap().get("fi").equals("fum")).isTrue();
assertThat(hasMap.getMap().get("fa") == null).isTrue();
assertThat(hasMap.getMap().get("fa")).isNull();
}
@Test
public void testMapWithLiteralsAndReferences() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMap");
assertThat(hasMap.getMap().size() == 5).isTrue();
assertThat(hasMap.getMap().size()).isEqualTo(5);
assertThat(hasMap.getMap().get("foo").equals(10)).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getMap().get("jenny") == jenny).isTrue();
assertThat(hasMap.getMap().get("jenny")).isSameAs(jenny);
assertThat(hasMap.getMap().get(5).equals("david")).isTrue();
boolean condition1 = hasMap.getMap().get("bar") instanceof Long;
assertThat(condition1).isTrue();
@@ -217,22 +217,22 @@ public class XmlBeanCollectionTests {
public void testMapWithLiteralsAndPrototypeReferences() throws Exception {
TestBean jenny = (TestBean) this.beanFactory.getBean("pJenny");
HasMap hasMap = (HasMap) this.beanFactory.getBean("pMixedMap");
assertThat(hasMap.getMap().size() == 2).isTrue();
assertThat(hasMap.getMap().size()).isEqualTo(2);
assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue();
assertThat(hasMap.getMap().get("jenny").toString().equals(jenny.toString())).isTrue();
assertThat(hasMap.getMap().get("jenny") != jenny).as("Not same instance").isTrue();
assertThat(hasMap.getMap().get("jenny").toString()).isEqualTo(jenny.toString());
assertThat(hasMap.getMap().get("jenny")).as("Not same instance").isNotSameAs(jenny);
HasMap hasMap2 = (HasMap) this.beanFactory.getBean("pMixedMap");
assertThat(hasMap2.getMap().size() == 2).isTrue();
assertThat(hasMap2.getMap().size()).isEqualTo(2);
assertThat(hasMap2.getMap().get("foo").equals("bar")).isTrue();
assertThat(hasMap2.getMap().get("jenny").toString().equals(jenny.toString())).isTrue();
assertThat(hasMap2.getMap().get("jenny") != hasMap.getMap().get("jenny")).as("Not same instance").isTrue();
assertThat(hasMap2.getMap().get("jenny").toString()).isEqualTo(jenny.toString());
assertThat(hasMap2.getMap().get("jenny")).as("Not same instance").isNotSameAs(hasMap.getMap().get("jenny"));
}
@Test
public void testMapWithLiteralsReferencesAndList() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMapWithList");
assertThat(hasMap.getMap().size() == 4).isTrue();
assertThat(hasMap.getMap().size()).isEqualTo(4);
assertThat(hasMap.getMap().get(null).equals("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getMap().get("jenny").equals(jenny)).isTrue();
@@ -240,28 +240,28 @@ public class XmlBeanCollectionTests {
// Check list
List l = (List) hasMap.getMap().get("list");
assertThat(l).isNotNull();
assertThat(l.size() == 4).isTrue();
assertThat(l.size()).isEqualTo(4);
assertThat(l.get(0).equals("zero")).isTrue();
assertThat(l.get(3) == null).isTrue();
assertThat(l.get(3)).isNull();
// Check nested map in list
Map m = (Map) l.get(1);
assertThat(m).isNotNull();
assertThat(m.size() == 2).isTrue();
assertThat(m.size()).isEqualTo(2);
assertThat(m.get("fo").equals("bar")).isTrue();
assertThat(m.get("jen").equals(jenny)).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jen")).isTrue();
// Check nested list in list
l = (List) l.get(2);
assertThat(l).isNotNull();
assertThat(l.size() == 2).isTrue();
assertThat(l.size()).isEqualTo(2);
assertThat(l.get(0).equals(jenny)).isTrue();
assertThat(l.get(1).equals("ba")).isTrue();
// Check nested map
m = (Map) hasMap.getMap().get("map");
assertThat(m).isNotNull();
assertThat(m.size() == 2).isTrue();
assertThat(m.size()).isEqualTo(2);
assertThat(m.get("foo").equals("bar")).isTrue();
assertThat(m.get("jenny").equals(jenny)).as("Map element 'jenny' should be equal to jenny bean, not " + m.get("jenny")).isTrue();
}
@@ -269,13 +269,13 @@ public class XmlBeanCollectionTests {
@Test
public void testEmptySet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptySet");
assertThat(hasMap.getSet().size() == 0).isTrue();
assertThat(hasMap.getSet().size()).isEqualTo(0);
}
@Test
public void testPopulatedSet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("set");
assertThat(hasMap.getSet().size() == 3).isTrue();
assertThat(hasMap.getSet().size()).isEqualTo(3);
assertThat(hasMap.getSet().contains("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getSet().contains(jenny)).isTrue();
@@ -289,7 +289,7 @@ public class XmlBeanCollectionTests {
@Test
public void testPopulatedConcurrentSet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("concurrentSet");
assertThat(hasMap.getConcurrentSet().size() == 3).isTrue();
assertThat(hasMap.getConcurrentSet().size()).isEqualTo(3);
assertThat(hasMap.getConcurrentSet().contains("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getConcurrentSet().contains(jenny)).isTrue();
@@ -299,7 +299,7 @@ public class XmlBeanCollectionTests {
@Test
public void testPopulatedIdentityMap() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("identityMap");
assertThat(hasMap.getIdentityMap().size() == 2).isTrue();
assertThat(hasMap.getIdentityMap().size()).isEqualTo(2);
HashSet set = new HashSet(hasMap.getIdentityMap().keySet());
assertThat(set.contains("foo")).isTrue();
assertThat(set.contains("jenny")).isTrue();
@@ -308,14 +308,14 @@ public class XmlBeanCollectionTests {
@Test
public void testEmptyProps() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyProps");
assertThat(hasMap.getProps().size() == 0).isTrue();
assertThat(hasMap.getProps().size()).isEqualTo(0);
assertThat(Properties.class).isEqualTo(hasMap.getProps().getClass());
}
@Test
public void testPopulatedProps() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("props");
assertThat(hasMap.getProps().size() == 2).isTrue();
assertThat(hasMap.getProps().size()).isEqualTo(2);
assertThat(hasMap.getProps().get("foo").equals("bar")).isTrue();
assertThat(hasMap.getProps().get("2").equals("TWO")).isTrue();
}
@@ -323,7 +323,7 @@ public class XmlBeanCollectionTests {
@Test
public void testObjectArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("objectArray");
assertThat(hasMap.getObjectArray().length == 2).isTrue();
assertThat(hasMap.getObjectArray().length).isEqualTo(2);
assertThat(hasMap.getObjectArray()[0].equals("one")).isTrue();
assertThat(hasMap.getObjectArray()[1].equals(this.beanFactory.getBean("jenny"))).isTrue();
}
@@ -331,16 +331,16 @@ public class XmlBeanCollectionTests {
@Test
public void testIntegerArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("integerArray");
assertThat(hasMap.getIntegerArray().length == 3).isTrue();
assertThat(hasMap.getIntegerArray()[0] == 0).isTrue();
assertThat(hasMap.getIntegerArray()[1] == 1).isTrue();
assertThat(hasMap.getIntegerArray()[2] == 2).isTrue();
assertThat(hasMap.getIntegerArray().length).isEqualTo(3);
assertThat(hasMap.getIntegerArray()[0]).isEqualTo(0);
assertThat(hasMap.getIntegerArray()[1]).isEqualTo(1);
assertThat(hasMap.getIntegerArray()[2]).isEqualTo(2);
}
@Test
public void testClassArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("classArray");
assertThat(hasMap.getClassArray().length == 2).isTrue();
assertThat(hasMap.getClassArray().length).isEqualTo(2);
assertThat(hasMap.getClassArray()[0].equals(String.class)).isTrue();
assertThat(hasMap.getClassArray()[1].equals(Exception.class)).isTrue();
}
@@ -348,7 +348,7 @@ public class XmlBeanCollectionTests {
@Test
public void testClassList() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("classList");
assertThat(hasMap.getClassList().size()== 2).isTrue();
assertThat(hasMap.getClassList().size()).isEqualTo(2);
assertThat(hasMap.getClassList().get(0).equals(String.class)).isTrue();
assertThat(hasMap.getClassList().get(1).equals(Exception.class)).isTrue();
}
@@ -371,7 +371,7 @@ public class XmlBeanCollectionTests {
List list = (List) this.beanFactory.getBean("listFactory");
boolean condition = list instanceof LinkedList;
assertThat(condition).isTrue();
assertThat(list.size() == 2).isTrue();
assertThat(list.size()).isEqualTo(2);
assertThat(list.get(0)).isEqualTo("bar");
assertThat(list.get(1)).isEqualTo("jenny");
}
@@ -381,7 +381,7 @@ public class XmlBeanCollectionTests {
List list = (List) this.beanFactory.getBean("pListFactory");
boolean condition = list instanceof LinkedList;
assertThat(condition).isTrue();
assertThat(list.size() == 2).isTrue();
assertThat(list.size()).isEqualTo(2);
assertThat(list.get(0)).isEqualTo("bar");
assertThat(list.get(1)).isEqualTo("jenny");
}
@@ -391,7 +391,7 @@ public class XmlBeanCollectionTests {
Set set = (Set) this.beanFactory.getBean("setFactory");
boolean condition = set instanceof TreeSet;
assertThat(condition).isTrue();
assertThat(set.size() == 2).isTrue();
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
}
@@ -401,7 +401,7 @@ public class XmlBeanCollectionTests {
Set set = (Set) this.beanFactory.getBean("pSetFactory");
boolean condition = set instanceof TreeSet;
assertThat(condition).isTrue();
assertThat(set.size() == 2).isTrue();
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
}
@@ -411,7 +411,7 @@ public class XmlBeanCollectionTests {
Map map = (Map) this.beanFactory.getBean("mapFactory");
boolean condition = map instanceof TreeMap;
assertThat(condition).isTrue();
assertThat(map.size() == 2).isTrue();
assertThat(map.size()).isEqualTo(2);
assertThat(map.get("foo")).isEqualTo("bar");
assertThat(map.get("jen")).isEqualTo("jenny");
}
@@ -421,7 +421,7 @@ public class XmlBeanCollectionTests {
Map map = (Map) this.beanFactory.getBean("pMapFactory");
boolean condition = map instanceof TreeMap;
assertThat(condition).isTrue();
assertThat(map.size() == 2).isTrue();
assertThat(map.size()).isEqualTo(2);
assertThat(map.get("foo")).isEqualTo("bar");
assertThat(map.get("jen")).isEqualTo("jenny");
}
@@ -441,7 +441,7 @@ public class XmlBeanCollectionTests {
@Test
public void testEnumSetFactory() throws Exception {
Set set = (Set) this.beanFactory.getBean("enumSetFactory");
assertThat(set.size() == 2).isTrue();
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("ONE")).isTrue();
assertThat(set.contains("TWO")).isTrue();
}

94
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
@Test
public void descriptionButNoProperties() {
TestBean validEmpty = (TestBean) getBeanFactory().getBean("validEmptyWithDescription");
assertThat(validEmpty.getAge()).isEqualTo(0);
assertThat(validEmpty.getAge()).isZero();
}
/**
@@ -136,71 +136,71 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
TestBean tb1 = (TestBean) getBeanFactory().getBean("aliased");
TestBean alias1 = (TestBean) getBeanFactory().getBean("myalias");
assertThat(tb1 == alias1).isTrue();
assertThat(tb1).isSameAs(alias1);
List tb1Aliases = Arrays.asList(getBeanFactory().getAliases("aliased"));
assertThat(tb1Aliases).hasSize(2);
assertThat(tb1Aliases.contains("myalias")).isTrue();
assertThat(tb1Aliases.contains("youralias")).isTrue();
assertThat(beanNames.contains("aliased")).isTrue();
assertThat(beanNames.contains("myalias")).isFalse();
assertThat(beanNames.contains("youralias")).isFalse();
assertThat(tb1Aliases).contains("myalias");
assertThat(tb1Aliases).contains("youralias");
assertThat(beanNames).contains("aliased");
assertThat(beanNames).doesNotContain("myalias");
assertThat(beanNames).doesNotContain("youralias");
TestBean tb2 = (TestBean) getBeanFactory().getBean("multiAliased");
TestBean alias2 = (TestBean) getBeanFactory().getBean("alias1");
TestBean alias3 = (TestBean) getBeanFactory().getBean("alias2");
TestBean alias3a = (TestBean) getBeanFactory().getBean("alias3");
TestBean alias3b = (TestBean) getBeanFactory().getBean("alias4");
assertThat(tb2 == alias2).isTrue();
assertThat(tb2 == alias3).isTrue();
assertThat(tb2 == alias3a).isTrue();
assertThat(tb2 == alias3b).isTrue();
assertThat(tb2).isSameAs(alias2);
assertThat(tb2).isSameAs(alias3);
assertThat(tb2).isSameAs(alias3a);
assertThat(tb2).isSameAs(alias3b);
List tb2Aliases = Arrays.asList(getBeanFactory().getAliases("multiAliased"));
assertThat(tb2Aliases).hasSize(4);
assertThat(tb2Aliases.contains("alias1")).isTrue();
assertThat(tb2Aliases.contains("alias2")).isTrue();
assertThat(tb2Aliases.contains("alias3")).isTrue();
assertThat(tb2Aliases.contains("alias4")).isTrue();
assertThat(beanNames.contains("multiAliased")).isTrue();
assertThat(beanNames.contains("alias1")).isFalse();
assertThat(beanNames.contains("alias2")).isFalse();
assertThat(beanNames.contains("alias3")).isFalse();
assertThat(beanNames.contains("alias4")).isFalse();
assertThat(tb2Aliases).contains("alias1");
assertThat(tb2Aliases).contains("alias2");
assertThat(tb2Aliases).contains("alias3");
assertThat(tb2Aliases).contains("alias4");
assertThat(beanNames).contains("multiAliased");
assertThat(beanNames).doesNotContain("alias1");
assertThat(beanNames).doesNotContain("alias2");
assertThat(beanNames).doesNotContain("alias3");
assertThat(beanNames).doesNotContain("alias4");
TestBean tb3 = (TestBean) getBeanFactory().getBean("aliasWithoutId1");
TestBean alias4 = (TestBean) getBeanFactory().getBean("aliasWithoutId2");
TestBean alias5 = (TestBean) getBeanFactory().getBean("aliasWithoutId3");
assertThat(tb3 == alias4).isTrue();
assertThat(tb3 == alias5).isTrue();
assertThat(tb3).isSameAs(alias4);
assertThat(tb3).isSameAs(alias5);
List tb3Aliases = Arrays.asList(getBeanFactory().getAliases("aliasWithoutId1"));
assertThat(tb3Aliases).hasSize(2);
assertThat(tb3Aliases.contains("aliasWithoutId2")).isTrue();
assertThat(tb3Aliases.contains("aliasWithoutId3")).isTrue();
assertThat(beanNames.contains("aliasWithoutId1")).isTrue();
assertThat(beanNames.contains("aliasWithoutId2")).isFalse();
assertThat(beanNames.contains("aliasWithoutId3")).isFalse();
assertThat(tb3Aliases).contains("aliasWithoutId2");
assertThat(tb3Aliases).contains("aliasWithoutId3");
assertThat(beanNames).contains("aliasWithoutId1");
assertThat(beanNames).doesNotContain("aliasWithoutId2");
assertThat(beanNames).doesNotContain("aliasWithoutId3");
TestBean tb4 = (TestBean) getBeanFactory().getBean(TestBean.class.getName() + "#0");
assertThat(tb4.getName()).isNull();
Map drs = getListableBeanFactory().getBeansOfType(DummyReferencer.class, false, false);
assertThat(drs).hasSize(5);
assertThat(drs.containsKey(DummyReferencer.class.getName() + "#0")).isTrue();
assertThat(drs.containsKey(DummyReferencer.class.getName() + "#1")).isTrue();
assertThat(drs.containsKey(DummyReferencer.class.getName() + "#2")).isTrue();
assertThat(drs).containsKey(DummyReferencer.class.getName() + "#0");
assertThat(drs).containsKey(DummyReferencer.class.getName() + "#1");
assertThat(drs).containsKey(DummyReferencer.class.getName() + "#2");
}
@Test
public void factoryNesting() {
ITestBean father = (ITestBean) getBeanFactory().getBean("father");
assertThat(father != null).as("Bean from root context").isTrue();
assertThat(father).as("Bean from root context").isNotNull();
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
assertThat("Rod".equals(rod.getName())).as("Bean from child context").isTrue();
assertThat(rod.getSpouse() == father).as("Bean has external reference").isTrue();
assertThat(rod.getName()).as("Bean from child context").isEqualTo("Rod");
assertThat(rod.getSpouse()).as("Bean has external reference").isSameAs(father);
rod = (TestBean) parent.getBean("rod");
assertThat("Roderick".equals(rod.getName())).as("Bean from root context").isTrue();
assertThat(rod.getName()).as("Bean from root context").isEqualTo("Roderick");
}
@Test
@@ -208,25 +208,25 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
DummyReferencer ref = (DummyReferencer) getBeanFactory().getBean("factoryReferencer");
assertThat(ref.getTestBean1() == ref.getTestBean2()).isTrue();
assertThat(ref.getDummyFactory() == factory).isTrue();
assertThat(ref.getTestBean1()).isSameAs(ref.getTestBean2());
assertThat(ref.getDummyFactory()).isSameAs(factory);
DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("factoryReferencerWithConstructor");
assertThat(ref2.getTestBean1() == ref2.getTestBean2()).isTrue();
assertThat(ref2.getDummyFactory() == factory).isTrue();
assertThat(ref2.getTestBean1()).isSameAs(ref2.getTestBean2());
assertThat(ref2.getDummyFactory()).isSameAs(factory);
}
@Test
public void prototypeReferences() {
// check that not broken by circular reference resolution mechanism
DummyReferencer ref1 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
assertThat(ref1.getTestBean1() != ref1.getTestBean2()).as("Not referencing same bean twice").isTrue();
assertThat(ref1.getTestBean1()).as("Not referencing same bean twice").isNotSameAs(ref1.getTestBean2());
DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
assertThat(ref1 != ref2).as("Not the same referencer").isTrue();
assertThat(ref2.getTestBean1() != ref2.getTestBean2()).as("Not referencing same bean twice").isTrue();
assertThat(ref1.getTestBean1() != ref2.getTestBean1()).as("Not referencing same bean twice").isTrue();
assertThat(ref1.getTestBean2() != ref2.getTestBean2()).as("Not referencing same bean twice").isTrue();
assertThat(ref1.getTestBean1() != ref2.getTestBean2()).as("Not referencing same bean twice").isTrue();
assertThat(ref1).as("Not the same referencer").isNotSameAs(ref2);
assertThat(ref2.getTestBean1()).as("Not referencing same bean twice").isNotSameAs(ref2.getTestBean2());
assertThat(ref1.getTestBean1()).as("Not referencing same bean twice").isNotSameAs(ref2.getTestBean1());
assertThat(ref1.getTestBean2()).as("Not referencing same bean twice").isNotSameAs(ref2.getTestBean2());
assertThat(ref1.getTestBean1()).as("Not referencing same bean twice").isNotSameAs(ref2.getTestBean2());
}
@Test
@@ -245,8 +245,8 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
public void emptyValues() {
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
TestBean kerry = (TestBean) getBeanFactory().getBean("kerry");
assertThat("".equals(rod.getTouchy())).as("Touchy is empty").isTrue();
assertThat("".equals(kerry.getTouchy())).as("Touchy is empty").isTrue();
assertThat(rod.getTouchy()).as("Touchy is empty").isEqualTo("");
assertThat(kerry.getTouchy()).as("Touchy is empty").isEqualTo("");
}
@Test

8
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class ByteArrayPropertyEditorTests {
byteEditor.setAsText(text);
Object value = byteEditor.getValue();
assertThat(value).isNotNull().isInstanceOf(byte[].class);
assertThat(value).isInstanceOf(byte[].class);
byte[] bytes = (byte[]) value;
for (int i = 0; i < text.length(); ++i) {
assertThat(bytes[i]).as("cyte[] differs at index '" + i + "'").isEqualTo((byte) text.charAt(i));
@@ -47,10 +47,10 @@ public class ByteArrayPropertyEditorTests {
@Test
public void getAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
assertThat(byteEditor.getAsText()).isEqualTo("");
assertThat(byteEditor.getAsText()).isEmpty();
byteEditor.setAsText(null);
assertThat(byteEditor.getAsText()).isEqualTo("");
assertThat(byteEditor.getAsText()).isEmpty();
}
}

8
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CharArrayPropertyEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class CharArrayPropertyEditorTests {
charEditor.setAsText(text);
Object value = charEditor.getValue();
assertThat(value).isNotNull().isInstanceOf(char[].class);
assertThat(value).isInstanceOf(char[].class);
char[] chars = (char[]) value;
for (int i = 0; i < text.length(); ++i) {
assertThat(chars[i]).as("char[] differs at index '" + i + "'").isEqualTo(text.charAt(i));
@@ -47,10 +47,10 @@ public class CharArrayPropertyEditorTests {
@Test
public void getAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
assertThat(charEditor.getAsText()).isEqualTo("");
assertThat(charEditor.getAsText()).isEmpty();
charEditor.setAsText(null);
assertThat(charEditor.getAsText()).isEqualTo("");
assertThat(charEditor.getAsText()).isEmpty();
}
}

8
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomCollectionEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public class CustomCollectionEditorTests {
boolean condition = value instanceof ArrayList;
assertThat(condition).isTrue();
List<?> list = (List<?>) value;
assertThat(list.size()).as("There must be 3 elements in the converted collection").isEqualTo(3);
assertThat(list).as("There must be 3 elements in the converted collection").hasSize(3);
assertThat(list.get(0)).isEqualTo(0);
assertThat(list.get(1)).isEqualTo(1);
assertThat(list.get(2)).isEqualTo(2);
@@ -74,7 +74,7 @@ public class CustomCollectionEditorTests {
editor.setValue("0, 1, 2");
Collection<?> value = (Collection<?>) editor.getValue();
assertThat(value).isNotNull();
assertThat(value.size()).as("There must be 1 element in the converted collection").isEqualTo(1);
assertThat(value).as("There must be 1 element in the converted collection").hasSize(1);
assertThat(value.iterator().next()).isEqualTo("0, 1, 2");
}
@@ -87,7 +87,7 @@ public class CustomCollectionEditorTests {
boolean condition = value instanceof ArrayList;
assertThat(condition).isTrue();
List<?> list = (List<?>) value;
assertThat(list.size()).as("There must be 1 element in the converted collection").isEqualTo(1);
assertThat(list).as("There must be 1 element in the converted collection").hasSize(1);
assertThat(list.get(0)).isEqualTo("0, 1, 2");
}

72
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -350,30 +350,30 @@ class CustomEditorTests {
bw.setPropertyValue("double2", "6.1");
bw.setPropertyValue("bigDecimal", "4.5");
assertThat(Short.valueOf("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
assertThat(Short.valueOf("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
assertThat(Short.valueOf("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
assertThat(Integer.valueOf("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
assertThat(Integer.valueOf("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
assertThat(Integer.valueOf("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
assertThat(Float.valueOf("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
assertThat(Float.valueOf("7.1").equals(tb.getFloat1())).as("Correct float1 value").isTrue();
assertThat(Float.valueOf("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
assertThat(Float.valueOf("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
assertThat(Double.valueOf("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
assertThat(Double.valueOf("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
assertThat(Double.valueOf("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
assertThat(Short.valueOf("1")).as("Correct short1 value").isEqualTo(bw.getPropertyValue("short1"));
assertThat(tb.getShort1()).as("Correct short1 value").isOne();
assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(bw.getPropertyValue("short2"));
assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(tb.getShort2());
assertThat(Integer.valueOf("7")).as("Correct int1 value").isEqualTo(bw.getPropertyValue("int1"));
assertThat(tb.getInt1()).as("Correct int1 value").isEqualTo(7);
assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(bw.getPropertyValue("int2"));
assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(tb.getInt2());
assertThat(Long.valueOf("5")).as("Correct long1 value").isEqualTo(bw.getPropertyValue("long1"));
assertThat(tb.getLong1()).as("Correct long1 value").isEqualTo(5);
assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(bw.getPropertyValue("long2"));
assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(tb.getLong2());
assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(bw.getPropertyValue("bigInteger"));
assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(tb.getBigInteger());
assertThat(Float.valueOf("7.1")).as("Correct float1 value").isEqualTo(bw.getPropertyValue("float1"));
assertThat(Float.valueOf("7.1")).as("Correct float1 value").isEqualTo(tb.getFloat1());
assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(bw.getPropertyValue("float2"));
assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(tb.getFloat2());
assertThat(Double.valueOf("5.1")).as("Correct double1 value").isEqualTo(bw.getPropertyValue("double1"));
assertThat(tb.getDouble1()).as("Correct double1 value").isEqualTo(5.1);
assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(bw.getPropertyValue("double2"));
assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(tb.getDouble2());
assertThat(new BigDecimal("4.5")).as("Correct bigDecimal value").isEqualTo(bw.getPropertyValue("bigDecimal"));
assertThat(new BigDecimal("4.5")).as("Correct bigDecimal value").isEqualTo(tb.getBigDecimal());
}
@Test
@@ -408,29 +408,29 @@ class CustomEditorTests {
bw.setPropertyValue("bigDecimal", "4,5");
assertThat(bw.getPropertyValue("short1")).as("Correct short1 value").isEqualTo(Short.valueOf("1"));
assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
assertThat(tb.getShort1()).as("Correct short1 value").isOne();
assertThat(bw.getPropertyValue("short2")).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
assertThat(tb.getShort2()).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
assertThat(bw.getPropertyValue("int1")).as("Correct int1 value").isEqualTo(Integer.valueOf("7"));
assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
assertThat(tb.getInt1()).as("Correct int1 value").isEqualTo(7);
assertThat(bw.getPropertyValue("int2")).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
assertThat(tb.getInt2()).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
assertThat(bw.getPropertyValue("long1")).as("Correct long1 value").isEqualTo(Long.valueOf("5"));
assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
assertThat(tb.getLong1()).as("Correct long1 value").isEqualTo(5);
assertThat(bw.getPropertyValue("long2")).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
assertThat(tb.getLong2()).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(bw.getPropertyValue("bigInteger"));
assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(tb.getBigInteger());
assertThat(bw.getPropertyValue("float1")).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
assertThat(Float.valueOf(tb.getFloat1())).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
assertThat(bw.getPropertyValue("float2")).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
assertThat(tb.getFloat2()).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
assertThat(bw.getPropertyValue("double1")).as("Correct double1 value").isEqualTo(Double.valueOf("5.1"));
assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
assertThat(tb.getDouble1()).as("Correct double1 value").isEqualTo(5.1);
assertThat(bw.getPropertyValue("double2")).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
assertThat(tb.getDouble2()).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
assertThat(new BigDecimal("4.5")).as("Correct bigDecimal value").isEqualTo(bw.getPropertyValue("bigDecimal"));
assertThat(new BigDecimal("4.5")).as("Correct bigDecimal value").isEqualTo(tb.getBigDecimal());
}
@Test
@@ -444,13 +444,13 @@ class CustomEditorTests {
bw.setPropertyValue("long1", "5");
bw.setPropertyValue("long2", "6");
assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
assertThat(tb.getLong1()).as("Correct long1 value").isEqualTo(5);
assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
bw.setPropertyValue("long2", "");
assertThat(bw.getPropertyValue("long2") == null).as("Correct long2 value").isTrue();
assertThat(tb.getLong2() == null).as("Correct long2 value").isTrue();
assertThat(bw.getPropertyValue("long2")).as("Correct long2 value").isNull();
assertThat(tb.getLong2()).as("Correct long2 value").isNull();
assertThatExceptionOfType(BeansException.class).isThrownBy(() ->
bw.setPropertyValue("long1", ""));
assertThat(bw.getPropertyValue("long1")).isEqualTo(5L);

12
spring-beans/src/test/java/org/springframework/beans/propertyeditors/FileEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public class FileEditorTests {
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertThat(file.exists()).isTrue();
assertThat(file).exists();
}
@Test
@@ -86,9 +86,9 @@ public class FileEditorTests {
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertThat(file.exists()).isTrue();
assertThat(file).exists();
String absolutePath = file.getAbsolutePath().replace('\\', '/');
assertThat(absolutePath.endsWith(fileName)).isTrue();
assertThat(absolutePath).endsWith(fileName);
}
@Test
@@ -101,9 +101,9 @@ public class FileEditorTests {
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertThat(file.exists()).isFalse();
assertThat(file).doesNotExist();
String absolutePath = file.getAbsolutePath().replace('\\', '/');
assertThat(absolutePath.endsWith(fileName)).isTrue();
assertThat(absolutePath).endsWith(fileName);
}
}

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/InputStreamEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class InputStreamEditorTests {
boolean condition = value instanceof InputStream;
assertThat(condition).isTrue();
stream = (InputStream) value;
assertThat(stream.available() > 0).isTrue();
assertThat(stream.available()).isGreaterThan(0);
}
finally {
if (stream != null) {

34
spring-beans/src/test/java/org/springframework/beans/propertyeditors/PathEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@ public class PathEditorTests {
pathEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
ClassUtils.getShortName(getClass()) + ".class");
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
assertThat(path.toFile().exists()).isTrue();
assertThat(path.toFile()).exists();
}
@Test
@@ -56,9 +56,9 @@ public class PathEditorTests {
PropertyEditor pathEditor = new PathEditor();
pathEditor.setAsText("file:/no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
assertThat(!path.toFile().exists()).isTrue();
assertThat(path.toFile()).doesNotExist();
}
@Test
@@ -66,9 +66,9 @@ public class PathEditorTests {
PropertyEditor pathEditor = new PathEditor();
pathEditor.setAsText("/no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
assertThat(!path.toFile().exists()).isTrue();
assertThat(path.toFile()).doesNotExist();
}
@Test
@@ -76,9 +76,9 @@ public class PathEditorTests {
PropertyEditor pathEditor = new PathEditor();
pathEditor.setAsText("C:\\no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
assertThat(!path.toFile().exists()).isTrue();
assertThat(path.toFile()).doesNotExist();
}
@Test
@@ -87,9 +87,9 @@ public class PathEditorTests {
try {
pathEditor.setAsText("file://C:\\no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
assertThat(!path.toFile().exists()).isTrue();
assertThat(path.toFile()).doesNotExist();
}
catch (IllegalArgumentException ex) {
if (File.separatorChar == '\\') { // on Windows, otherwise silently ignore
@@ -105,15 +105,15 @@ public class PathEditorTests {
ClassUtils.getShortName(getClass()) + ".class";
pathEditor.setAsText(fileName);
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
File file = path.toFile();
assertThat(file.exists()).isTrue();
assertThat(file).exists();
String absolutePath = file.getAbsolutePath();
if (File.separatorChar == '\\') {
absolutePath = absolutePath.replace('\\', '/');
}
assertThat(absolutePath.endsWith(fileName)).isTrue();
assertThat(absolutePath).endsWith(fileName);
}
@Test
@@ -123,15 +123,15 @@ public class PathEditorTests {
ClassUtils.getShortName(getClass()) + ".clazz";
pathEditor.setAsText(fileName);
Object value = pathEditor.getValue();
assertThat(value instanceof Path).isTrue();
assertThat(value).isInstanceOf(Path.class);
Path path = (Path) value;
File file = path.toFile();
assertThat(file.exists()).isFalse();
assertThat(file).doesNotExist();
String absolutePath = file.getAbsolutePath();
if (File.separatorChar == '\\') {
absolutePath = absolutePath.replace('\\', '/');
}
assertThat(absolutePath.endsWith(fileName)).isTrue();
assertThat(absolutePath).endsWith(fileName);
}
}

16
spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 1).as("contains one entry").isTrue();
assertThat(p.entrySet().size()).as("contains one entry").isEqualTo(1);
assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue();
}
@@ -51,7 +51,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 2).as("contains two entries").isTrue();
assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(2);
assertThat(p.get("foo").equals("bar with whitespace")).as("foo=bar with whitespace").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
@@ -64,7 +64,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 3).as("contains two entries").isTrue();
assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(3);
assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
assertThat(p.get("x").equals("y=z")).as("x='y=z'").isTrue();
@@ -76,7 +76,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 3).as("contains two entries").isTrue();
assertThat(p.entrySet().size()).as("contains two entries").isEqualTo(3);
assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
assertThat(p.get("x").equals("")).as("x='y=z'").isTrue();
@@ -88,7 +88,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 3).as("contains three entries").isTrue();
assertThat(p.entrySet().size()).as("contains three entries").isEqualTo(3);
assertThat(p.get("foo").equals("")).as("foo is empty").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
@@ -107,7 +107,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.entrySet().size() == 3).as("contains three entries").isTrue();
assertThat(p.entrySet().size()).as("contains three entries").isEqualTo(3);
assertThat(p.get("foo").equals("bar")).as("foo is bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
@@ -129,7 +129,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertThat(p.size() == 3).as("contains 3 entries, not " + p.size()).isTrue();
assertThat(p.size()).as("contains 3 entries, not " + p.size()).isEqualTo(3);
assertThat(p.get("foo").equals("bar")).as("foo is bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}

8
spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ public class URIEditorTests {
assertThat(condition).isTrue();
URI uri = (URI) value;
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
assertThat(uri.getScheme().startsWith("classpath")).isTrue();
assertThat(uri.getScheme()).startsWith("classpath");
}
@Test
@@ -107,13 +107,13 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText(null);
assertThat(uriEditor.getValue()).isNull();
assertThat(uriEditor.getAsText()).isEqualTo("");
assertThat(uriEditor.getAsText()).isEmpty();
}
@Test
public void getAsTextReturnsEmptyStringIfValueNotSet() throws Exception {
PropertyEditor uriEditor = new URIEditor();
assertThat(uriEditor.getAsText()).isEqualTo("");
assertThat(uriEditor.getAsText()).isEmpty();
}
@Test

6
spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -86,13 +86,13 @@ public class URLEditorTests {
PropertyEditor urlEditor = new URLEditor();
urlEditor.setAsText(null);
assertThat(urlEditor.getValue()).isNull();
assertThat(urlEditor.getAsText()).isEqualTo("");
assertThat(urlEditor.getAsText()).isEmpty();
}
@Test
public void testGetAsTextReturnsEmptyStringIfValueNotSet() throws Exception {
PropertyEditor urlEditor = new URLEditor();
assertThat(urlEditor.getAsText()).isEqualTo("");
assertThat(urlEditor.getAsText()).isEmpty();
}
}

4
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ZoneIdEditorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ class ZoneIdEditorTests {
@Test
void getNullAsText() {
assertThat(editor.getAsText()).as("The returned value is not correct.").isEqualTo("");
assertThat(editor.getAsText()).as("The returned value is not correct.").isEmpty();
}
@Test

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

@@ -52,101 +52,101 @@ public class PagedListHolderTests {
tbs.add(tb3);
PagedListHolder holder = new PagedListHolder(tbs);
assertThat(holder.getSource() == tbs).as("Correct source").isTrue();
assertThat(holder.getNrOfElements() == 3).as("Correct number of elements").isTrue();
assertThat(holder.getPageCount() == 1).as("Correct number of pages").isTrue();
assertThat(holder.getPageSize() == PagedListHolder.DEFAULT_PAGE_SIZE).as("Correct page size").isTrue();
assertThat(holder.getPage() == 0).as("Correct page number").isTrue();
assertThat(holder.getSource()).as("Correct source").isSameAs(tbs);
assertThat(holder.getNrOfElements()).as("Correct number of elements").isEqualTo(3);
assertThat(holder.getPageCount()).as("Correct number of pages").isEqualTo(1);
assertThat(holder.getPageSize()).as("Correct page size").isEqualTo(PagedListHolder.DEFAULT_PAGE_SIZE);
assertThat(holder.getPage()).as("Correct page number").isEqualTo(0);
assertThat(holder.isFirstPage()).as("First page").isTrue();
assertThat(holder.isLastPage()).as("Last page").isTrue();
assertThat(holder.getFirstElementOnPage() == 0).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 2).as("Correct first element").isTrue();
assertThat(holder.getPageList().size() == 3).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb2).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(2) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(0);
assertThat(holder.getLastElementOnPage()).as("Correct first element").isEqualTo(2);
assertThat(holder.getPageList().size()).as("Correct page list size").isEqualTo(3);
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb1);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb2);
assertThat(holder.getPageList().get(2)).as("Correct page list contents").isSameAs(tb3);
holder.setPageSize(2);
assertThat(holder.getPageCount() == 2).as("Correct number of pages").isTrue();
assertThat(holder.getPageSize() == 2).as("Correct page size").isTrue();
assertThat(holder.getPage() == 0).as("Correct page number").isTrue();
assertThat(holder.getPageCount()).as("Correct number of pages").isEqualTo(2);
assertThat(holder.getPageSize()).as("Correct page size").isEqualTo(2);
assertThat(holder.getPage()).as("Correct page number").isEqualTo(0);
assertThat(holder.isFirstPage()).as("First page").isTrue();
assertThat(holder.isLastPage()).as("Last page").isFalse();
assertThat(holder.getFirstElementOnPage() == 0).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 1).as("Correct last element").isTrue();
assertThat(holder.getPageList().size() == 2).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb2).as("Correct page list contents").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(0);
assertThat(holder.getLastElementOnPage()).as("Correct last element").isEqualTo(1);
assertThat(holder.getPageList().size()).as("Correct page list size").isEqualTo(2);
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb1);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb2);
holder.setPage(1);
assertThat(holder.getPage() == 1).as("Correct page number").isTrue();
assertThat(holder.getPage()).as("Correct page number").isEqualTo(1);
assertThat(holder.isFirstPage()).as("First page").isFalse();
assertThat(holder.isLastPage()).as("Last page").isTrue();
assertThat(holder.getFirstElementOnPage() == 2).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 2).as("Correct last element").isTrue();
assertThat(holder.getPageList().size() == 1).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(2);
assertThat(holder.getLastElementOnPage()).as("Correct last element").isEqualTo(2);
assertThat(holder.getPageList().size()).as("Correct page list size").isEqualTo(1);
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb3);
holder.setPageSize(3);
assertThat(holder.getPageCount() == 1).as("Correct number of pages").isTrue();
assertThat(holder.getPageSize() == 3).as("Correct page size").isTrue();
assertThat(holder.getPage() == 0).as("Correct page number").isTrue();
assertThat(holder.getPageCount()).as("Correct number of pages").isEqualTo(1);
assertThat(holder.getPageSize()).as("Correct page size").isEqualTo(3);
assertThat(holder.getPage()).as("Correct page number").isEqualTo(0);
assertThat(holder.isFirstPage()).as("First page").isTrue();
assertThat(holder.isLastPage()).as("Last page").isTrue();
assertThat(holder.getFirstElementOnPage() == 0).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 2).as("Correct last element").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(0);
assertThat(holder.getLastElementOnPage()).as("Correct last element").isEqualTo(2);
holder.setPage(1);
holder.setPageSize(2);
assertThat(holder.getPageCount() == 2).as("Correct number of pages").isTrue();
assertThat(holder.getPageSize() == 2).as("Correct page size").isTrue();
assertThat(holder.getPage() == 1).as("Correct page number").isTrue();
assertThat(holder.getPageCount()).as("Correct number of pages").isEqualTo(2);
assertThat(holder.getPageSize()).as("Correct page size").isEqualTo(2);
assertThat(holder.getPage()).as("Correct page number").isEqualTo(1);
assertThat(holder.isFirstPage()).as("First page").isFalse();
assertThat(holder.isLastPage()).as("Last page").isTrue();
assertThat(holder.getFirstElementOnPage() == 2).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 2).as("Correct last element").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(2);
assertThat(holder.getLastElementOnPage()).as("Correct last element").isEqualTo(2);
holder.setPageSize(2);
holder.setPage(1);
((MutableSortDefinition) holder.getSort()).setProperty("name");
((MutableSortDefinition) holder.getSort()).setIgnoreCase(false);
holder.resort();
assertThat(holder.getSource() == tbs).as("Correct source").isTrue();
assertThat(holder.getNrOfElements() == 3).as("Correct number of elements").isTrue();
assertThat(holder.getPageCount() == 2).as("Correct number of pages").isTrue();
assertThat(holder.getPageSize() == 2).as("Correct page size").isTrue();
assertThat(holder.getPage() == 0).as("Correct page number").isTrue();
assertThat(holder.getSource()).as("Correct source").isSameAs(tbs);
assertThat(holder.getNrOfElements()).as("Correct number of elements").isEqualTo(3);
assertThat(holder.getPageCount()).as("Correct number of pages").isEqualTo(2);
assertThat(holder.getPageSize()).as("Correct page size").isEqualTo(2);
assertThat(holder.getPage()).as("Correct page number").isEqualTo(0);
assertThat(holder.isFirstPage()).as("First page").isTrue();
assertThat(holder.isLastPage()).as("Last page").isFalse();
assertThat(holder.getFirstElementOnPage() == 0).as("Correct first element").isTrue();
assertThat(holder.getLastElementOnPage() == 1).as("Correct last element").isTrue();
assertThat(holder.getPageList().size() == 2).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getFirstElementOnPage()).as("Correct first element").isEqualTo(0);
assertThat(holder.getLastElementOnPage()).as("Correct last element").isEqualTo(1);
assertThat(holder.getPageList().size()).as("Correct page list size").isEqualTo(2);
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb3);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb1);
((MutableSortDefinition) holder.getSort()).setProperty("name");
holder.resort();
assertThat(holder.getPageList().get(0) == tb2).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb2);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb1);
((MutableSortDefinition) holder.getSort()).setProperty("name");
holder.resort();
assertThat(holder.getPageList().get(0) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb3);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb1);
holder.setPage(1);
assertThat(holder.getPageList().size() == 1).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb2).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().size()).as("Correct page list size").isEqualTo(1);
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb2);
((MutableSortDefinition) holder.getSort()).setProperty("age");
holder.resort();
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb1);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb3);
((MutableSortDefinition) holder.getSort()).setIgnoreCase(true);
holder.resort();
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(0)).as("Correct page list contents").isSameAs(tb1);
assertThat(holder.getPageList().get(1)).as("Correct page list contents").isSameAs(tb3);
holder.nextPage();
assertThat(holder.getPage()).isEqualTo(1);

20
spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@ public class PropertyComparatorTests {
dog2.setNickName("biscy");
PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
assertThat(c.compare(dog, dog2) > 0).isTrue();
assertThat(c.compare(dog, dog) == 0).isTrue();
assertThat(c.compare(dog2, dog) < 0).isTrue();
assertThat(c.compare(dog, dog2)).isGreaterThan(0);
assertThat(c.compare(dog, dog)).isEqualTo(0);
assertThat(c.compare(dog2, dog)).isLessThan(0);
}
@Test
@@ -49,7 +49,7 @@ public class PropertyComparatorTests {
Dog dog = new Dog();
Dog dog2 = new Dog();
PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
assertThat(c.compare(dog, dog2) == 0).isTrue();
assertThat(c.compare(dog, dog2)).isEqualTo(0);
}
@Test
@@ -64,13 +64,13 @@ public class PropertyComparatorTests {
dog2.setFirstName("biscuit");
dog2.setLastName("grayspots");
assertThat(c.compare(dog1, dog2) == 0).isTrue();
assertThat(c.compare(dog1, dog2)).isEqualTo(0);
c = c.thenComparing(new PropertyComparator<>("firstName", false, true));
assertThat(c.compare(dog1, dog2) > 0).isTrue();
assertThat(c.compare(dog1, dog2)).isGreaterThan(0);
dog2.setLastName("konikk dog");
assertThat(c.compare(dog2, dog1) > 0).isTrue();
assertThat(c.compare(dog2, dog1)).isGreaterThan(0);
}
@Test
@@ -86,9 +86,9 @@ public class PropertyComparatorTests {
dog2.setFirstName("biscuit");
dog2.setLastName("grayspots");
assertThat(c.compare(dog1, dog2) > 0).isTrue();
assertThat(c.compare(dog1, dog2)).isGreaterThan(0);
c = c.reversed();
assertThat(c.compare(dog1, dog2) < 0).isTrue();
assertThat(c.compare(dog1, dog2)).isLessThan(0);
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,11 +58,11 @@ public abstract class AbstractBeanFactoryTests {
assertThat(getBeanFactory().containsBean("roderick")).isTrue();
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
TestBean roderick = (TestBean) getBeanFactory().getBean("roderick");
assertThat(rod != roderick).as("not == ").isTrue();
assertThat(rod).as("not == ").isNotSameAs(roderick);
assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue();
assertThat(rod.getAge() == 31).as("rod.age is 31").isTrue();
assertThat(rod.getAge()).as("rod.age is 31").isEqualTo(31);
assertThat(roderick.getName().equals("Roderick")).as("roderick.name is Roderick").isTrue();
assertThat(roderick.getAge() == rod.getAge()).as("roderick.age was inherited").isTrue();
assertThat(roderick.getAge()).as("roderick.age was inherited").isEqualTo(rod.getAge());
}
@Test
@@ -104,7 +104,7 @@ public abstract class AbstractBeanFactoryTests {
assertThat(condition).as("Rod bean is a TestBean").isTrue();
TestBean rod = (TestBean) o;
assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue();
assertThat(rod.getAge() == 31).as("rod.age is 31").isTrue();
assertThat(rod.getAge()).as("rod.age is 31").isEqualTo(31);
}
@Test
@@ -158,19 +158,19 @@ public abstract class AbstractBeanFactoryTests {
Object o1 = getBeanFactory().getBean("rod");
boolean condition = o1 instanceof TestBean;
assertThat(condition).as("Rod bean2 is a TestBean").isTrue();
assertThat(o == o1).as("Object equals applies").isTrue();
assertThat(o).as("Object equals applies").isSameAs(o1);
}
@Test
public void prototypeInstancesAreIndependent() {
TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy");
TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy");
assertThat(tb1 != tb2).as("ref equal DOES NOT apply").isTrue();
assertThat(tb1).as("ref equal DOES NOT apply").isNotSameAs(tb2);
assertThat(tb1.equals(tb2)).as("object equal true").isTrue();
tb1.setAge(1);
tb2.setAge(2);
assertThat(tb1.getAge() == 1).as("1 age independent = 1").isTrue();
assertThat(tb2.getAge() == 2).as("2 age independent = 2").isTrue();
assertThat(tb1.getAge()).as("1 age independent = 1").isEqualTo(1);
assertThat(tb2.getAge()).as("2 age independent = 2").isEqualTo(2);
boolean condition = !tb1.equals(tb2);
assertThat(condition).as("object equal now false").isTrue();
}
@@ -212,8 +212,8 @@ public abstract class AbstractBeanFactoryTests {
assertThat(tb.getName().equals(DummyFactory.SINGLETON_NAME)).as("Singleton from factory has correct name, not " + tb.getName()).isTrue();
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
TestBean tb2 = (TestBean) getBeanFactory().getBean("singletonFactory");
assertThat(tb == tb2).as("Singleton references ==").isTrue();
assertThat(factory.getBeanFactory() != null).as("FactoryBean is BeanFactoryAware").isTrue();
assertThat(tb).as("Singleton references ==").isSameAs(tb2);
assertThat(factory.getBeanFactory()).as("FactoryBean is BeanFactoryAware").isNotNull();
}
@Test
@@ -224,7 +224,7 @@ public abstract class AbstractBeanFactoryTests {
boolean condition = !tb.getName().equals(DummyFactory.SINGLETON_NAME);
assertThat(condition).isTrue();
TestBean tb2 = (TestBean) getBeanFactory().getBean("prototypeFactory");
assertThat(tb != tb2).as("Prototype references !=").isTrue();
assertThat(tb).as("Prototype references !=").isNotSameAs(tb2);
}
/**
@@ -274,7 +274,7 @@ public abstract class AbstractBeanFactoryTests {
cbf.registerAlias("rod", alias);
Object rod = getBeanFactory().getBean("rod");
Object aliasRod = getBeanFactory().getBean(alias);
assertThat(rod == aliasRod).isTrue();
assertThat(rod).isSameAs(aliasRod);
}

23
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractListableBeanFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,24 +50,25 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
protected final void assertCount(int count) {
String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
assertThat(defnames.length == count).as("We should have " + count + " beans, not " + defnames.length).isTrue();
assertThat(defnames.length).as("We should have " + count + " beans, not " + defnames.length).isEqualTo(count);
}
protected void assertTestBeanCount(int count) {
String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
assertThat(defNames.length == count).as("We should have " + count + " beans for class org.springframework.beans.testfixture.beans.TestBean, not " +
defNames.length).isTrue();
assertThat(defNames.length).as("We should have " + count + " beans for class org.springframework.beans.testfixture.beans.TestBean, not " +
defNames.length).isEqualTo(count);
int countIncludingFactoryBeans = count + 2;
String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
assertThat(names.length == countIncludingFactoryBeans).as("We should have " + countIncludingFactoryBeans +
" beans for class org.springframework.beans.testfixture.beans.TestBean, not " + names.length).isTrue();
assertThat(names.length).as("We should have " + countIncludingFactoryBeans +
" beans for class org.springframework.beans.testfixture.beans.TestBean, not " + names.length)
.isEqualTo(countIncludingFactoryBeans);
}
@Test
public void getDefinitionsForNoSuchClass() {
String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
assertThat(defnames.length == 0).as("No string definitions").isTrue();
assertThat(defnames.length).as("No string definitions").isEqualTo(0);
}
/**
@@ -76,11 +77,11 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
*/
@Test
public void getCountForFactoryClass() {
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isTrue();
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isEqualTo(2);
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isTrue();
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isEqualTo(2);
}
@Test