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

Migrate JUnit 4 assertions to AssertJ

Browse Source 
Migrate all existing JUnit 4 `assert...` based assertions to AssertJ
and add a checkstyle rule to ensure they don't return.

See gh-23022
This commit is contained in:
Phillip Webb
2019-05-23 15:51:39 -07:00
parent 95a9d46a87
commit 9d74da006c
1636 changed files with 37861 additions and 40390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -19,7 +19,7 @@ package org.springframework.beans;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rod Johnson
@@ -31,11 +31,12 @@ public abstract class AbstractPropertyValuesTests {
* Must contain: forname=Tony surname=Blair age=50
*/
protected void doTestTony(PropertyValues pvs) {
assertTrue("Contains 3", pvs.getPropertyValues().length == 3);
assertTrue("Contains forname", pvs.contains("forname"));
assertTrue("Contains surname", pvs.contains("surname"));
assertTrue("Contains age", pvs.contains("age"));
assertTrue("Doesn't contain tory", !pvs.contains("tory"));
assertThat(pvs.getPropertyValues().length == 3).as("Contains 3").isTrue();
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
boolean condition1 = !pvs.contains("tory");
assertThat(condition1).as("Doesn't contain tory").isTrue();
PropertyValue[] ps = pvs.getPropertyValues();
Map<String, String> m = new HashMap<>();
@@ -44,12 +45,13 @@ public abstract class AbstractPropertyValuesTests {
m.put("age", "50");
for (int i = 0; i < ps.length; i++) {
Object val = m.get(ps[i].getName());
assertTrue("Can't have unexpected value", val != null);
assertTrue("Val i string", val instanceof String);
assertTrue("val matches expected", val.equals(ps[i].getValue()));
assertThat(val != null).as("Can't have unexpected value").isTrue();
boolean condition = val instanceof String;
assertThat(condition).as("Val i string").isTrue();
assertThat(val.equals(ps[i].getValue())).as("val matches expected").isTrue();
m.remove(ps[i].getName());
}
assertTrue("Map size is 0", m.size() == 0);
assertThat(m.size() == 0).as("Map size is 0").isTrue();
}
}

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

@@ -33,12 +33,9 @@ import org.springframework.tests.sample.beans.DerivedTestBean;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for {@link BeanUtils}.
@@ -68,18 +65,18 @@ public class BeanUtilsTests {
Constructor<BeanWithNullableTypes> ctor = BeanWithNullableTypes.class.getDeclaredConstructor(
Integer.class, Boolean.class, String.class);
BeanWithNullableTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
assertNull(bean.getCounter());
assertNull(bean.isFlag());
assertEquals("foo", bean.getValue());
assertThat(bean.getCounter()).isNull();
assertThat(bean.isFlag()).isNull();
assertThat(bean.getValue()).isEqualTo("foo");
}
@Test // gh-22531
public void testInstantiateClassWithOptionalPrimitiveType() throws NoSuchMethodException {
Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
assertEquals(0, bean.getCounter());
assertEquals(false, bean.isFlag());
assertEquals("foo", bean.getValue());
assertThat(bean.getCounter()).isEqualTo(0);
assertThat(bean.isFlag()).isEqualTo(false);
assertThat(bean.getValue()).isEqualTo("foo");
}
@Test // gh-22531
@@ -93,8 +90,8 @@ public class BeanUtilsTests {
public void testGetPropertyDescriptors() throws Exception {
PropertyDescriptor[] actual = Introspector.getBeanInfo(TestBean.class).getPropertyDescriptors();
PropertyDescriptor[] descriptors = BeanUtils.getPropertyDescriptors(TestBean.class);
assertNotNull("Descriptors should not be null", descriptors);
assertEquals("Invalid number of descriptors returned", actual.length, descriptors.length);
assertThat(descriptors).as("Descriptors should not be null").isNotNull();
assertThat(descriptors.length).as("Invalid number of descriptors returned").isEqualTo(actual.length);
}
@Test
@@ -102,15 +99,15 @@ public class BeanUtilsTests {
PropertyDescriptor[] descriptors = BeanUtils.getPropertyDescriptors(ContainerBean.class);
for (PropertyDescriptor descriptor : descriptors) {
if ("containedBeans".equals(descriptor.getName())) {
assertTrue("Property should be an array", descriptor.getPropertyType().isArray());
assertEquals(descriptor.getPropertyType().getComponentType(), ContainedBean.class);
assertThat(descriptor.getPropertyType().isArray()).as("Property should be an array").isTrue();
assertThat(ContainedBean.class).isEqualTo(descriptor.getPropertyType().getComponentType());
}
}
}
@Test
public void testFindEditorByConvention() {
assertEquals(ResourceEditor.class, BeanUtils.findEditorByConvention(Resource.class).getClass());
assertThat(BeanUtils.findEditorByConvention(Resource.class).getClass()).isEqualTo(ResourceEditor.class);
}
@Test
@@ -120,13 +117,13 @@ public class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
TestBean tb2 = new TestBean();
assertTrue("Name empty", tb2.getName() == null);
assertTrue("Age empty", tb2.getAge() == 0);
assertTrue("Touchy empty", tb2.getTouchy() == null);
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
BeanUtils.copyProperties(tb, tb2);
assertTrue("Name copied", tb2.getName().equals(tb.getName()));
assertTrue("Age copied", tb2.getAge() == tb.getAge());
assertTrue("Touchy copied", tb2.getTouchy().equals(tb.getTouchy()));
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();
}
@Test
@@ -136,13 +133,13 @@ public class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
TestBean tb2 = new TestBean();
assertTrue("Name empty", tb2.getName() == null);
assertTrue("Age empty", tb2.getAge() == 0);
assertTrue("Touchy empty", tb2.getTouchy() == null);
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
BeanUtils.copyProperties(tb, tb2);
assertTrue("Name copied", tb2.getName().equals(tb.getName()));
assertTrue("Age copied", tb2.getAge() == tb.getAge());
assertTrue("Touchy copied", tb2.getTouchy().equals(tb.getTouchy()));
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();
}
@Test
@@ -152,49 +149,49 @@ public class BeanUtilsTests {
tb.setAge(32);
tb.setTouchy("touchy");
DerivedTestBean tb2 = new DerivedTestBean();
assertTrue("Name empty", tb2.getName() == null);
assertTrue("Age empty", tb2.getAge() == 0);
assertTrue("Touchy empty", tb2.getTouchy() == null);
assertThat(tb2.getName() == null).as("Name empty").isTrue();
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
BeanUtils.copyProperties(tb, tb2);
assertTrue("Name copied", tb2.getName().equals(tb.getName()));
assertTrue("Age copied", tb2.getAge() == tb.getAge());
assertTrue("Touchy copied", tb2.getTouchy().equals(tb.getTouchy()));
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();
}
@Test
public void testCopyPropertiesWithEditable() throws Exception {
TestBean tb = new TestBean();
assertTrue("Name empty", tb.getName() == null);
assertThat(tb.getName() == null).as("Name empty").isTrue();
tb.setAge(32);
tb.setTouchy("bla");
TestBean tb2 = new TestBean();
tb2.setName("rod");
assertTrue("Age empty", tb2.getAge() == 0);
assertTrue("Touchy empty", tb2.getTouchy() == null);
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
// "touchy" should not be copied: it's not defined in ITestBean
BeanUtils.copyProperties(tb, tb2, ITestBean.class);
assertTrue("Name copied", tb2.getName() == null);
assertTrue("Age copied", tb2.getAge() == 32);
assertTrue("Touchy still empty", tb2.getTouchy() == null);
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();
}
@Test
public void testCopyPropertiesWithIgnore() throws Exception {
TestBean tb = new TestBean();
assertTrue("Name empty", tb.getName() == null);
assertThat(tb.getName() == null).as("Name empty").isTrue();
tb.setAge(32);
tb.setTouchy("bla");
TestBean tb2 = new TestBean();
tb2.setName("rod");
assertTrue("Age empty", tb2.getAge() == 0);
assertTrue("Touchy empty", tb2.getTouchy() == null);
assertThat(tb2.getAge() == 0).as("Age empty").isTrue();
assertThat(tb2.getTouchy() == null).as("Touchy empty").isTrue();
// "spouse", "touchy", "age" should not be copied
BeanUtils.copyProperties(tb, tb2, "spouse", "touchy", "age");
assertTrue("Name copied", tb2.getName() == null);
assertTrue("Age still empty", tb2.getAge() == 0);
assertTrue("Touchy still empty", tb2.getTouchy() == null);
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();
}
@Test
@@ -203,7 +200,7 @@ public class BeanUtilsTests {
source.setName("name");
TestBean target = new TestBean();
BeanUtils.copyProperties(source, target, "specialProperty");
assertEquals(target.getName(), "name");
assertThat("name").isEqualTo(target.getName());
}
@Test
@@ -214,9 +211,9 @@ public class BeanUtilsTests {
source.setFlag2(true);
InvalidProperty target = new InvalidProperty();
BeanUtils.copyProperties(source, target);
assertEquals("name", target.getName());
assertTrue(target.getFlag1());
assertTrue(target.getFlag2());
assertThat(target.getName()).isEqualTo("name");
assertThat((boolean) target.getFlag1()).isTrue();
assertThat(target.getFlag2()).isTrue();
}
@Test
@@ -242,7 +239,7 @@ public class BeanUtilsTests {
public void testResolveWithAndWithoutArgList() throws Exception {
Method desiredMethod = MethodSignatureBean.class.getMethod("doSomethingElse", String.class, int.class);
assertSignatureEquals(desiredMethod, "doSomethingElse");
assertNull(BeanUtils.resolveSignature("doSomethingElse()", MethodSignatureBean.class));
assertThat(BeanUtils.resolveSignature("doSomethingElse()", MethodSignatureBean.class)).isNull();
}
@Test
@@ -280,17 +277,16 @@ public class BeanUtilsTests {
PropertyDescriptor[] descrs = BeanUtils.getPropertyDescriptors(Bean.class);
PropertyDescriptor keyDescr = BeanUtils.getPropertyDescriptor(Bean.class, "value");
assertEquals(String.class, keyDescr.getPropertyType());
assertThat(keyDescr.getPropertyType()).isEqualTo(String.class);
for (PropertyDescriptor propertyDescriptor : descrs) {
if (propertyDescriptor.getName().equals(keyDescr.getName())) {
assertEquals(propertyDescriptor.getName() + " has unexpected type",
keyDescr.getPropertyType(), propertyDescriptor.getPropertyType());
assertThat(propertyDescriptor.getPropertyType()).as(propertyDescriptor.getName() + " has unexpected type").isEqualTo(keyDescr.getPropertyType());
}
}
}
private void assertSignatureEquals(Method desiredMethod, String signature) {
assertEquals(desiredMethod, BeanUtils.resolveSignature(signature, MethodSignatureBean.class));
assertThat(BeanUtils.resolveSignature(signature, MethodSignatureBean.class)).isEqualTo(desiredMethod);
}

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

@@ -24,9 +24,6 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
* @author Keith Donald
@@ -47,13 +44,13 @@ public class BeanWrapperAutoGrowingTests {
@Test
public void getPropertyValueNullValueInNestedPath() {
assertNull(wrapper.getPropertyValue("nested.prop"));
assertThat(wrapper.getPropertyValue("nested.prop")).isNull();
}
@Test
public void setPropertyValueNullValueInNestedPath() {
wrapper.setPropertyValue("nested.prop", "test");
assertEquals("test", bean.getNested().getProp());
assertThat(bean.getNested().getProp()).isEqualTo("test");
}
@Test
@@ -65,20 +62,25 @@ public class BeanWrapperAutoGrowingTests {
@Test
public void getPropertyValueAutoGrowArray() {
assertNotNull(wrapper.getPropertyValue("array[0]"));
assertEquals(1, bean.getArray().length);
assertThat(bean.getArray().length).isEqualTo(1);
assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
}
private void assertNotNull(Object propertyValue) {
assertThat(propertyValue).isNotNull();
}
@Test
public void setPropertyValueAutoGrowArray() {
wrapper.setPropertyValue("array[0].prop", "test");
assertEquals("test", bean.getArray()[0].getProp());
assertThat(bean.getArray()[0].getProp()).isEqualTo("test");
}
@Test
public void getPropertyValueAutoGrowArrayBySeveralElements() {
assertNotNull(wrapper.getPropertyValue("array[4]"));
assertEquals(5, bean.getArray().length);
assertThat(bean.getArray().length).isEqualTo(5);
assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
assertThat(bean.getArray()[1]).isInstanceOf(Bean.class);
assertThat(bean.getArray()[2]).isInstanceOf(Bean.class);
@@ -93,27 +95,27 @@ public class BeanWrapperAutoGrowingTests {
@Test
public void getPropertyValueAutoGrowMultiDimensionalArray() {
assertNotNull(wrapper.getPropertyValue("multiArray[0][0]"));
assertEquals(1, bean.getMultiArray()[0].length);
assertThat(bean.getMultiArray()[0].length).isEqualTo(1);
assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
}
@Test
public void getPropertyValueAutoGrowList() {
assertNotNull(wrapper.getPropertyValue("list[0]"));
assertEquals(1, bean.getList().size());
assertThat(bean.getList().size()).isEqualTo(1);
assertThat(bean.getList().get(0)).isInstanceOf(Bean.class);
}
@Test
public void setPropertyValueAutoGrowList() {
wrapper.setPropertyValue("list[0].prop", "test");
assertEquals("test", bean.getList().get(0).getProp());
assertThat(bean.getList().get(0).getProp()).isEqualTo("test");
}
@Test
public void getPropertyValueAutoGrowListBySeveralElements() {
assertNotNull(wrapper.getPropertyValue("list[4]"));
assertEquals(5, bean.getList().size());
assertThat(bean.getList().size()).isEqualTo(5);
assertThat(bean.getList().get(0)).isInstanceOf(Bean.class);
assertThat(bean.getList().get(1)).isInstanceOf(Bean.class);
assertThat(bean.getList().get(2)).isInstanceOf(Bean.class);
@@ -136,7 +138,7 @@ public class BeanWrapperAutoGrowingTests {
@Test
public void getPropertyValueAutoGrowMultiDimensionalList() {
assertNotNull(wrapper.getPropertyValue("multiList[0][0]"));
assertEquals(1, bean.getMultiList().get(0).size());
assertThat(bean.getMultiList().get(0).size()).isEqualTo(1);
assertThat(bean.getMultiList().get(0).get(0)).isInstanceOf(Bean.class);
}

76
spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
View File

@@ -25,9 +25,7 @@ import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.tests.sample.beans.CustomEnum;
import org.springframework.tests.sample.beans.GenericBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -40,7 +38,7 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnum", "VALUE_1");
assertEquals(CustomEnum.VALUE_1, gb.getCustomEnum());
assertThat(gb.getCustomEnum()).isEqualTo(CustomEnum.VALUE_1);
}
@Test
@@ -48,7 +46,7 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnum", null);
assertEquals(null, gb.getCustomEnum());
assertThat(gb.getCustomEnum()).isEqualTo(null);
}
@Test
@@ -56,7 +54,7 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnum", "");
assertEquals(null, gb.getCustomEnum());
assertThat(gb.getCustomEnum()).isEqualTo(null);
}
@Test
@@ -64,8 +62,8 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumArray", "VALUE_1");
assertEquals(1, gb.getCustomEnumArray().length);
assertEquals(CustomEnum.VALUE_1, gb.getCustomEnumArray()[0]);
assertThat(gb.getCustomEnumArray().length).isEqualTo(1);
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
}
@Test
@@ -73,9 +71,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumArray", new String[] {"VALUE_1", "VALUE_2"});
assertEquals(2, gb.getCustomEnumArray().length);
assertEquals(CustomEnum.VALUE_1, gb.getCustomEnumArray()[0]);
assertEquals(CustomEnum.VALUE_2, gb.getCustomEnumArray()[1]);
assertThat(gb.getCustomEnumArray().length).isEqualTo(2);
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
assertThat(gb.getCustomEnumArray()[1]).isEqualTo(CustomEnum.VALUE_2);
}
@Test
@@ -83,9 +81,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumArray", "VALUE_1,VALUE_2");
assertEquals(2, gb.getCustomEnumArray().length);
assertEquals(CustomEnum.VALUE_1, gb.getCustomEnumArray()[0]);
assertEquals(CustomEnum.VALUE_2, gb.getCustomEnumArray()[1]);
assertThat(gb.getCustomEnumArray().length).isEqualTo(2);
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
assertThat(gb.getCustomEnumArray()[1]).isEqualTo(CustomEnum.VALUE_2);
}
@Test
@@ -93,8 +91,8 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", "VALUE_1");
assertEquals(1, gb.getCustomEnumSet().size());
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1));
assertThat(gb.getCustomEnumSet().size()).isEqualTo(1);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
}
@Test
@@ -102,9 +100,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"});
assertEquals(2, gb.getCustomEnumSet().size());
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1));
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2));
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
}
@Test
@@ -112,9 +110,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2");
assertEquals(2, gb.getCustomEnumSet().size());
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1));
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2));
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
}
@Test
@@ -122,9 +120,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"});
assertEquals(2, gb.getCustomEnumSet().size());
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1));
assertTrue(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2));
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
}
@Test
@@ -132,11 +130,11 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setConversionService(new DefaultConversionService());
assertNull(gb.getStandardEnumSet());
assertThat(gb.getStandardEnumSet()).isNull();
bw.setPropertyValue("standardEnumSet", new String[] {"VALUE_1", "VALUE_2"});
assertEquals(2, gb.getStandardEnumSet().size());
assertTrue(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1));
assertTrue(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2));
assertThat(gb.getStandardEnumSet().size()).isEqualTo(2);
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
}
@Test
@@ -144,9 +142,9 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setAutoGrowNestedPaths(true);
assertNull(gb.getStandardEnumSet());
assertThat(gb.getStandardEnumSet()).isNull();
bw.getPropertyValue("standardEnumSet.class");
assertEquals(0, gb.getStandardEnumSet().size());
assertThat(gb.getStandardEnumSet().size()).isEqualTo(0);
}
@Test
@@ -154,14 +152,14 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setConversionService(new DefaultConversionService());
assertNull(gb.getStandardEnumMap());
assertThat(gb.getStandardEnumMap()).isNull();
Map<String, Integer> map = new LinkedHashMap<>();
map.put("VALUE_1", 1);
map.put("VALUE_2", 2);
bw.setPropertyValue("standardEnumMap", map);
assertEquals(2, gb.getStandardEnumMap().size());
assertEquals(new Integer(1), gb.getStandardEnumMap().get(CustomEnum.VALUE_1));
assertEquals(new Integer(2), gb.getStandardEnumMap().get(CustomEnum.VALUE_2));
assertThat(gb.getStandardEnumMap().size()).isEqualTo(2);
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(new Integer(1));
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_2)).isEqualTo(new Integer(2));
}
@Test
@@ -169,10 +167,10 @@ public class BeanWrapperEnumTests {
GenericBean<?> gb = new GenericBean<>();
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setAutoGrowNestedPaths(true);
assertNull(gb.getStandardEnumMap());
assertThat(gb.getStandardEnumMap()).isNull();
bw.setPropertyValue("standardEnumMap[VALUE_1]", 1);
assertEquals(1, gb.getStandardEnumMap().size());
assertEquals(new Integer(1), gb.getStandardEnumMap().get(CustomEnum.VALUE_1));
assertThat(gb.getStandardEnumMap().size()).isEqualTo(1);
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(new Integer(1));
}
@Test
@@ -180,7 +178,7 @@ public class BeanWrapperEnumTests {
NonPublicEnumHolder holder = new NonPublicEnumHolder();
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("nonPublicEnum", "VALUE_1");
assertEquals(NonPublicEnum.VALUE_1, holder.getNonPublicEnum());
assertThat(holder.getNonPublicEnum()).isEqualTo(NonPublicEnum.VALUE_1);
}

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

@@ -39,9 +39,8 @@ import org.springframework.tests.sample.beans.GenericIntegerBean;
import org.springframework.tests.sample.beans.GenericSetOfIntegerBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* @author Juergen Hoeller
@@ -58,8 +57,8 @@ public class BeanWrapperGenericsTests {
input.add("4");
input.add("5");
bw.setPropertyValue("integerSet", input);
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -71,8 +70,8 @@ public class BeanWrapperGenericsTests {
input.add("4");
input.add("5");
bw.setPropertyValue("numberSet", input);
assertTrue(gb.getNumberSet().contains(new Integer(4)));
assertTrue(gb.getNumberSet().contains(new Integer(5)));
assertThat(gb.getNumberSet().contains(new Integer(4))).isTrue();
assertThat(gb.getNumberSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -94,8 +93,8 @@ public class BeanWrapperGenericsTests {
input.add("http://localhost:8080");
input.add("http://localhost:9090");
bw.setPropertyValue("resourceList", input);
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -104,7 +103,7 @@ public class BeanWrapperGenericsTests {
gb.setResourceList(new ArrayList<>());
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("resourceList[0]", "http://localhost:8080");
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
}
@Test
@@ -115,8 +114,8 @@ public class BeanWrapperGenericsTests {
input.put("4", "5");
input.put("6", "7");
bw.setPropertyValue("shortMap", input);
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -125,8 +124,8 @@ public class BeanWrapperGenericsTests {
gb.setShortMap(new HashMap<>());
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("shortMap[4]", "5");
assertEquals(new Integer(5), bw.getPropertyValue("shortMap[4]"));
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertThat(bw.getPropertyValue("shortMap[4]")).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
}
@Test
@@ -137,8 +136,8 @@ public class BeanWrapperGenericsTests {
input.put("4", "5");
input.put("6", "7");
bw.setPropertyValue("longMap", input);
assertEquals("5", gb.getLongMap().get(new Long("4")));
assertEquals("7", gb.getLongMap().get(new Long("6")));
assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
assertThat(gb.getLongMap().get(new Long("6"))).isEqualTo("7");
}
@Test
@@ -147,8 +146,8 @@ public class BeanWrapperGenericsTests {
gb.setLongMap(new HashMap<Long, Integer>());
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("longMap[4]", "5");
assertEquals("5", gb.getLongMap().get(new Long("4")));
assertEquals("5", bw.getPropertyValue("longMap[4]"));
assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
assertThat(bw.getPropertyValue("longMap[4]")).isEqualTo("5");
}
@Test
@@ -164,8 +163,10 @@ public class BeanWrapperGenericsTests {
value2.add(Boolean.TRUE);
input.put("2", value2);
bw.setPropertyValue("collectionMap", input);
assertTrue(gb.getCollectionMap().get(new Integer(1)) instanceof HashSet);
assertTrue(gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList);
boolean condition1 = gb.getCollectionMap().get(new Integer(1)) instanceof HashSet;
assertThat(condition1).isTrue();
boolean condition = gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList;
assertThat(condition).isTrue();
}
@Test
@@ -177,7 +178,8 @@ public class BeanWrapperGenericsTests {
HashSet<Integer> value1 = new HashSet<>();
value1.add(new Integer(1));
bw.setPropertyValue("collectionMap[1]", value1);
assertTrue(gb.getCollectionMap().get(new Integer(1)) instanceof HashSet);
boolean condition = gb.getCollectionMap().get(new Integer(1)) instanceof HashSet;
assertThat(condition).isTrue();
}
@Test
@@ -188,8 +190,8 @@ public class BeanWrapperGenericsTests {
input.setProperty("4", "5");
input.setProperty("6", "7");
bw.setPropertyValue("shortMap", input);
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -200,8 +202,8 @@ public class BeanWrapperGenericsTests {
gb.setListOfLists(list);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("listOfLists[0][0]", new Integer(5));
assertEquals(new Integer(5), bw.getPropertyValue("listOfLists[0][0]"));
assertEquals(new Integer(5), gb.getListOfLists().get(0).get(0));
assertThat(bw.getPropertyValue("listOfLists[0][0]")).isEqualTo(new Integer(5));
assertThat(gb.getListOfLists().get(0).get(0)).isEqualTo(new Integer(5));
}
@Test
@@ -212,8 +214,8 @@ public class BeanWrapperGenericsTests {
gb.setListOfLists(list);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("listOfLists[0][0]", "5");
assertEquals(new Integer(5), bw.getPropertyValue("listOfLists[0][0]"));
assertEquals(new Integer(5), gb.getListOfLists().get(0).get(0));
assertThat(bw.getPropertyValue("listOfLists[0][0]")).isEqualTo(new Integer(5));
assertThat(gb.getListOfLists().get(0).get(0)).isEqualTo(new Integer(5));
}
@Test
@@ -224,8 +226,8 @@ public class BeanWrapperGenericsTests {
gb.setListOfArrays(list);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("listOfArrays[0][1]", "str3 ");
assertEquals("str3 ", bw.getPropertyValue("listOfArrays[0][1]"));
assertEquals("str3 ", gb.getListOfArrays().get(0)[1]);
assertThat(bw.getPropertyValue("listOfArrays[0][1]")).isEqualTo("str3 ");
assertThat(gb.getListOfArrays().get(0)[1]).isEqualTo("str3 ");
}
@Test
@@ -237,8 +239,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.registerCustomEditor(String.class, new StringTrimmerEditor(false));
bw.setPropertyValue("listOfArrays[0][1]", "str3 ");
assertEquals("str3", bw.getPropertyValue("listOfArrays[0][1]"));
assertEquals("str3", gb.getListOfArrays().get(0)[1]);
assertThat(bw.getPropertyValue("listOfArrays[0][1]")).isEqualTo("str3");
assertThat(gb.getListOfArrays().get(0)[1]).isEqualTo("str3");
}
@Test
@@ -249,8 +251,8 @@ public class BeanWrapperGenericsTests {
gb.setListOfMaps(list);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("listOfMaps[0][10]", new Long(5));
assertEquals(new Long(5), bw.getPropertyValue("listOfMaps[0][10]"));
assertEquals(new Long(5), gb.getListOfMaps().get(0).get(10));
assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
}
@Test
@@ -261,8 +263,8 @@ public class BeanWrapperGenericsTests {
gb.setListOfMaps(list);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("listOfMaps[0][10]", "5");
assertEquals(new Long(5), bw.getPropertyValue("listOfMaps[0][10]"));
assertEquals(new Long(5), gb.getListOfMaps().get(0).get(10));
assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
}
@Test
@@ -273,8 +275,8 @@ public class BeanWrapperGenericsTests {
gb.setMapOfMaps(map);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("mapOfMaps[mykey][10]", new Long(5));
assertEquals(new Long(5), bw.getPropertyValue("mapOfMaps[mykey][10]"));
assertEquals(new Long(5), gb.getMapOfMaps().get("mykey").get(10));
assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
}
@Test
@@ -285,8 +287,8 @@ public class BeanWrapperGenericsTests {
gb.setMapOfMaps(map);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("mapOfMaps[mykey][10]", "5");
assertEquals(new Long(5), bw.getPropertyValue("mapOfMaps[mykey][10]"));
assertEquals(new Long(5), gb.getMapOfMaps().get("mykey").get(10));
assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
}
@Test
@@ -297,8 +299,8 @@ public class BeanWrapperGenericsTests {
gb.setMapOfLists(map);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("mapOfLists[1][0]", new Integer(5));
assertEquals(new Integer(5), bw.getPropertyValue("mapOfLists[1][0]"));
assertEquals(new Integer(5), gb.getMapOfLists().get(new Integer(1)).get(0));
assertThat(bw.getPropertyValue("mapOfLists[1][0]")).isEqualTo(new Integer(5));
assertThat(gb.getMapOfLists().get(new Integer(1)).get(0)).isEqualTo(new Integer(5));
}
@Test
@@ -309,8 +311,8 @@ public class BeanWrapperGenericsTests {
gb.setMapOfLists(map);
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("mapOfLists[1][0]", "5");
assertEquals(new Integer(5), bw.getPropertyValue("mapOfLists[1][0]"));
assertEquals(new Integer(5), gb.getMapOfLists().get(new Integer(1)).get(0));
assertThat(bw.getPropertyValue("mapOfLists[1][0]")).isEqualTo(new Integer(5));
assertThat(gb.getMapOfLists().get(new Integer(1)).get(0)).isEqualTo(new Integer(5));
}
@Test
@@ -323,7 +325,8 @@ public class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfInteger", map);
Object obj = gb.getMapOfInteger().get("testKey");
assertTrue(obj instanceof Integer);
boolean condition = obj instanceof Integer;
assertThat(condition).isTrue();
}
@Test
@@ -337,8 +340,9 @@ public class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfListOfInteger", map);
Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
assertTrue(obj instanceof Integer);
assertEquals(1, ((Integer) obj).intValue());
boolean condition = obj instanceof Integer;
assertThat(condition).isTrue();
assertThat(((Integer) obj).intValue()).isEqualTo(1);
}
@Test
@@ -353,8 +357,9 @@ public class BeanWrapperGenericsTests {
bw.setPropertyValue("listOfMapOfInteger", list);
Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
assertTrue(obj instanceof Integer);
assertEquals(5, ((Integer) obj).intValue());
boolean condition = obj instanceof Integer;
assertThat(condition).isTrue();
assertThat(((Integer) obj).intValue()).isEqualTo(5);
}
@Test
@@ -368,8 +373,9 @@ public class BeanWrapperGenericsTests {
bw.setPropertyValue("mapOfListOfListOfInteger", map);
Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
assertTrue(obj instanceof Integer);
assertEquals(1, ((Integer) obj).intValue());
boolean condition = obj instanceof Integer;
assertThat(condition).isTrue();
assertThat(((Integer) obj).intValue()).isEqualTo(1);
}
@Test
@@ -385,8 +391,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericMap", inputMap);
assertEquals(new Integer(1), holder.getGenericMap().keySet().iterator().next().get(0));
assertEquals(new Long(10), holder.getGenericMap().values().iterator().next().get(0));
assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(new Integer(1));
assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -402,8 +408,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericMap", inputMap);
assertEquals(new Integer(1), holder.getGenericMap().keySet().iterator().next().get(0));
assertEquals(new Long(10), holder.getGenericMap().values().iterator().next().get(0));
assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(new Integer(1));
assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -415,8 +421,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericIndexedMap[1]", inputValue);
assertEquals(new Integer(1), holder.getGenericIndexedMap().keySet().iterator().next());
assertEquals(new Long(10), holder.getGenericIndexedMap().values().iterator().next().get(0));
assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(new Integer(1));
assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -428,8 +434,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("genericIndexedMap[1]", inputValue);
assertEquals(new Integer(1), holder.getGenericIndexedMap().keySet().iterator().next());
assertEquals(new Long(10), holder.getGenericIndexedMap().values().iterator().next().get(0));
assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(new Integer(1));
assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -441,8 +447,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
assertEquals(new Integer(1), holder.getDerivedIndexedMap().keySet().iterator().next());
assertEquals(new Long(10), holder.getDerivedIndexedMap().values().iterator().next().get(0));
assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(new Integer(1));
assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -454,8 +460,8 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(holder);
bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
assertEquals(new Integer(1), holder.getDerivedIndexedMap().keySet().iterator().next());
assertEquals(new Long(10), holder.getDerivedIndexedMap().values().iterator().next().get(0));
assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(new Integer(1));
assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
}
@Test
@@ -464,9 +470,9 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("genericProperty", "10");
bw.setPropertyValue("genericListProperty", new String[] {"20", "30"});
assertEquals(new Integer(10), gb.getGenericProperty());
assertEquals(new Integer(20), gb.getGenericListProperty().get(0));
assertEquals(new Integer(30), gb.getGenericListProperty().get(1));
assertThat(gb.getGenericProperty()).isEqualTo(new Integer(10));
assertThat(gb.getGenericListProperty().get(0)).isEqualTo(new Integer(20));
assertThat(gb.getGenericListProperty().get(1)).isEqualTo(new Integer(30));
}
@Test
@@ -475,9 +481,9 @@ public class BeanWrapperGenericsTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("genericProperty", "10");
bw.setPropertyValue("genericListProperty", new String[] {"20", "30"});
assertEquals(new Integer(10), gb.getGenericProperty().iterator().next());
assertEquals(new Integer(20), gb.getGenericListProperty().get(0).iterator().next());
assertEquals(new Integer(30), gb.getGenericListProperty().get(1).iterator().next());
assertThat(gb.getGenericProperty().iterator().next()).isEqualTo(new Integer(10));
assertThat(gb.getGenericListProperty().get(0).iterator().next()).isEqualTo(new Integer(20));
assertThat(gb.getGenericListProperty().get(1).iterator().next()).isEqualTo(new Integer(30));
}
@Test
@@ -485,7 +491,7 @@ public class BeanWrapperGenericsTests {
Bar bar = new Bar();
BeanWrapper bw = new BeanWrapperImpl(bar);
bw.setPropertyValue("version", "10");
assertEquals(new Double(10.0), bar.getVersion());
assertThat(bar.getVersion()).isEqualTo(new Double(10.0));
}
@Test
@@ -493,7 +499,7 @@ public class BeanWrapperGenericsTests {
Promotion bean = new Promotion();
BeanWrapper bw = new BeanWrapperImpl(bean);
bw.setPropertyValue("id", "10");
assertEquals(new Long(10), bean.getId());
assertThat(bean.getId()).isEqualTo(new Long(10));
}
@Test
@@ -514,10 +520,10 @@ public class BeanWrapperGenericsTests {
Holder<Map<String, Object>> context = new Holder<>(data);
BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(context);
assertEquals("y", bw.getPropertyValue("data['x']"));
assertThat(bw.getPropertyValue("data['x']")).isEqualTo("y");
bw.setPropertyValue("data['message']", "it works!");
assertEquals("it works!", data.get("message"));
assertThat(data.get("message")).isEqualTo("it works!");
}

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

@@ -26,10 +26,6 @@ import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/**
* Specific {@link BeanWrapperImpl} tests.
@@ -54,8 +50,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
GetterBean target = new GetterBean();
BeanWrapper accessor = createAccessor(target);
accessor.setPropertyValue("name", "tom");
assertEquals("tom", target.getAliasedName());
assertEquals("tom", accessor.getPropertyValue("aliasedName"));
assertThat(target.getAliasedName()).isEqualTo("tom");
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
}
@Test
@@ -64,8 +60,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
BeanWrapper accessor = createAccessor(target);
accessor.setExtractOldValueForEditor(true); // This will call the getter
accessor.setPropertyValue("name", "tom");
assertEquals("tom", target.getAliasedName());
assertEquals("tom", accessor.getPropertyValue("aliasedName"));
assertThat(target.getAliasedName()).isEqualTo("tom");
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
}
@Test
@@ -73,8 +69,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
GetterBean target = new GetterBean();
BeanWrapper accessor = createAccessor(target);
accessor.setPropertyValue("aliasedName", "tom");
assertEquals("tom", target.getAliasedName());
assertEquals("tom", accessor.getPropertyValue("aliasedName"));
assertThat(target.getAliasedName()).isEqualTo("tom");
assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
}
@Test
@@ -95,8 +91,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
.getNewValue()).isEqualTo(invalidTouchy);
});
// Test validly set property matches
assertTrue("Valid set property must stick", target.getName().equals(newName));
assertTrue("Invalid set property must retain old value", target.getAge() == 0);
assertThat(target.getName().equals(newName)).as("Valid set property must stick").isTrue();
assertThat(target.getAge() == 0).as("Invalid set property must retain old value").isTrue();
}
@Test
@@ -124,8 +120,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
bw.setPropertyValue("names", "Alef");
}
catch (NotWritablePropertyException ex) {
assertNotNull("Possible matches not determined", ex.getPossibleMatches());
assertEquals("Invalid amount of alternatives", 1, ex.getPossibleMatches().length);
assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(1);
}
}
@@ -137,8 +133,8 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
bw.setPropertyValue("mystring", "Arjen");
}
catch (NotWritablePropertyException ex) {
assertNotNull("Possible matches not determined", ex.getPossibleMatches());
assertEquals("Invalid amount of alternatives", 3, ex.getPossibleMatches().length);
assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(3);
}
}
@@ -147,9 +143,9 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
PropertyTypeMismatch target = new PropertyTypeMismatch();
BeanWrapper accessor = createAccessor(target);
accessor.setPropertyValue("object", "a String");
assertEquals("a String", target.value);
assertTrue(target.getObject() == 8);
assertEquals(8, accessor.getPropertyValue("object"));
assertThat(target.value).isEqualTo("a String");
assertThat(target.getObject() == 8).isTrue();
assertThat(accessor.getPropertyValue("object")).isEqualTo(8);
}
@Test
@@ -159,12 +155,12 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
BeanWrapper accessor = createAccessor(target);
accessor.setPropertyValue("name", "a");
accessor.setPropertyValue("spouse.name", "b");
assertEquals("a", target.getName());
assertEquals("b", target.getSpouse().getName());
assertEquals("a", accessor.getPropertyValue("name"));
assertEquals("b", accessor.getPropertyValue("spouse.name"));
assertEquals(String.class, accessor.getPropertyDescriptor("name").getPropertyType());
assertEquals(String.class, accessor.getPropertyDescriptor("spouse.name").getPropertyType());
assertThat(target.getName()).isEqualTo("a");
assertThat(target.getSpouse().getName()).isEqualTo("b");
assertThat(accessor.getPropertyValue("name")).isEqualTo("a");
assertThat(accessor.getPropertyValue("spouse.name")).isEqualTo("b");
assertThat(accessor.getPropertyDescriptor("name").getPropertyType()).isEqualTo(String.class);
assertThat(accessor.getPropertyDescriptor("spouse.name").getPropertyType()).isEqualTo(String.class);
}
@Test
@@ -175,20 +171,20 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
BeanWrapper accessor = createAccessor(target);
accessor.setPropertyValue("object", tb);
assertSame(tb, target.value);
assertSame(tb, target.getObject().get());
assertSame(tb, ((Optional<String>) accessor.getPropertyValue("object")).get());
assertEquals("x", target.value.getName());
assertEquals("x", target.getObject().get().getName());
assertEquals("x", accessor.getPropertyValue("object.name"));
assertThat(target.value).isSameAs(tb);
assertThat(target.getObject().get()).isSameAs(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object")).get()).isSameAs(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");
assertSame(tb, target.value);
assertSame(tb, target.getObject().get());
assertSame(tb, ((Optional<String>) accessor.getPropertyValue("object")).get());
assertEquals("y", target.value.getName());
assertEquals("y", target.getObject().get().getName());
assertEquals("y", accessor.getPropertyValue("object.name"));
assertThat(target.value).isSameAs(tb);
assertThat(target.getObject().get()).isSameAs(tb);
assertThat(((Optional<TestBean>) accessor.getPropertyValue("object")).get()).isSameAs(tb);
assertThat(target.value.getName()).isEqualTo("y");
assertThat(target.getObject().get().getName()).isEqualTo("y");
assertThat(accessor.getPropertyValue("object.name")).isEqualTo("y");
}
@Test
@@ -198,9 +194,9 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
accessor.setAutoGrowNestedPaths(true);
accessor.setPropertyValue("object.name", "x");
assertEquals("x", target.value.getName());
assertEquals("x", target.getObject().get().getName());
assertEquals("x", accessor.getPropertyValue("object.name"));
assertThat(target.value.getName()).isEqualTo("x");
assertThat(target.getObject().get().getName()).isEqualTo("x");
assertThat(accessor.getPropertyValue("object.name")).isEqualTo("x");
}
@Test

24
spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
View File

@@ -26,8 +26,6 @@ import org.springframework.core.OverridingClassLoader;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Juergen Hoeller
@@ -39,30 +37,30 @@ public class CachedIntrospectionResultsTests {
@Test
public void acceptAndClearClassLoader() throws Exception {
BeanWrapper bw = new BeanWrapperImpl(TestBean.class);
assertTrue(bw.isWritableProperty("name"));
assertTrue(bw.isWritableProperty("age"));
assertTrue(CachedIntrospectionResults.strongClassCache.containsKey(TestBean.class));
assertThat(bw.isWritableProperty("name")).isTrue();
assertThat(bw.isWritableProperty("age")).isTrue();
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(TestBean.class)).isTrue();
ClassLoader child = new OverridingClassLoader(getClass().getClassLoader());
Class<?> tbClass = child.loadClass("org.springframework.tests.sample.beans.TestBean");
assertFalse(CachedIntrospectionResults.strongClassCache.containsKey(tbClass));
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(tbClass)).isFalse();
CachedIntrospectionResults.acceptClassLoader(child);
bw = new BeanWrapperImpl(tbClass);
assertTrue(bw.isWritableProperty("name"));
assertTrue(bw.isWritableProperty("age"));
assertTrue(CachedIntrospectionResults.strongClassCache.containsKey(tbClass));
assertThat(bw.isWritableProperty("name")).isTrue();
assertThat(bw.isWritableProperty("age")).isTrue();
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(tbClass)).isTrue();
CachedIntrospectionResults.clearClassLoader(child);
assertFalse(CachedIntrospectionResults.strongClassCache.containsKey(tbClass));
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(tbClass)).isFalse();
assertTrue(CachedIntrospectionResults.strongClassCache.containsKey(TestBean.class));
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(TestBean.class)).isTrue();
}
@Test
public void clearClassLoaderForSystemClassLoader() throws Exception {
BeanUtils.getPropertyDescriptors(ArrayList.class);
assertTrue(CachedIntrospectionResults.strongClassCache.containsKey(ArrayList.class));
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(ArrayList.class)).isTrue();
CachedIntrospectionResults.clearClassLoader(ArrayList.class.getClassLoader());
assertFalse(CachedIntrospectionResults.strongClassCache.containsKey(ArrayList.class));
assertThat(CachedIntrospectionResults.strongClassCache.containsKey(ArrayList.class)).isFalse();
}
@Test

7
spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
View File

@@ -28,8 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Guillaume Poirier
@@ -83,7 +82,7 @@ public class ConcurrentBeanWrapperTests {
Properties p = (Properties) System.getProperties().clone();
assertTrue("The System properties must not be empty", p.size() != 0);
assertThat(p.size() != 0).as("The System properties must not be empty").isTrue();
for (Iterator<?> i = p.entrySet().iterator(); i.hasNext();) {
i.next();
@@ -104,7 +103,7 @@ public class ConcurrentBeanWrapperTests {
BeanWrapperImpl wrapper = new BeanWrapperImpl(bean);
wrapper.setPropertyValue("properties", value);
assertEquals(p, bean.getProperties());
assertThat(bean.getProperties()).isEqualTo(p);
}

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

@@ -20,7 +20,7 @@ import org.junit.Test;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Specific {@link DirectFieldAccessor} tests.
@@ -48,8 +48,8 @@ public class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
};
DirectFieldAccessor dfa = createAccessor(target);
assertEquals(StringBuilder.class, dfa.getPropertyType("name"));
assertEquals(sb, dfa.getPropertyValue("name"));
assertThat(dfa.getPropertyType("name")).isEqualTo(StringBuilder.class);
assertThat(dfa.getPropertyValue("name")).isEqualTo(sb);
}
}

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

@@ -28,7 +28,6 @@ import org.junit.Test;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
/**
* @author Chris Beams
@@ -323,7 +322,7 @@ public class ExtendedBeanInfoTests {
assertThat(hasReadMethodForProperty(bi, "foo")).isTrue();
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
assertEquals(hasWriteMethodForProperty(bi, "foo"), hasWriteMethodForProperty(ebi, "foo"));
assertThat(hasWriteMethodForProperty(ebi, "foo")).isEqualTo(hasWriteMethodForProperty(bi, "foo"));
}
@Test
@@ -338,7 +337,7 @@ public class ExtendedBeanInfoTests {
assertThat(hasIndexedReadMethodForProperty(bi, "foos")).isTrue();
assertThat(hasIndexedReadMethodForProperty(ebi, "foos")).isTrue();
assertEquals(hasIndexedWriteMethodForProperty(bi, "foos"), hasIndexedWriteMethodForProperty(ebi, "foos"));
assertThat(hasIndexedWriteMethodForProperty(ebi, "foos")).isEqualTo(hasIndexedWriteMethodForProperty(bi, "foos"));
}
/**
@@ -849,10 +848,10 @@ public class ExtendedBeanInfoTests {
// ExtendedBeanInfo needs to behave exactly like BeanInfo...
BeanInfo ebi = new ExtendedBeanInfo(bi);
assertEquals(hasReadMethod, hasReadMethodForProperty(ebi, "address"));
assertEquals(hasWriteMethod, hasWriteMethodForProperty(ebi, "address"));
assertEquals(hasIndexedReadMethod, hasIndexedReadMethodForProperty(ebi, "address"));
assertEquals(hasIndexedWriteMethod, hasIndexedWriteMethodForProperty(ebi, "address"));
assertThat(hasReadMethodForProperty(ebi, "address")).isEqualTo(hasReadMethod);
assertThat(hasWriteMethodForProperty(ebi, "address")).isEqualTo(hasWriteMethod);
assertThat(hasIndexedReadMethodForProperty(ebi, "address")).isEqualTo(hasIndexedReadMethod);
assertThat(hasIndexedWriteMethodForProperty(ebi, "address")).isEqualTo(hasIndexedWriteMethod);
}
@Test

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

@@ -22,9 +22,6 @@ import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Tests for {@link MutablePropertyValues}.
@@ -47,7 +44,7 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
doTestTony(deepCopy);
deepCopy.setPropertyValueAt(new PropertyValue("name", "Gordon"), 0);
doTestTony(pvs);
assertEquals("Gordon", deepCopy.getPropertyValue("name").getValue());
assertThat(deepCopy.getPropertyValue("name").getValue()).isEqualTo("Gordon");
}
@Test
@@ -59,10 +56,10 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
doTestTony(pvs);
PropertyValue addedPv = new PropertyValue("rod", "Rod");
pvs.addPropertyValue(addedPv);
assertTrue(pvs.getPropertyValue("rod").equals(addedPv));
assertThat(pvs.getPropertyValue("rod").equals(addedPv)).isTrue();
PropertyValue changedPv = new PropertyValue("forname", "Greg");
pvs.addPropertyValue(changedPv);
assertTrue(pvs.getPropertyValue("forname").equals(changedPv));
assertThat(pvs.getPropertyValue("forname").equals(changedPv)).isTrue();
}
@Test
@@ -73,7 +70,7 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
pvs.addPropertyValue(new PropertyValue("age", "50"));
MutablePropertyValues pvs2 = pvs;
PropertyValues changes = pvs2.changesSince(pvs);
assertTrue("changes are empty", changes.getPropertyValues().length == 0);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty").isTrue();
}
@Test
@@ -85,29 +82,27 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
MutablePropertyValues pvs2 = new MutablePropertyValues(pvs);
PropertyValues changes = pvs2.changesSince(pvs);
assertTrue("changes are empty, not of length " + changes.getPropertyValues().length,
changes.getPropertyValues().length == 0);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty, not of length " + changes.getPropertyValues().length).isTrue();
pvs2.addPropertyValue(new PropertyValue("forname", "Gordon"));
changes = pvs2.changesSince(pvs);
assertEquals("1 change", 1, changes.getPropertyValues().length);
assertThat(changes.getPropertyValues().length).as("1 change").isEqualTo(1);
PropertyValue fn = changes.getPropertyValue("forname");
assertTrue("change is forname", fn != null);
assertTrue("new value is gordon", fn.getValue().equals("Gordon"));
assertThat(fn != null).as("change is forname").isTrue();
assertThat(fn.getValue().equals("Gordon")).as("new value is gordon").isTrue();
MutablePropertyValues pvs3 = new MutablePropertyValues(pvs);
changes = pvs3.changesSince(pvs);
assertTrue("changes are empty, not of length " + changes.getPropertyValues().length,
changes.getPropertyValues().length == 0);
assertThat(changes.getPropertyValues().length == 0).as("changes are empty, not of length " + changes.getPropertyValues().length).isTrue();
// add new
pvs3.addPropertyValue(new PropertyValue("foo", "bar"));
pvs3.addPropertyValue(new PropertyValue("fi", "fum"));
changes = pvs3.changesSince(pvs);
assertTrue("2 change", changes.getPropertyValues().length == 2);
assertThat(changes.getPropertyValues().length == 2).as("2 change").isTrue();
fn = changes.getPropertyValue("foo");
assertTrue("change in foo", fn != null);
assertTrue("new value is bar", fn.getValue().equals("bar"));
assertThat(fn != null).as("change in foo").isTrue();
assertThat(fn.getValue().equals("bar")).as("new value is bar").isTrue();
}
@Test
@@ -116,19 +111,19 @@ public class MutablePropertyValuesTests extends AbstractPropertyValuesTests {
pvs.add("foo", "bar");
Iterator<PropertyValue> it = pvs.iterator();
assertTrue(it.hasNext());
assertThat(it.hasNext()).isTrue();
PropertyValue pv = it.next();
assertEquals("foo", pv.getName());
assertEquals("bar", pv.getValue());
assertThat(pv.getName()).isEqualTo("foo");
assertThat(pv.getValue()).isEqualTo("bar");
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(it::remove);
assertFalse(it.hasNext());
assertThat(it.hasNext()).isFalse();
}
@Test
public void iteratorIsEmptyForEmptyValues() {
MutablePropertyValues pvs = new MutablePropertyValues();
Iterator<PropertyValue> it = pvs.iterator();
assertFalse(it.hasNext());
assertThat(it.hasNext()).isFalse();
}
@Test

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

@@ -20,8 +20,7 @@ import java.util.Arrays;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -31,15 +30,15 @@ public class PropertyAccessorUtilsTests {
@Test
public void testCanonicalPropertyName() {
assertEquals("map", PropertyAccessorUtils.canonicalPropertyName("map"));
assertEquals("map[key1]", PropertyAccessorUtils.canonicalPropertyName("map[key1]"));
assertEquals("map[key1]", PropertyAccessorUtils.canonicalPropertyName("map['key1']"));
assertEquals("map[key1]", PropertyAccessorUtils.canonicalPropertyName("map[\"key1\"]"));
assertEquals("map[key1][key2]", PropertyAccessorUtils.canonicalPropertyName("map[key1][key2]"));
assertEquals("map[key1][key2]", PropertyAccessorUtils.canonicalPropertyName("map['key1'][\"key2\"]"));
assertEquals("map[key1].name", PropertyAccessorUtils.canonicalPropertyName("map[key1].name"));
assertEquals("map[key1].name", PropertyAccessorUtils.canonicalPropertyName("map['key1'].name"));
assertEquals("map[key1].name", PropertyAccessorUtils.canonicalPropertyName("map[\"key1\"].name"));
assertThat(PropertyAccessorUtils.canonicalPropertyName("map")).isEqualTo("map");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[key1]")).isEqualTo("map[key1]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map['key1']")).isEqualTo("map[key1]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[\"key1\"]")).isEqualTo("map[key1]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[key1][key2]")).isEqualTo("map[key1][key2]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map['key1'][\"key2\"]")).isEqualTo("map[key1][key2]");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[key1].name")).isEqualTo("map[key1].name");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map['key1'].name")).isEqualTo("map[key1].name");
assertThat(PropertyAccessorUtils.canonicalPropertyName("map[\"key1\"].name")).isEqualTo("map[key1].name");
}
@Test
@@ -51,7 +50,7 @@ public class PropertyAccessorUtilsTests {
new String[] {"map", "map[key1]", "map[key1]", "map[key1]", "map[key1][key2]",
"map[key1][key2]", "map[key1].name", "map[key1].name", "map[key1].name"};
assertTrue(Arrays.equals(canonical, PropertyAccessorUtils.canonicalPropertyNames(original)));
assertThat(Arrays.equals(canonical, PropertyAccessorUtils.canonicalPropertyNames(original))).isTrue();
}
}

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

@@ -36,8 +36,7 @@ import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.factory.DummyFactory;
import org.springframework.util.ObjectUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -83,7 +82,7 @@ public class BeanFactoryUtilsTests {
StaticListableBeanFactory lbf = new StaticListableBeanFactory();
lbf.addBean("t1", new TestBean());
lbf.addBean("t2", new TestBean());
assertTrue(BeanFactoryUtils.countBeansIncludingAncestors(lbf) == 2);
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(lbf) == 2).isTrue();
}
/**
@@ -92,27 +91,26 @@ public class BeanFactoryUtilsTests {
@Test
public void testHierarchicalCountBeansWithOverride() throws Exception {
// Leaf count
assertTrue(this.listableBeanFactory.getBeanDefinitionCount() == 1);
assertThat(this.listableBeanFactory.getBeanDefinitionCount() == 1).isTrue();
// Count minus duplicate
assertTrue("Should count 8 beans, not " + BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory),
BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory) == 8);
assertThat(BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory) == 8).as("Should count 8 beans, not " + BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory)).isTrue();
}
@Test
public void testHierarchicalNamesWithNoMatch() throws Exception {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class));
assertEquals(0, names.size());
assertThat(names.size()).isEqualTo(0);
}
@Test
public void testHierarchicalNamesWithMatchOnlyInRoot() throws Exception {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class));
assertEquals(1, names.size());
assertTrue(names.contains("indexedBean"));
assertThat(names.size()).isEqualTo(1);
assertThat(names.contains("indexedBean")).isTrue();
// Distinguish from default ListableBeanFactory behavior
assertTrue(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class).length == 0);
assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class).length == 0).isTrue();
}
@Test
@@ -120,11 +118,11 @@ public class BeanFactoryUtilsTests {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class));
// includes 2 TestBeans from FactoryBeans (DummyFactory definitions)
assertEquals(4, names.size());
assertTrue(names.contains("test"));
assertTrue(names.contains("test3"));
assertTrue(names.contains("testFactory1"));
assertTrue(names.contains("testFactory2"));
assertThat(names.size()).isEqualTo(4);
assertThat(names.contains("test")).isTrue();
assertThat(names.contains("test3")).isTrue();
assertThat(names.contains("testFactory1")).isTrue();
assertThat(names.contains("testFactory2")).isTrue();
}
@Test
@@ -132,7 +130,7 @@ public class BeanFactoryUtilsTests {
StaticListableBeanFactory lbf = new StaticListableBeanFactory();
lbf.addBean("foo", new Object());
Map<String, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false);
assertTrue(beans.isEmpty());
assertThat(beans.isEmpty()).isTrue();
}
@Test
@@ -149,21 +147,22 @@ public class BeanFactoryUtilsTests {
lbf.addBean("t4", t4);
Map<String, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, true);
assertEquals(4, beans.size());
assertEquals(t1, beans.get("t1"));
assertEquals(t2, beans.get("t2"));
assertEquals(t3.getObject(), beans.get("t3"));
assertTrue(beans.get("t4") instanceof TestBean);
assertThat(beans.size()).isEqualTo(4);
assertThat(beans.get("t1")).isEqualTo(t1);
assertThat(beans.get("t2")).isEqualTo(t2);
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
boolean condition = beans.get("t4") instanceof TestBean;
assertThat(condition).isTrue();
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DummyFactory.class, true, true);
assertEquals(2, beans.size());
assertEquals(t3, beans.get("&t3"));
assertEquals(t4, beans.get("&t4"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("&t3")).isEqualTo(t3);
assertThat(beans.get("&t4")).isEqualTo(t4);
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, FactoryBean.class, true, true);
assertEquals(2, beans.size());
assertEquals(t3, beans.get("&t3"));
assertEquals(t4, beans.get("&t4"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("&t3")).isEqualTo(t3);
assertThat(beans.get("&t4")).isEqualTo(t4);
}
@Test
@@ -183,50 +182,53 @@ public class BeanFactoryUtilsTests {
Map<String, ?> beans =
BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
assertEquals(6, beans.size());
assertEquals(test3, beans.get("test3"));
assertEquals(test, beans.get("test"));
assertEquals(t1, beans.get("t1"));
assertEquals(t2, beans.get("t2"));
assertEquals(t3.getObject(), beans.get("t3"));
assertTrue(beans.get("t4") instanceof TestBean);
assertThat(beans.size()).isEqualTo(6);
assertThat(beans.get("test3")).isEqualTo(test3);
assertThat(beans.get("test")).isEqualTo(test);
assertThat(beans.get("t1")).isEqualTo(t1);
assertThat(beans.get("t2")).isEqualTo(t2);
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
boolean condition2 = beans.get("t4") instanceof TestBean;
assertThat(condition2).isTrue();
// t3 and t4 are found here as of Spring 2.0, since they are pre-registered
// singleton instances, while testFactory1 and testFactory are *not* found
// because they are FactoryBean definitions that haven't been initialized yet.
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true);
Object testFactory1 = this.listableBeanFactory.getBean("testFactory1");
assertEquals(5, beans.size());
assertEquals(test, beans.get("test"));
assertEquals(testFactory1, beans.get("testFactory1"));
assertEquals(t1, beans.get("t1"));
assertEquals(t2, beans.get("t2"));
assertEquals(t3.getObject(), beans.get("t3"));
assertThat(beans.size()).isEqualTo(5);
assertThat(beans.get("test")).isEqualTo(test);
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
assertThat(beans.get("t1")).isEqualTo(t1);
assertThat(beans.get("t2")).isEqualTo(t2);
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true);
assertEquals(8, beans.size());
assertEquals(test3, beans.get("test3"));
assertEquals(test, beans.get("test"));
assertEquals(testFactory1, beans.get("testFactory1"));
assertTrue(beans.get("testFactory2") instanceof TestBean);
assertEquals(t1, beans.get("t1"));
assertEquals(t2, beans.get("t2"));
assertEquals(t3.getObject(), beans.get("t3"));
assertTrue(beans.get("t4") instanceof TestBean);
assertThat(beans.size()).isEqualTo(8);
assertThat(beans.get("test3")).isEqualTo(test3);
assertThat(beans.get("test")).isEqualTo(test);
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
boolean condition1 = beans.get("testFactory2") instanceof TestBean;
assertThat(condition1).isTrue();
assertThat(beans.get("t1")).isEqualTo(t1);
assertThat(beans.get("t2")).isEqualTo(t2);
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
boolean condition = beans.get("t4") instanceof TestBean;
assertThat(condition).isTrue();
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true);
assertEquals(4, beans.size());
assertEquals(this.listableBeanFactory.getBean("&testFactory1"), beans.get("&testFactory1"));
assertEquals(this.listableBeanFactory.getBean("&testFactory2"), beans.get("&testFactory2"));
assertEquals(t3, beans.get("&t3"));
assertEquals(t4, beans.get("&t4"));
assertThat(beans.size()).isEqualTo(4);
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
assertThat(beans.get("&t3")).isEqualTo(t3);
assertThat(beans.get("&t4")).isEqualTo(t4);
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true);
assertEquals(4, beans.size());
assertEquals(this.listableBeanFactory.getBean("&testFactory1"), beans.get("&testFactory1"));
assertEquals(this.listableBeanFactory.getBean("&testFactory2"), beans.get("&testFactory2"));
assertEquals(t3, beans.get("&t3"));
assertEquals(t4, beans.get("&t4"));
assertThat(beans.size()).isEqualTo(4);
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
assertThat(beans.get("&t3")).isEqualTo(t3);
assertThat(beans.get("&t4")).isEqualTo(t4);
}
@Test
@@ -236,53 +238,54 @@ public class BeanFactoryUtilsTests {
Map<String, ?> beans =
BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
assertEquals(2, beans.size());
assertEquals(test3, beans.get("test3"));
assertEquals(test, beans.get("test"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("test3")).isEqualTo(test3);
assertThat(beans.get("test")).isEqualTo(test);
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, false);
assertEquals(1, beans.size());
assertEquals(test, beans.get("test"));
assertThat(beans.size()).isEqualTo(1);
assertThat(beans.get("test")).isEqualTo(test);
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true);
Object testFactory1 = this.listableBeanFactory.getBean("testFactory1");
assertEquals(2, beans.size());
assertEquals(test, beans.get("test"));
assertEquals(testFactory1, beans.get("testFactory1"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("test")).isEqualTo(test);
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true);
assertEquals(4, beans.size());
assertEquals(test3, beans.get("test3"));
assertEquals(test, beans.get("test"));
assertEquals(testFactory1, beans.get("testFactory1"));
assertTrue(beans.get("testFactory2") instanceof TestBean);
assertThat(beans.size()).isEqualTo(4);
assertThat(beans.get("test3")).isEqualTo(test3);
assertThat(beans.get("test")).isEqualTo(test);
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
boolean condition = beans.get("testFactory2") instanceof TestBean;
assertThat(condition).isTrue();
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true);
assertEquals(2, beans.size());
assertEquals(this.listableBeanFactory.getBean("&testFactory1"), beans.get("&testFactory1"));
assertEquals(this.listableBeanFactory.getBean("&testFactory2"), beans.get("&testFactory2"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true);
assertEquals(2, beans.size());
assertEquals(this.listableBeanFactory.getBean("&testFactory1"), beans.get("&testFactory1"));
assertEquals(this.listableBeanFactory.getBean("&testFactory2"), beans.get("&testFactory2"));
assertThat(beans.size()).isEqualTo(2);
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
}
@Test
public void testHierarchicalNamesForAnnotationWithNoMatch() throws Exception {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, Override.class));
assertEquals(0, names.size());
assertThat(names.size()).isEqualTo(0);
}
@Test
public void testHierarchicalNamesForAnnotationWithMatchOnlyInRoot() throws Exception {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
assertEquals(1, names.size());
assertTrue(names.contains("annotatedBean"));
assertThat(names.size()).isEqualTo(1);
assertThat(names.contains("annotatedBean")).isTrue();
// Distinguish from default ListableBeanFactory behavior
assertTrue(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class).length == 0);
assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class).length == 0).isTrue();
}
@Test
@@ -291,33 +294,33 @@ public class BeanFactoryUtilsTests {
this.listableBeanFactory.registerSingleton("anotherAnnotatedBean", annotatedBean);
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
assertEquals(2, names.size());
assertTrue(names.contains("annotatedBean"));
assertTrue(names.contains("anotherAnnotatedBean"));
assertThat(names.size()).isEqualTo(2);
assertThat(names.contains("annotatedBean")).isTrue();
assertThat(names.contains("anotherAnnotatedBean")).isTrue();
}
@Test
public void testADependencies() {
String[] deps = this.dependentBeansFactory.getDependentBeans("a");
assertTrue(ObjectUtils.isEmpty(deps));
assertThat(ObjectUtils.isEmpty(deps)).isTrue();
}
@Test
public void testBDependencies() {
String[] deps = this.dependentBeansFactory.getDependentBeans("b");
assertTrue(Arrays.equals(new String[] { "c" }, deps));
assertThat(Arrays.equals(new String[] { "c" }, deps)).isTrue();
}
@Test
public void testCDependencies() {
String[] deps = this.dependentBeansFactory.getDependentBeans("c");
assertTrue(Arrays.equals(new String[] { "int", "long" }, deps));
assertThat(Arrays.equals(new String[] { "int", "long" }, deps)).isTrue();
}
@Test
public void testIntDependencies() {
String[] deps = this.dependentBeansFactory.getDependentBeans("int");
assertTrue(Arrays.equals(new String[] { "buffer" }, deps));
assertThat(Arrays.equals(new String[] { "buffer" }, deps)).isTrue();
}
}

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

@@ -36,7 +36,7 @@ import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -126,8 +126,8 @@ public class ConcurrentBeanFactoryTests {
ConcurrentBean b1 = (ConcurrentBean) factory.getBean("bean1");
ConcurrentBean b2 = (ConcurrentBean) factory.getBean("bean2");
assertEquals(DATE_1, b1.getDate());
assertEquals(DATE_2, b2.getDate());
assertThat(b1.getDate()).isEqualTo(DATE_1);
assertThat(b2.getDate()).isEqualTo(DATE_2);
}

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

File diff suppressed because it is too large Load Diff

7
spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
View File

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.ClassPathResource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
/**
* Written with the intention of reproducing SPR-7318.
@@ -52,13 +51,13 @@ public class FactoryBeanLookupTests {
@Test
public void factoryBeanLookupByType() {
FooFactoryBean fooFactory = beanFactory.getBean(FooFactoryBean.class);
assertNotNull(fooFactory);
assertThat(fooFactory).isNotNull();
}
@Test
public void factoryBeanLookupByTypeAndNameDereference() {
FooFactoryBean fooFactory = beanFactory.getBean("&fooFactory", FooFactoryBean.class);
assertNotNull(fooFactory);
assertThat(fooFactory).isNotNull();
}
@Test
@@ -70,7 +69,7 @@ public class FactoryBeanLookupTests {
@Test
public void factoryBeanObjectLookupByNameAndType() {
Foo foo = beanFactory.getBean("fooFactory", Foo.class);
assertNotNull(foo);
assertThat(foo).isNotNull();
}
}

33
spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
View File

@@ -30,10 +30,7 @@ import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -55,7 +52,7 @@ public class FactoryBeanTests {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(factory).loadBeanDefinitions(RETURNS_NULL_CONTEXT);
assertEquals("null", factory.getBean("factoryBean").toString());
assertThat(factory.getBean("factoryBean").toString()).isEqualTo("null");
}
@Test
@@ -66,17 +63,17 @@ public class FactoryBeanTests {
BeanFactoryPostProcessor ppc = (BeanFactoryPostProcessor) factory.getBean("propertyPlaceholderConfigurer");
ppc.postProcessBeanFactory(factory);
assertNull(factory.getType("betaFactory"));
assertThat(factory.getType("betaFactory")).isNull();
Alpha alpha = (Alpha) factory.getBean("alpha");
Beta beta = (Beta) factory.getBean("beta");
Gamma gamma = (Gamma) factory.getBean("gamma");
Gamma gamma2 = (Gamma) factory.getBean("gammaFactory");
assertSame(beta, alpha.getBeta());
assertSame(gamma, beta.getGamma());
assertSame(gamma2, beta.getGamma());
assertEquals("yourName", beta.getName());
assertThat(alpha.getBeta()).isSameAs(beta);
assertThat(beta.getGamma()).isSameAs(gamma);
assertThat(beta.getGamma()).isSameAs(gamma2);
assertThat(beta.getName()).isEqualTo("yourName");
}
@Test
@@ -90,8 +87,8 @@ public class FactoryBeanTests {
Beta beta = (Beta) factory.getBean("beta");
Alpha alpha = (Alpha) factory.getBean("alpha");
Gamma gamma = (Gamma) factory.getBean("gamma");
assertSame(beta, alpha.getBeta());
assertSame(gamma, beta.getGamma());
assertThat(alpha.getBeta()).isSameAs(beta);
assertThat(beta.getGamma()).isSameAs(gamma);
}
@Test
@@ -117,12 +114,12 @@ public class FactoryBeanTests {
factory.addBeanPostProcessor(counter);
BeanImpl1 impl1 = factory.getBean(BeanImpl1.class);
assertNotNull(impl1);
assertNotNull(impl1.getImpl2());
assertNotNull(impl1.getImpl2());
assertSame(impl1, impl1.getImpl2().getImpl1());
assertEquals(1, counter.getCount("bean1"));
assertEquals(1, counter.getCount("bean2"));
assertThat(impl1).isNotNull();
assertThat(impl1.getImpl2()).isNotNull();
assertThat(impl1.getImpl2()).isNotNull();
assertThat(impl1.getImpl2().getImpl1()).isSameAs(impl1);
assertThat(counter.getCount("bean1")).isEqualTo(1);
assertThat(counter.getCount("bean2")).isEqualTo(1);
}

21
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java
View File

@@ -20,11 +20,8 @@ import org.junit.Test;
import org.springframework.beans.factory.wiring.BeanWiringInfo;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
* @author Rick Evans
@@ -42,32 +39,32 @@ public class AnnotationBeanWiringInfoResolverTests {
public void testResolveWiringInfoWithAnInstanceOfANonAnnotatedClass() {
AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver();
BeanWiringInfo info = resolver.resolveWiringInfo("java.lang.String is not @Configurable");
assertNull("Must be returning null for a non-@Configurable class instance", info);
assertThat(info).as("Must be returning null for a non-@Configurable class instance").isNull();
}
@Test
public void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClass() {
AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver();
BeanWiringInfo info = resolver.resolveWiringInfo(new Soap());
assertNotNull("Must *not* be returning null for a non-@Configurable class instance", info);
assertThat(info).as("Must *not* be returning null for a non-@Configurable class instance").isNotNull();
}
@Test
public void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitly() {
AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver();
BeanWiringInfo info = resolver.resolveWiringInfo(new WirelessSoap());
assertNotNull("Must *not* be returning null for an @Configurable class instance even when autowiring is NO", info);
assertFalse(info.indicatesAutowiring());
assertEquals(WirelessSoap.class.getName(), info.getBeanName());
assertThat(info).as("Must *not* be returning null for an @Configurable class instance even when autowiring is NO").isNotNull();
assertThat(info.indicatesAutowiring()).isFalse();
assertThat(info.getBeanName()).isEqualTo(WirelessSoap.class.getName());
}
@Test
public void testResolveWiringInfoWithAnInstanceOfAnAnnotatedClassWithAutowiringTurnedOffExplicitlyAndCustomBeanName() {
AnnotationBeanWiringInfoResolver resolver = new AnnotationBeanWiringInfoResolver();
BeanWiringInfo info = resolver.resolveWiringInfo(new NamedWirelessSoap());
assertNotNull("Must *not* be returning null for an @Configurable class instance even when autowiring is NO", info);
assertFalse(info.indicatesAutowiring());
assertEquals("DerBigStick", info.getBeanName());
assertThat(info).as("Must *not* be returning null for an @Configurable class instance even when autowiring is NO").isNotNull();
assertThat(info.indicatesAutowiring()).isFalse();
assertThat(info.getBeanName()).isEqualTo("DerBigStick");
}

1345
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

File diff suppressed because it is too large Load Diff

4
spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.AutowireCandidateResolver;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -47,7 +47,7 @@ public class CustomAutowireConfigurerTests {
bf.setAutowireCandidateResolver(customResolver);
cac.postProcessBeanFactory(bf);
TestBean testBean = (TestBean) bf.getBean("testBean");
assertEquals("#1!", testBean.getName());
assertThat(testBean.getName()).isEqualTo("#1!");
}

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

@@ -45,14 +45,8 @@ import org.springframework.tests.sample.beans.NestedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor}
@@ -91,7 +85,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.getBean("testBean");
}
catch (BeanCreationException ex) {
assertTrue(ex.getRootCause() instanceof IllegalStateException);
boolean condition = ex.getRootCause() instanceof IllegalStateException;
assertThat(condition).isTrue();
}
}
@@ -104,12 +99,12 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("testBean", tb);
ResourceInjectionBean bean = (ResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
bean = (ResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
}
@Test
@@ -123,20 +118,20 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("nestedTestBean", ntb);
TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
}
@Test
@@ -151,12 +146,12 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("nestedTestBean", ntb);
TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb2, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb2);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
}
@Test
@@ -172,12 +167,12 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("nestedTestBean", ntb);
TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
}
@Test
@@ -191,20 +186,20 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("nestedTestBean", ntb);
ConstructorResourceInjectionBean bean = (ConstructorResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
bean = (ConstructorResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean());
assertSame(tb, bean.getTestBean2());
assertSame(tb, bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertSame(ntb, bean.getNestedTestBean());
assertSame(bf, bean.getBeanFactory());
assertThat(bean.getTestBean()).isSameAs(tb);
assertThat(bean.getTestBean2()).isSameAs(tb);
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBean()).isSameAs(ntb);
assertThat(bean.getBeanFactory()).isSameAs(bf);
}
@Test
@@ -219,11 +214,11 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("nestedTestBean2", ntb2);
ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean");
assertNull(bean.getTestBean3());
assertSame(tb, bean.getTestBean4());
assertEquals(2, bean.getNestedTestBeans().size());
assertSame(ntb1, bean.getNestedTestBeans().get(0));
assertSame(ntb2, bean.getNestedTestBeans().get(1));
assertThat(bean.getTestBean3()).isNull();
assertThat(bean.getTestBean4()).isSameAs(tb);
assertThat(bean.getNestedTestBeans().size()).isEqualTo(2);
assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb1);
assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb2);
}
@Test
@@ -233,8 +228,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("testBean", tb);
ConstructorsResourceInjectionBean bean = (ConstructorsResourceInjectionBean) bf.getBean("annotatedBean");
assertSame(tb, bean.getTestBean3());
assertNull(bean.getTestBean4());
assertThat(bean.getTestBean3()).isSameAs(tb);
assertThat(bean.getTestBean4()).isNull();
}
@Test
@@ -248,18 +243,18 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("testBean2", tb1);
MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertEquals(2, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
assertTrue(bean.getTestBeanMap().values().contains(tb1));
assertTrue(bean.getTestBeanMap().values().contains(tb2));
assertThat(bean.getTestBeanMap().size()).isEqualTo(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue();
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue();
bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertEquals(2, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
assertTrue(bean.getTestBeanMap().values().contains(tb1));
assertTrue(bean.getTestBeanMap().values().contains(tb2));
assertThat(bean.getTestBeanMap().size()).isEqualTo(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue();
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue();
}
@Test
@@ -273,18 +268,18 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("testBean2", tb1);
MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
assertEquals(2, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
assertTrue(bean.getTestBeanMap().values().contains(tb1));
assertTrue(bean.getTestBeanMap().values().contains(tb2));
assertThat(bean.getTestBeanMap().size()).isEqualTo(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue();
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue();
bean = (MapFieldInjectionBean) bf.getBean("annotatedBean");
assertEquals(2, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
assertTrue(bean.getTestBeanMap().keySet().contains("testBean2"));
assertTrue(bean.getTestBeanMap().values().contains(tb1));
assertTrue(bean.getTestBeanMap().values().contains(tb2));
assertThat(bean.getTestBeanMap().size()).isEqualTo(2);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue();
assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue();
}
@Test
@@ -296,16 +291,16 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerSingleton("testBean", tb);
MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
assertEquals(1, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean"));
assertTrue(bean.getTestBeanMap().values().contains(tb));
assertSame(tb, bean.getTestBean());
assertThat(bean.getTestBeanMap().size()).isEqualTo(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue();
assertThat(bean.getTestBean()).isSameAs(tb);
bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
assertEquals(1, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean"));
assertTrue(bean.getTestBeanMap().values().contains(tb));
assertSame(tb, bean.getTestBean());
assertThat(bean.getTestBeanMap().size()).isEqualTo(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue();
assertThat(bean.getTestBean()).isSameAs(tb);
}
@Test
@@ -327,10 +322,10 @@ public class InjectAnnotationBeanPostProcessorTests {
MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean");
TestBean tb = (TestBean) bf.getBean("testBean1");
assertEquals(1, bean.getTestBeanMap().size());
assertTrue(bean.getTestBeanMap().keySet().contains("testBean1"));
assertTrue(bean.getTestBeanMap().values().contains(tb));
assertSame(tb, bean.getTestBean());
assertThat(bean.getTestBeanMap().size()).isEqualTo(1);
assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue();
assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue();
assertThat(bean.getTestBean()).isSameAs(tb);
}
@Test
@@ -342,7 +337,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
ObjectFactoryQualifierFieldInjectionBean bean = (ObjectFactoryQualifierFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -353,7 +348,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", bd);
ObjectFactoryQualifierFieldInjectionBean bean = (ObjectFactoryQualifierFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -367,10 +362,10 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
ObjectFactoryQualifierFieldInjectionBean bean = (ObjectFactoryQualifierFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
ObjectFactoryQualifierFieldInjectionBean anotherBean = (ObjectFactoryQualifierFieldInjectionBean) bf.getBean("annotatedBean");
assertNotSame(anotherBean, bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean).isNotSameAs(anotherBean);
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -384,10 +379,10 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class));
ObjectFactoryQualifierMethodInjectionBean bean = (ObjectFactoryQualifierMethodInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
ObjectFactoryQualifierMethodInjectionBean anotherBean = (ObjectFactoryQualifierMethodInjectionBean) bf.getBean("annotatedBean");
assertNotSame(anotherBean, bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean).isNotSameAs(anotherBean);
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -397,9 +392,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryFieldInjectionBean bean = (ObjectFactoryFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryFieldInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -409,9 +404,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryMethodInjectionBean bean = (ObjectFactoryMethodInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryMethodInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -421,9 +416,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryListFieldInjectionBean bean = (ObjectFactoryListFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryListFieldInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -433,9 +428,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryListMethodInjectionBean bean = (ObjectFactoryListMethodInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryListMethodInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -445,9 +440,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryMapFieldInjectionBean bean = (ObjectFactoryMapFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryMapFieldInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -457,9 +452,9 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.setSerializationId("test");
ObjectFactoryMapMethodInjectionBean bean = (ObjectFactoryMapMethodInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
bean = (ObjectFactoryMapMethodInjectionBean) SerializationTestUtils.serializeAndDeserialize(bean);
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
/**
@@ -475,10 +470,9 @@ public class InjectAnnotationBeanPostProcessorTests {
final StringFactoryBean factoryBean = (StringFactoryBean) bf.getBean("&stringFactoryBean");
final FactoryBeanDependentBean bean = (FactoryBeanDependentBean) bf.getBean("factoryBeanDependentBean");
assertNotNull("The singleton StringFactoryBean should have been registered.", factoryBean);
assertNotNull("The factoryBeanDependentBean should have been registered.", bean);
assertEquals("The FactoryBeanDependentBean should have been autowired 'by type' with the StringFactoryBean.",
factoryBean, bean.getFactoryBean());
assertThat(factoryBean).as("The singleton StringFactoryBean should have been registered.").isNotNull();
assertThat(bean).as("The factoryBeanDependentBean should have been registered.").isNotNull();
assertThat(bean.getFactoryBean()).as("The FactoryBeanDependentBean should have been autowired 'by type' with the StringFactoryBean.").isEqualTo(factoryBean);
}
@Test
@@ -487,7 +481,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
NullableFieldInjectionBean bean = (NullableFieldInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -495,7 +489,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableFieldInjectionBean.class));
NullableFieldInjectionBean bean = (NullableFieldInjectionBean) bf.getBean("annotatedBean");
assertNull(bean.getTestBean());
assertThat(bean.getTestBean()).isNull();
}
@Test
@@ -504,7 +498,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
NullableMethodInjectionBean bean = (NullableMethodInjectionBean) bf.getBean("annotatedBean");
assertSame(bf.getBean("testBean"), bean.getTestBean());
assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -512,7 +506,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(NullableMethodInjectionBean.class));
NullableMethodInjectionBean bean = (NullableMethodInjectionBean) bf.getBean("annotatedBean");
assertNull(bean.getTestBean());
assertThat(bean.getTestBean()).isNull();
}
@Test
@@ -521,8 +515,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalFieldInjectionBean bean = (OptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get());
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -530,7 +524,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalFieldInjectionBean.class));
OptionalFieldInjectionBean bean = (OptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
@@ -539,8 +533,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalMethodInjectionBean bean = (OptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get());
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -548,7 +542,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalMethodInjectionBean.class));
OptionalMethodInjectionBean bean = (OptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
@@ -557,8 +551,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalListFieldInjectionBean bean = (OptionalListFieldInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get().get(0));
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get().get(0)).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -566,7 +560,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListFieldInjectionBean.class));
OptionalListFieldInjectionBean bean = (OptionalListFieldInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
@@ -575,8 +569,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
OptionalListMethodInjectionBean bean = (OptionalListMethodInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get().get(0));
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get().get(0)).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -584,7 +578,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalListMethodInjectionBean.class));
OptionalListMethodInjectionBean bean = (OptionalListMethodInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
@@ -593,8 +587,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
ProviderOfOptionalFieldInjectionBean bean = (ProviderOfOptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get());
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -602,7 +596,7 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalFieldInjectionBean.class));
ProviderOfOptionalFieldInjectionBean bean = (ProviderOfOptionalFieldInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
@@ -611,8 +605,8 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
ProviderOfOptionalMethodInjectionBean bean = (ProviderOfOptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertTrue(bean.getTestBean().isPresent());
assertSame(bf.getBean("testBean"), bean.getTestBean().get());
assertThat(bean.getTestBean().isPresent()).isTrue();
assertThat(bean.getTestBean().get()).isSameAs(bf.getBean("testBean"));
}
@Test
@@ -620,14 +614,14 @@ public class InjectAnnotationBeanPostProcessorTests {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ProviderOfOptionalMethodInjectionBean.class));
ProviderOfOptionalMethodInjectionBean bean = (ProviderOfOptionalMethodInjectionBean) bf.getBean("annotatedBean");
assertFalse(bean.getTestBean().isPresent());
assertThat(bean.getTestBean().isPresent()).isFalse();
}
@Test
public void testAnnotatedDefaultConstructor() {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(AnnotatedDefaultConstructorBean.class));
assertNotNull(bf.getBean("annotatedBean"));
assertThat(bf.getBean("annotatedBean")).isNotNull();
}

46
spring-beans/src/test/java/org/springframework/beans/factory/annotation/LookupAnnotationTests.java
View File

@@ -23,10 +23,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
/**
* @author Karl Pietrzak
@@ -54,59 +52,59 @@ public class LookupAnnotationTests {
@Test
public void testWithoutConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
Object expected = bean.get();
assertEquals(TestBean.class, expected.getClass());
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}
@Test
public void testWithOverloadedArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.get("haha");
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}
@Test
public void testWithOneConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.getOneArgument("haha");
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}
@Test
public void testWithTwoConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.getTwoArguments("haha", 72);
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertEquals(72, expected.getAge());
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
assertThat(expected.getAge()).isEqualTo(72);
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}
@Test
public void testWithThreeArgsShouldFail() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
assertThatExceptionOfType(AbstractMethodError.class).as("TestBean has no three arg constructor").isThrownBy(() ->
bean.getThreeArguments("name", 1, 2));
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}
@Test
public void testWithEarlyInjection() {
AbstractBean bean = beanFactory.getBean("beanConsumer", BeanConsumer.class).abstractBean;
assertNotNull(bean);
assertThat(bean).isNotNull();
Object expected = bean.get();
assertEquals(TestBean.class, expected.getClass());
assertSame(bean, beanFactory.getBean(BeanConsumer.class).abstractBean);
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
}

16
spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java
View File

@@ -27,10 +27,8 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.config.DependencyDescriptor;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.BDDMockito.given;
@@ -67,7 +65,7 @@ public class ParameterResolutionTests {
@Test
public void annotatedParametersInInnerClassConstructorAreCandidatesForAutowiring() throws Exception {
Class<?> innerClass = AutowirableClass.InnerAutowirableClass.class;
assertTrue(ClassUtils.isInnerClass(innerClass));
assertThat(ClassUtils.isInnerClass(innerClass)).isTrue();
Constructor<?> constructor = innerClass.getConstructor(AutowirableClass.class, String.class, String.class);
assertAutowirableParameters(constructor);
}
@@ -78,8 +76,7 @@ public class ParameterResolutionTests {
Parameter[] parameters = executable.getParameters();
for (int parameterIndex = startIndex; parameterIndex < parameters.length; parameterIndex++) {
Parameter parameter = parameters[parameterIndex];
assertTrue("Parameter " + parameter + " must be autowirable",
ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex));
assertThat(ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex)).as("Parameter " + parameter + " must be autowirable").isTrue();
}
}
@@ -90,8 +87,7 @@ public class ParameterResolutionTests {
Parameter[] parameters = notAutowirableConstructor.getParameters();
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
Parameter parameter = parameters[parameterIndex];
assertFalse("Parameter " + parameter + " must not be autowirable",
ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex));
assertThat(ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex)).as("Parameter " + parameter + " must not be autowirable").isFalse();
}
}
@@ -135,8 +131,8 @@ public class ParameterResolutionTests {
Parameter parameter = parameters[parameterIndex];
DependencyDescriptor intermediateDependencyDescriptor = (DependencyDescriptor) ParameterResolutionDelegate.resolveDependency(
parameter, parameterIndex, AutowirableClass.class, beanFactory);
assertEquals(constructor, intermediateDependencyDescriptor.getAnnotatedElement());
assertEquals(parameter, intermediateDependencyDescriptor.getMethodParameter().getParameter());
assertThat(intermediateDependencyDescriptor.getAnnotatedElement()).isEqualTo(constructor);
assertThat(intermediateDependencyDescriptor.getMethodParameter().getParameter()).isEqualTo(parameter);
}
}

10
spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
View File

@@ -32,8 +32,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
/**
* @author Rob Harrop
@@ -92,8 +92,8 @@ public class RequiredAnnotationBeanPostProcessorTests {
factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
factory.preInstantiateSingletons();
RequiredTestBean bean = (RequiredTestBean) factory.getBean("testBean");
assertEquals(24, bean.getAge());
assertEquals("Blue", bean.getFavouriteColour());
assertThat(bean.getAge()).isEqualTo(24);
assertThat(bean.getFavouriteColour()).isEqualTo("Blue");
}
@Test
@@ -146,8 +146,8 @@ public class RequiredAnnotationBeanPostProcessorTests {
factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
factory.preInstantiateSingletons();
RequiredTestBean bean = (RequiredTestBean) factory.getBean("testBean");
assertEquals(24, bean.getAge());
assertEquals("Blue", bean.getFavouriteColour());
assertThat(bean.getAge()).isEqualTo(24);
assertThat(bean.getFavouriteColour()).isEqualTo("Blue");
}
@Test

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

@@ -35,8 +35,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -71,9 +70,9 @@ public class CustomEditorConfigurerTests {
bf.registerBeanDefinition("tb2", bd2);
TestBean tb1 = (TestBean) bf.getBean("tb1");
assertEquals(df.parse("2.12.1975"), tb1.getDate());
assertThat(tb1.getDate()).isEqualTo(df.parse("2.12.1975"));
TestBean tb2 = (TestBean) bf.getBean("tb2");
assertEquals(df.parse("2.12.1975"), tb2.getSomeMap().get("myKey"));
assertThat(tb2.getSomeMap().get("myKey")).isEqualTo(df.parse("2.12.1975"));
}
@Test
@@ -93,7 +92,7 @@ public class CustomEditorConfigurerTests {
TestBean tb = (TestBean) bf.getBean("tb");
DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN);
assertEquals(df.parse("2.12.1975"), tb.getDate());
assertThat(tb.getDate()).isEqualTo(df.parse("2.12.1975"));
}
@Test
@@ -112,8 +111,8 @@ public class CustomEditorConfigurerTests {
bf.registerBeanDefinition("tb", bd);
TestBean tb = (TestBean) bf.getBean("tb");
assertTrue(tb.getStringArray() != null && tb.getStringArray().length == 1);
assertEquals("test", tb.getStringArray()[0]);
assertThat(tb.getStringArray() != null && tb.getStringArray().length == 1).isTrue();
assertThat(tb.getStringArray()[0]).isEqualTo("test");
}

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

@@ -23,9 +23,9 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
/**
@@ -66,7 +66,8 @@ public class CustomScopeConfigurerTests {
CustomScopeConfigurer figurer = new CustomScopeConfigurer();
figurer.setScopes(scopes);
figurer.postProcessBeanFactory(factory);
assertTrue(factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope);
boolean condition = factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope;
assertThat(condition).isTrue();
}
@Test
@@ -76,7 +77,8 @@ public class CustomScopeConfigurerTests {
CustomScopeConfigurer figurer = new CustomScopeConfigurer();
figurer.setScopes(scopes);
figurer.postProcessBeanFactory(factory);
assertTrue(factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope);
boolean condition = factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope;
assertThat(condition).isTrue();
}
@Test

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

@@ -21,7 +21,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Arjen Poutsma
@@ -43,8 +43,8 @@ public class DeprecatedBeanWarnerTests {
DeprecatedBeanWarner warner = new MyDeprecatedBeanWarner();
warner.postProcessBeanFactory(beanFactory);
assertEquals(beanName, this.beanName);
assertEquals(def, this.beanDefinition);
assertThat(this.beanName).isEqualTo(beanName);
assertThat(this.beanDefinition).isEqualTo(def);
}

18
spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -41,7 +41,7 @@ public class FieldRetrievingFactoryBeanTests {
FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
fr.setStaticField("java.sql.Connection.TRANSACTION_SERIALIZABLE");
fr.afterPropertiesSet();
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), fr.getObject());
assertThat(fr.getObject()).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
}
@Test
@@ -49,7 +49,7 @@ public class FieldRetrievingFactoryBeanTests {
FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
fr.setStaticField(" java.sql.Connection.TRANSACTION_SERIALIZABLE ");
fr.afterPropertiesSet();
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), fr.getObject());
assertThat(fr.getObject()).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
}
@Test
@@ -58,7 +58,7 @@ public class FieldRetrievingFactoryBeanTests {
fr.setTargetClass(Connection.class);
fr.setTargetField("TRANSACTION_SERIALIZABLE");
fr.afterPropertiesSet();
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), fr.getObject());
assertThat(fr.getObject()).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
}
@Test
@@ -68,7 +68,7 @@ public class FieldRetrievingFactoryBeanTests {
fr.setTargetObject(target);
fr.setTargetField("publicField");
fr.afterPropertiesSet();
assertEquals(target.publicField, fr.getObject());
assertThat(fr.getObject()).isEqualTo(target.publicField);
}
@Test
@@ -76,7 +76,7 @@ public class FieldRetrievingFactoryBeanTests {
FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
fr.setBeanName("java.sql.Connection.TRANSACTION_SERIALIZABLE");
fr.afterPropertiesSet();
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), fr.getObject());
assertThat(fr.getObject()).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
}
@Test
@@ -117,7 +117,7 @@ public class FieldRetrievingFactoryBeanTests {
FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
fr.setBeanName("org.springframework.tests.sample.beans.PackageLevelVisibleBean.CONSTANT");
fr.afterPropertiesSet();
assertEquals("Wuby", fr.getObject());
assertThat(fr.getObject()).isEqualTo("Wuby");
}
@Test
@@ -127,8 +127,8 @@ public class FieldRetrievingFactoryBeanTests {
qualifiedResource(FieldRetrievingFactoryBeanTests.class, "context.xml"));
TestBean testBean = (TestBean) bf.getBean("testBean");
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), testBean.getSomeIntegerArray()[0]);
assertEquals(new Integer(Connection.TRANSACTION_SERIALIZABLE), testBean.getSomeIntegerArray()[1]);
assertThat(testBean.getSomeIntegerArray()[0]).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
assertThat(testBean.getSomeIntegerArray()[1]).isEqualTo(new Integer(Connection.TRANSACTION_SERIALIZABLE));
}

30
spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
View File

@@ -26,12 +26,9 @@ import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.beans.support.ArgumentConvertingMethodInvoker;
import org.springframework.util.MethodInvoker;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for {@link MethodInvokingFactoryBean} and {@link MethodInvokingBean}.
@@ -45,7 +42,6 @@ public class MethodInvokingFactoryBeanTests {
@Test
public void testParameterValidation() throws Exception {
String validationError = "improper validation of input properties";
// assert that only static OR non static are set, but not both or none
MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean();
@@ -102,14 +98,14 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetObject(tc1);
mcfb.setTargetMethod("method1");
mcfb.afterPropertiesSet();
assertTrue(int.class.equals(mcfb.getObjectType()));
assertThat(int.class.equals(mcfb.getObjectType())).isTrue();
mcfb = new MethodInvokingFactoryBean();
mcfb.setTargetClass(TestClass1.class);
mcfb.setTargetMethod("voidRetvalMethod");
mcfb.afterPropertiesSet();
Class<?> objType = mcfb.getObjectType();
assertSame(objType, void.class);
assertThat(void.class).isSameAs(objType);
// verify that we can call a method with args that are subtypes of the
// target method arg types
@@ -139,9 +135,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetMethod("method1");
mcfb.afterPropertiesSet();
Integer i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
// non-singleton, non-static
tc1 = new TestClass1();
@@ -151,9 +147,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setSingleton(false);
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertEquals(2, i.intValue());
assertThat(i.intValue()).isEqualTo(2);
// singleton, static
TestClass1._staticField1 = 0;
@@ -162,9 +158,9 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetMethod("staticMethod1");
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
// non-singleton, static
TestClass1._staticField1 = 0;
@@ -173,16 +169,16 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setSingleton(false);
mcfb.afterPropertiesSet();
i = (Integer) mcfb.getObject();
assertEquals(1, i.intValue());
assertThat(i.intValue()).isEqualTo(1);
i = (Integer) mcfb.getObject();
assertEquals(2, i.intValue());
assertThat(i.intValue()).isEqualTo(2);
// void return value
mcfb = new MethodInvokingFactoryBean();
mcfb.setTargetClass(TestClass1.class);
mcfb.setTargetMethod("voidRetvalMethod");
mcfb.afterPropertiesSet();
assertNull(mcfb.getObject());
assertThat(mcfb.getObject()).isNull();
// now see if we can match methods with arguments that have supertype arguments
mcfb = new MethodInvokingFactoryBean();
@@ -216,7 +212,7 @@ public class MethodInvokingFactoryBeanTests {
mcfb.setTargetMethod("supertypes2");
mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello", "bogus");
mcfb.afterPropertiesSet();
assertEquals("hello", mcfb.getObject());
assertThat(mcfb.getObject()).isEqualTo("hello");
mcfb = new MethodInvokingFactoryBean();
mcfb.setTargetClass(TestClass1.class);

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

@@ -29,10 +29,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.util.SerializationTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
@@ -69,7 +67,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) objectFactory.getObject();
Date date2 = (Date) objectFactory.getObject();
assertTrue(date1 != date2);
assertThat(date1 != date2).isTrue();
}
@Test
@@ -82,7 +80,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) objectFactory.getObject();
Date date2 = (Date) objectFactory.getObject();
assertTrue(date1 != date2);
assertThat(date1 != date2).isTrue();
}
@Test
@@ -92,7 +90,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) provider.get();
Date date2 = (Date) provider.get();
assertTrue(date1 != date2);
assertThat(date1 != date2).isTrue();
}
@Test
@@ -105,7 +103,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
Date date1 = (Date) provider.get();
Date date2 = (Date) provider.get();
assertTrue(date1 != date2);
assertThat(date1 != date2).isTrue();
}
@Test
@@ -122,7 +120,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
factory.afterPropertiesSet();
ObjectFactory<?> objectFactory = factory.getObject();
Object actualSingleton = objectFactory.getObject();
assertSame(expectedSingleton, actualSingleton);
assertThat(actualSingleton).isSameAs(expectedSingleton);
}
@Test
@@ -152,8 +150,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
@Test
public void testEnsureOFBFBReportsThatItActuallyCreatesObjectFactoryInstances() {
assertEquals("Must be reporting that it creates ObjectFactory instances (as per class contract).",
ObjectFactory.class, new ObjectFactoryCreatingFactoryBean().getObjectType());
assertThat(new ObjectFactoryCreatingFactoryBean().getObjectType()).as("Must be reporting that it creates ObjectFactory instances (as per class contract).").isEqualTo(ObjectFactory.class);
}

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

@@ -22,8 +22,7 @@ import org.junit.Test;
import org.springframework.core.io.Resource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -45,7 +44,7 @@ public class PropertiesFactoryBeanTests {
pfb.setLocation(TEST_PROPS);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
}
@Test
@@ -54,7 +53,7 @@ public class PropertiesFactoryBeanTests {
pfb.setLocation(TEST_PROPS_XML);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
}
@Test
@@ -65,7 +64,7 @@ public class PropertiesFactoryBeanTests {
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("value2", props.getProperty("key2"));
assertThat(props.getProperty("key2")).isEqualTo("value2");
}
@Test
@@ -78,8 +77,8 @@ public class PropertiesFactoryBeanTests {
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(props.getProperty("key2")).isEqualTo("value2");
}
@Test
@@ -103,12 +102,12 @@ public class PropertiesFactoryBeanTests {
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
assertEquals("framework", props.getProperty("spring"));
assertEquals("Mattingly", props.getProperty("Don"));
assertEquals("man", props.getProperty("spider"));
assertEquals("man", props.getProperty("bat"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(props.getProperty("key2")).isEqualTo("value2");
assertThat(props.getProperty("spring")).isEqualTo("framework");
assertThat(props.getProperty("Don")).isEqualTo("Mattingly");
assertThat(props.getProperty("spider")).isEqualTo("man");
assertThat(props.getProperty("bat")).isEqualTo("man");
}
@Test
@@ -122,8 +121,8 @@ public class PropertiesFactoryBeanTests {
pfb.setLocalOverride(true);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("0", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("0");
assertThat(props.getProperty("key2")).isEqualTo("value2");
}
@Test
@@ -136,12 +135,12 @@ public class PropertiesFactoryBeanTests {
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
assertThat(props.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(props.getProperty("key2")).isEqualTo("value2");
Properties newProps = pfb.getObject();
assertTrue(props != newProps);
assertEquals("99", newProps.getProperty("tb.array[0].age"));
assertEquals("value2", newProps.getProperty("key2"));
assertThat(props != newProps).isTrue();
assertThat(newProps.getProperty("tb.array[0].age")).isEqualTo("99");
assertThat(newProps.getProperty("key2")).isEqualTo("value2");
}
}

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

@@ -24,10 +24,7 @@ import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -46,43 +43,47 @@ public class PropertyPathFactoryBeanTests {
public void testPropertyPathFactoryBeanWithSingletonResult() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
assertEquals(new Integer(12), xbf.getBean("propertyPath1"));
assertEquals(new Integer(11), xbf.getBean("propertyPath2"));
assertEquals(new Integer(10), xbf.getBean("tb.age"));
assertEquals(ITestBean.class, xbf.getType("otb.spouse"));
assertThat(xbf.getBean("propertyPath1")).isEqualTo(new Integer(12));
assertThat(xbf.getBean("propertyPath2")).isEqualTo(new Integer(11));
assertThat(xbf.getBean("tb.age")).isEqualTo(new Integer(10));
assertThat(xbf.getType("otb.spouse")).isEqualTo(ITestBean.class);
Object result1 = xbf.getBean("otb.spouse");
Object result2 = xbf.getBean("otb.spouse");
assertTrue(result1 instanceof TestBean);
assertTrue(result1 == result2);
assertEquals(99, ((TestBean) result1).getAge());
boolean condition = result1 instanceof TestBean;
assertThat(condition).isTrue();
assertThat(result1 == result2).isTrue();
assertThat(((TestBean) result1).getAge()).isEqualTo(99);
}
@Test
public void testPropertyPathFactoryBeanWithPrototypeResult() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
assertNull(xbf.getType("tb.spouse"));
assertEquals(TestBean.class, xbf.getType("propertyPath3"));
assertThat(xbf.getType("tb.spouse")).isNull();
assertThat(xbf.getType("propertyPath3")).isEqualTo(TestBean.class);
Object result1 = xbf.getBean("tb.spouse");
Object result2 = xbf.getBean("propertyPath3");
Object result3 = xbf.getBean("propertyPath3");
assertTrue(result1 instanceof TestBean);
assertTrue(result2 instanceof TestBean);
assertTrue(result3 instanceof TestBean);
assertEquals(11, ((TestBean) result1).getAge());
assertEquals(11, ((TestBean) result2).getAge());
assertEquals(11, ((TestBean) result3).getAge());
assertTrue(result1 != result2);
assertTrue(result1 != result3);
assertTrue(result2 != result3);
boolean condition2 = result1 instanceof TestBean;
assertThat(condition2).isTrue();
boolean condition1 = result2 instanceof TestBean;
assertThat(condition1).isTrue();
boolean condition = result3 instanceof TestBean;
assertThat(condition).isTrue();
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();
}
@Test
public void testPropertyPathFactoryBeanWithNullResult() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
assertNull(xbf.getType("tb.spouse.spouse"));
assertEquals("null", xbf.getBean("tb.spouse.spouse").toString());
assertThat(xbf.getType("tb.spouse.spouse")).isNull();
assertThat(xbf.getBean("tb.spouse.spouse").toString()).isEqualTo("null");
}
@Test
@@ -91,23 +92,24 @@ public class PropertyPathFactoryBeanTests {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
TestBean spouse = (TestBean) xbf.getBean("otb.spouse");
TestBean tbWithInner = (TestBean) xbf.getBean("tbWithInner");
assertSame(spouse, tbWithInner.getSpouse());
assertTrue(!tbWithInner.getFriends().isEmpty());
assertSame(spouse, tbWithInner.getFriends().iterator().next());
assertThat(tbWithInner.getSpouse()).isSameAs(spouse);
boolean condition = !tbWithInner.getFriends().isEmpty();
assertThat(condition).isTrue();
assertThat(tbWithInner.getFriends().iterator().next()).isSameAs(spouse);
}
@Test
public void testPropertyPathFactoryBeanAsNullReference() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
assertNull(xbf.getBean("tbWithNullReference", TestBean.class).getSpouse());
assertThat(xbf.getBean("tbWithNullReference", TestBean.class).getSpouse()).isNull();
}
@Test
public void testPropertyPathFactoryBeanAsInnerNull() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
assertNull(xbf.getBean("tbWithInnerNull", TestBean.class).getSpouse());
assertThat(xbf.getBean("tbWithInnerNull", TestBean.class).getSpouse()).isNull();
}
}

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

@@ -44,12 +44,8 @@ import org.springframework.tests.sample.beans.IndexedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
@@ -113,10 +109,10 @@ public class PropertyResourceConfigurerTests {
TestBean tb1 = (TestBean) factory.getBean("tb1");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertEquals(99, tb1.getAge());
assertEquals(99, tb2.getAge());
assertEquals(null, tb1.getName());
assertEquals("test", tb2.getName());
assertThat(tb1.getAge()).isEqualTo(99);
assertThat(tb2.getAge()).isEqualTo(99);
assertThat(tb1.getName()).isEqualTo(null);
assertThat(tb2.getName()).isEqualTo("test");
}
@Test
@@ -133,8 +129,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getAge()).isEqualTo(99);
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("test");
}
@Test
@@ -152,8 +148,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("my.tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getAge()).isEqualTo(99);
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("test");
}
@Test
@@ -170,8 +166,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals("99", tb.getMap().get("key1"));
assertEquals("test", tb.getMap().get("key2.ext"));
assertThat(tb.getMap().get("key1")).isEqualTo("99");
assertThat(tb.getMap().get("key2.ext")).isEqualTo("test");
}
@Test
@@ -187,7 +183,7 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
PropertiesHolder tb = (PropertiesHolder) factory.getBean("tb");
assertEquals("true", tb.getHeldProperties().getProperty("mail.smtp.auth"));
assertThat(tb.getHeldProperties().getProperty("mail.smtp.auth")).isEqualTo("true");
}
@Test
@@ -200,8 +196,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getAge()).isEqualTo(99);
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("test");
}
@Test
@@ -215,8 +211,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getAge()).isEqualTo(99);
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("test");
}
@Test
@@ -229,8 +225,8 @@ public class PropertyResourceConfigurerTests {
poc.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals(99, tb.getArray()[0].getAge());
assertEquals("test", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getAge()).isEqualTo(99);
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("test");
}
@Test
@@ -246,8 +242,8 @@ public class PropertyResourceConfigurerTests {
bfpp.postProcessBeanFactory(factory);
IndexedTestBean tb = (IndexedTestBean) factory.getBean("tb");
assertEquals("X99", tb.getArray()[0].getName());
assertEquals("Xtest", ((TestBean) tb.getList().get(1)).getName());
assertThat(tb.getArray()[0].getName()).isEqualTo("X99");
assertThat(((TestBean) tb.getList().get(1)).getName()).isEqualTo("Xtest");
}
@Test
@@ -265,7 +261,7 @@ public class PropertyResourceConfigurerTests {
props.setProperty("tb3.name", "test");
poc.setProperties(props);
poc.postProcessBeanFactory(factory);
assertEquals("test", factory.getBean("tb2", TestBean.class).getName());
assertThat(factory.getBean("tb2", TestBean.class).getName()).isEqualTo("test");
}
{
PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
@@ -280,7 +276,7 @@ public class PropertyResourceConfigurerTests {
}
catch (BeanInitializationException ex) {
// prove that the processor chokes on the invalid key
assertTrue(ex.getMessage().toLowerCase().contains("argh"));
assertThat(ex.getMessage().toLowerCase().contains("argh")).isTrue();
}
}
}
@@ -312,10 +308,10 @@ public class PropertyResourceConfigurerTests {
TestBean tb1 = (TestBean) factory.getBean("tb1");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertEquals(99, tb1.getAge());
assertEquals(99, tb2.getAge());
assertEquals(null, tb1.getName());
assertEquals("test", tb2.getName());
assertThat(tb1.getAge()).isEqualTo(99);
assertThat(tb2.getAge()).isEqualTo(99);
assertThat(tb1.getName()).isEqualTo(null);
assertThat(tb2.getName()).isEqualTo("test");
}
@Test
@@ -402,36 +398,36 @@ public class PropertyResourceConfigurerTests {
TestBean tb1 = (TestBean) factory.getBean("tb1");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertEquals(98, tb1.getAge());
assertEquals(98, tb2.getAge());
assertEquals("namemyvarmyvar${", tb1.getName());
assertEquals("myvarname98", tb2.getName());
assertEquals(tb2, tb1.getSpouse());
assertEquals(1, tb1.getSomeMap().size());
assertEquals("myValue", tb1.getSomeMap().get("myKey"));
assertEquals(2, tb2.getStringArray().length);
assertEquals(System.getProperty("os.name"), tb2.getStringArray()[0]);
assertEquals("98", tb2.getStringArray()[1]);
assertEquals(2, tb2.getFriends().size());
assertEquals("na98me", tb2.getFriends().iterator().next());
assertEquals(tb2, tb2.getFriends().toArray()[1]);
assertEquals(3, tb2.getSomeSet().size());
assertTrue(tb2.getSomeSet().contains("na98me"));
assertTrue(tb2.getSomeSet().contains(tb2));
assertTrue(tb2.getSomeSet().contains(new Integer(98)));
assertEquals(6, tb2.getSomeMap().size());
assertEquals("98", tb2.getSomeMap().get("key98"));
assertEquals(tb2, tb2.getSomeMap().get("key98ref"));
assertEquals(tb2, tb2.getSomeMap().get("key1"));
assertEquals("98name", tb2.getSomeMap().get("key2"));
assertThat(tb1.getAge()).isEqualTo(98);
assertThat(tb2.getAge()).isEqualTo(98);
assertThat(tb1.getName()).isEqualTo("namemyvarmyvar${");
assertThat(tb2.getName()).isEqualTo("myvarname98");
assertThat(tb1.getSpouse()).isEqualTo(tb2);
assertThat(tb1.getSomeMap().size()).isEqualTo(1);
assertThat(tb1.getSomeMap().get("myKey")).isEqualTo("myValue");
assertThat(tb2.getStringArray().length).isEqualTo(2);
assertThat(tb2.getStringArray()[0]).isEqualTo(System.getProperty("os.name"));
assertThat(tb2.getStringArray()[1]).isEqualTo("98");
assertThat(tb2.getFriends().size()).isEqualTo(2);
assertThat(tb2.getFriends().iterator().next()).isEqualTo("na98me");
assertThat(tb2.getFriends().toArray()[1]).isEqualTo(tb2);
assertThat(tb2.getSomeSet().size()).isEqualTo(3);
assertThat(tb2.getSomeSet().contains("na98me")).isTrue();
assertThat(tb2.getSomeSet().contains(tb2)).isTrue();
assertThat(tb2.getSomeSet().contains(new Integer(98))).isTrue();
assertThat(tb2.getSomeMap().size()).isEqualTo(6);
assertThat(tb2.getSomeMap().get("key98")).isEqualTo("98");
assertThat(tb2.getSomeMap().get("key98ref")).isEqualTo(tb2);
assertThat(tb2.getSomeMap().get("key1")).isEqualTo(tb2);
assertThat(tb2.getSomeMap().get("key2")).isEqualTo("98name");
TestBean inner1 = (TestBean) tb2.getSomeMap().get("key3");
TestBean inner2 = (TestBean) tb2.getSomeMap().get("mykey4");
assertEquals(0, inner1.getAge());
assertEquals(null, inner1.getName());
assertEquals(System.getProperty("os.name"), inner1.getCountry());
assertEquals(98, inner2.getAge());
assertEquals("namemyvarmyvar${", inner2.getName());
assertEquals(System.getProperty("os.name"), inner2.getCountry());
assertThat(inner1.getAge()).isEqualTo(0);
assertThat(inner1.getName()).isEqualTo(null);
assertThat(inner1.getCountry()).isEqualTo(System.getProperty("os.name"));
assertThat(inner2.getAge()).isEqualTo(98);
assertThat(inner2.getName()).isEqualTo("namemyvarmyvar${");
assertThat(inner2.getCountry()).isEqualTo(System.getProperty("os.name"));
}
@Test
@@ -443,7 +439,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals(System.getProperty("os.name"), tb.getCountry());
assertThat(tb.getCountry()).isEqualTo(System.getProperty("os.name"));
}
@Test
@@ -458,7 +454,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myos", tb.getCountry());
assertThat(tb.getCountry()).isEqualTo("myos");
}
@Test
@@ -474,7 +470,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals(System.getProperty("os.name"), tb.getCountry());
assertThat(tb.getCountry()).isEqualTo(System.getProperty("os.name"));
}
@Test
@@ -508,7 +504,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("${ref}", tb.getName());
assertThat(tb.getName()).isEqualTo("${ref}");
}
@Test
@@ -521,7 +517,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertNull(tb.getName());
assertThat(tb.getName()).isNull();
}
@Test
@@ -537,7 +533,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertNull(tb.getName());
assertThat(tb.getName()).isNull();
}
@Test
@@ -553,7 +549,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myname", tb.getName());
assertThat(tb.getName()).isEqualTo("myname");
}
@Test
@@ -569,7 +565,7 @@ public class PropertyResourceConfigurerTests {
TestBean tb = (TestBean) factory.getBean("tb");
TestBean tb2 = (TestBean) factory.getBean("tb2");
assertSame(tb, tb2);
assertThat(tb2).isSameAs(tb);
}
@Test
@@ -584,8 +580,8 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertNotNull(tb);
assertEquals(0, factory.getAliases("tb").length);
assertThat(tb).isNotNull();
assertThat(factory.getAliases("tb").length).isEqualTo(0);
}
@Test
@@ -617,7 +613,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("mytest", tb.getTouchy());
assertThat(tb.getTouchy()).isEqualTo("mytest");
}
@Test
@@ -629,7 +625,7 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("mytest", tb.getTouchy());
assertThat(tb.getTouchy()).isEqualTo("mytest");
}
@Test
@@ -649,11 +645,11 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("mytest", tb.getTouchy());
assertThat(tb.getTouchy()).isEqualTo("mytest");
tb = (TestBean) factory.getBean("alias");
assertEquals("mytest", tb.getTouchy());
assertThat(tb.getTouchy()).isEqualTo("mytest");
tb = (TestBean) factory.getBean("alias2");
assertEquals("mytest", tb.getTouchy());
assertThat(tb.getTouchy()).isEqualTo("mytest");
}
@Test
@@ -675,9 +671,9 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myNameValue", tb.getName());
assertEquals(99, tb.getAge());
assertEquals("myOtherTouchyValue", tb.getTouchy());
assertThat(tb.getName()).isEqualTo("myNameValue");
assertThat(tb.getAge()).isEqualTo(99);
assertThat(tb.getTouchy()).isEqualTo("myOtherTouchyValue");
Preferences.userRoot().remove("myTouchy");
Preferences.systemRoot().remove("myTouchy");
Preferences.systemRoot().remove("myName");
@@ -704,9 +700,9 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myNameValue", tb.getName());
assertEquals(99, tb.getAge());
assertEquals("myOtherTouchyValue", tb.getTouchy());
assertThat(tb.getName()).isEqualTo("myNameValue");
assertThat(tb.getAge()).isEqualTo(99);
assertThat(tb.getTouchy()).isEqualTo("myOtherTouchyValue");
Preferences.userRoot().node("myUserPath").remove("myTouchy");
Preferences.systemRoot().node("mySystemPath").remove("myTouchy");
Preferences.systemRoot().node("mySystemPath").remove("myName");
@@ -733,9 +729,9 @@ public class PropertyResourceConfigurerTests {
ppc.postProcessBeanFactory(factory);
TestBean tb = (TestBean) factory.getBean("tb");
assertEquals("myNameValue", tb.getName());
assertEquals(99, tb.getAge());
assertEquals("myOtherTouchyValue", tb.getTouchy());
assertThat(tb.getName()).isEqualTo("myNameValue");
assertThat(tb.getAge()).isEqualTo(99);
assertThat(tb.getTouchy()).isEqualTo("myOtherTouchyValue");
Preferences.userRoot().node("myUserPath/myotherpath").remove("myTouchy");
Preferences.systemRoot().node("mySystemPath/myotherpath").remove("myTouchy");
Preferences.systemRoot().node("mySystemPath/mypath").remove("myName");

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

@@ -27,12 +27,9 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.NestedCheckedException;
import org.springframework.core.NestedRuntimeException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
@@ -62,7 +59,7 @@ public class ServiceLocatorFactoryBeanTests {
TestServiceLocator factory = (TestServiceLocator) bf.getBean("factory");
TestService testService = factory.getTestService();
assertNotNull(testService);
assertThat(testService).isNotNull();
}
@Test
@@ -161,14 +158,14 @@ public class ServiceLocatorFactoryBeanTests {
TestService testBean2 = factory.getTestService("testService");
TestService testBean3 = factory.getTestService(1);
TestService testBean4 = factory.someFactoryMethod();
assertNotSame(testBean1, testBean2);
assertNotSame(testBean1, testBean3);
assertNotSame(testBean1, testBean4);
assertNotSame(testBean2, testBean3);
assertNotSame(testBean2, testBean4);
assertNotSame(testBean3, testBean4);
assertThat(testBean2).isNotSameAs(testBean1);
assertThat(testBean3).isNotSameAs(testBean1);
assertThat(testBean4).isNotSameAs(testBean1);
assertThat(testBean3).isNotSameAs(testBean2);
assertThat(testBean4).isNotSameAs(testBean2);
assertThat(testBean4).isNotSameAs(testBean3);
assertTrue(factory.toString().contains("TestServiceLocator3"));
assertThat(factory.toString().contains("TestServiceLocator3")).isTrue();
}
@Ignore @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory
@@ -195,16 +192,20 @@ public class ServiceLocatorFactoryBeanTests {
TestService testBean2 = factory.getTestService("testService1");
TestService testBean3 = factory.getTestService(1);
TestService testBean4 = factory.getTestService(2);
assertNotSame(testBean1, testBean2);
assertNotSame(testBean1, testBean3);
assertNotSame(testBean1, testBean4);
assertNotSame(testBean2, testBean3);
assertNotSame(testBean2, testBean4);
assertNotSame(testBean3, testBean4);
assertFalse(testBean1 instanceof ExtendedTestService);
assertFalse(testBean2 instanceof ExtendedTestService);
assertFalse(testBean3 instanceof ExtendedTestService);
assertTrue(testBean4 instanceof ExtendedTestService);
assertThat(testBean2).isNotSameAs(testBean1);
assertThat(testBean3).isNotSameAs(testBean1);
assertThat(testBean4).isNotSameAs(testBean1);
assertThat(testBean3).isNotSameAs(testBean2);
assertThat(testBean4).isNotSameAs(testBean2);
assertThat(testBean4).isNotSameAs(testBean3);
boolean condition3 = testBean1 instanceof ExtendedTestService;
assertThat(condition3).isFalse();
boolean condition2 = testBean2 instanceof ExtendedTestService;
assertThat(condition2).isFalse();
boolean condition1 = testBean3 instanceof ExtendedTestService;
assertThat(condition1).isFalse();
boolean condition = testBean4 instanceof ExtendedTestService;
assertThat(condition).isTrue();
}
@Test

14
spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
View File

@@ -27,9 +27,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -65,9 +63,9 @@ public class SimpleScopeTests {
beanFactory.registerScope("myScope", scope);
String[] scopeNames = beanFactory.getRegisteredScopeNames();
assertEquals(1, scopeNames.length);
assertEquals("myScope", scopeNames[0]);
assertSame(scope, beanFactory.getRegisteredScope("myScope"));
assertThat(scopeNames.length).isEqualTo(1);
assertThat(scopeNames[0]).isEqualTo("myScope");
assertThat(beanFactory.getRegisteredScope("myScope")).isSameAs(scope);
new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
qualifiedResource(SimpleScopeTests.class, "context.xml"));
@@ -78,9 +76,9 @@ public class SimpleScopeTests {
public void testCanGetScopedObject() {
TestBean tb1 = (TestBean) beanFactory.getBean("usesScope");
TestBean tb2 = (TestBean) beanFactory.getBean("usesScope");
assertNotSame(tb1, tb2);
assertThat(tb2).isNotSameAs(tb1);
TestBean tb3 = (TestBean) beanFactory.getBean("usesScope");
assertSame(tb3, tb1);
assertThat(tb1).isSameAs(tb3);
}
}

35
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java
View File

@@ -28,10 +28,9 @@ import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.FileSystemResource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* Tests for {@link YamlMapFactoryBean}.
@@ -48,7 +47,7 @@ public class YamlMapFactoryBeanTests {
public void testSetIgnoreResourceNotFound() {
this.factory.setResolutionMethod(YamlMapFactoryBean.ResolutionMethod.OVERRIDE_AND_IGNORE);
this.factory.setResources(new FileSystemResource("non-exsitent-file.yml"));
assertEquals(0, this.factory.getObject().size());
assertThat(this.factory.getObject().size()).isEqualTo(0);
}
@Test
@@ -62,7 +61,7 @@ public class YamlMapFactoryBeanTests {
@Test
public void testGetObject() {
this.factory.setResources(new ByteArrayResource("foo: bar".getBytes()));
assertEquals(1, this.factory.getObject().size());
assertThat(this.factory.getObject().size()).isEqualTo(1);
}
@SuppressWarnings("unchecked")
@@ -71,8 +70,8 @@ public class YamlMapFactoryBeanTests {
this.factory.setResources(new ByteArrayResource("foo:\n bar: spam".getBytes()),
new ByteArrayResource("foo:\n spam: bar".getBytes()));
assertEquals(1, this.factory.getObject().size());
assertEquals(2, ((Map<String, Object>) this.factory.getObject().get("foo")).size());
assertThat(this.factory.getObject().size()).isEqualTo(1);
assertThat(((Map<String, Object>) this.factory.getObject().get("foo")).size()).isEqualTo(2);
}
@Test
@@ -89,7 +88,7 @@ public class YamlMapFactoryBeanTests {
}
}, new ByteArrayResource("foo:\n spam: bar".getBytes()));
assertEquals(1, this.factory.getObject().size());
assertThat(this.factory.getObject().size()).isEqualTo(1);
}
@Test
@@ -97,14 +96,15 @@ public class YamlMapFactoryBeanTests {
this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : value".getBytes()));
Map<String, Object> map = this.factory.getObject();
assertEquals(1, map.size());
assertTrue(map.containsKey("foo"));
assertThat(map.size()).isEqualTo(1);
assertThat(map.containsKey("foo")).isTrue();
Object object = map.get("foo");
assertTrue(object instanceof LinkedHashMap);
boolean condition = object instanceof LinkedHashMap;
assertThat(condition).isTrue();
@SuppressWarnings("unchecked")
Map<String, Object> sub = (Map<String, Object>) object;
assertTrue(sub.containsKey("key1.key2"));
assertEquals("value", sub.get("key1.key2"));
assertThat(sub.containsKey("key1.key2")).isTrue();
assertThat(sub.get("key1.key2")).isEqualTo("value");
}
@Test
@@ -112,14 +112,15 @@ public class YamlMapFactoryBeanTests {
this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : 3".getBytes()));
Map<String, Object> map = this.factory.getObject();
assertEquals(1, map.size());
assertTrue(map.containsKey("foo"));
assertThat(map.size()).isEqualTo(1);
assertThat(map.containsKey("foo")).isTrue();
Object object = map.get("foo");
assertTrue(object instanceof LinkedHashMap);
boolean condition = object instanceof LinkedHashMap;
assertThat(condition).isTrue();
@SuppressWarnings("unchecked")
Map<String, Object> sub = (Map<String, Object>) object;
assertEquals(1, sub.size());
assertEquals(Integer.valueOf(3), sub.get("key1.key2"));
assertThat(sub.size()).isEqualTo(1);
assertThat(sub.get("key1.key2")).isEqualTo(Integer.valueOf(3));
}
@Test

48
spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java
View File

@@ -25,9 +25,8 @@ import org.yaml.snakeyaml.scanner.ScannerException;
import org.springframework.core.io.ByteArrayResource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
* Tests for {@link YamlProcessor}.
@@ -44,22 +43,22 @@ public class YamlProcessorTests {
public void arrayConvertedToIndexedBeanReference() {
this.processor.setResources(new ByteArrayResource("foo: bar\nbar: [1,2,3]".getBytes()));
this.processor.process((properties, map) -> {
assertEquals(4, properties.size());
assertEquals("bar", properties.get("foo"));
assertEquals("bar", properties.getProperty("foo"));
assertEquals(1, properties.get("bar[0]"));
assertEquals("1", properties.getProperty("bar[0]"));
assertEquals(2, properties.get("bar[1]"));
assertEquals("2", properties.getProperty("bar[1]"));
assertEquals(3, properties.get("bar[2]"));
assertEquals("3", properties.getProperty("bar[2]"));
assertThat(properties.size()).isEqualTo(4);
assertThat(properties.get("foo")).isEqualTo("bar");
assertThat(properties.getProperty("foo")).isEqualTo("bar");
assertThat(properties.get("bar[0]")).isEqualTo(1);
assertThat(properties.getProperty("bar[0]")).isEqualTo("1");
assertThat(properties.get("bar[1]")).isEqualTo(2);
assertThat(properties.getProperty("bar[1]")).isEqualTo("2");
assertThat(properties.get("bar[2]")).isEqualTo(3);
assertThat(properties.getProperty("bar[2]")).isEqualTo("3");
});
}
@Test
public void testStringResource() {
this.processor.setResources(new ByteArrayResource("foo # a document that is a literal".getBytes()));
this.processor.process((properties, map) -> assertEquals("foo", map.get("document")));
this.processor.process((properties, map) -> assertThat(map.get("document")).isEqualTo("foo"));
}
@Test
@@ -82,8 +81,8 @@ public class YamlProcessorTests {
public void mapConvertedToIndexedBeanReference() {
this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes()));
this.processor.process((properties, map) -> {
assertEquals("bucket", properties.get("bar.spam"));
assertEquals(2, properties.size());
assertThat(properties.get("bar.spam")).isEqualTo("bucket");
assertThat(properties.size()).isEqualTo(2);
});
}
@@ -91,8 +90,8 @@ public class YamlProcessorTests {
public void integerKeyBehaves() {
this.processor.setResources(new ByteArrayResource("foo: bar\n1: bar".getBytes()));
this.processor.process((properties, map) -> {
assertEquals("bar", properties.get("[1]"));
assertEquals(2, properties.size());
assertThat(properties.get("[1]")).isEqualTo("bar");
assertThat(properties.size()).isEqualTo(2);
});
}
@@ -100,8 +99,8 @@ public class YamlProcessorTests {
public void integerDeepKeyBehaves() {
this.processor.setResources(new ByteArrayResource("foo:\n 1: bar".getBytes()));
this.processor.process((properties, map) -> {
assertEquals("bar", properties.get("foo[1]"));
assertEquals(1, properties.size());
assertThat(properties.get("foo[1]")).isEqualTo("bar");
assertThat(properties.size()).isEqualTo(1);
});
}
@@ -110,14 +109,15 @@ public class YamlProcessorTests {
public void flattenedMapIsSameAsPropertiesButOrdered() {
this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes()));
this.processor.process((properties, map) -> {
assertEquals("bucket", properties.get("bar.spam"));
assertEquals(2, properties.size());
assertThat(properties.get("bar.spam")).isEqualTo("bucket");
assertThat(properties.size()).isEqualTo(2);
Map<String, Object> flattenedMap = processor.getFlattenedMap(map);
assertEquals("bucket", flattenedMap.get("bar.spam"));
assertEquals(2, flattenedMap.size());
assertTrue(flattenedMap instanceof LinkedHashMap);
assertThat(flattenedMap.get("bar.spam")).isEqualTo("bucket");
assertThat(flattenedMap.size()).isEqualTo(2);
boolean condition = flattenedMap instanceof LinkedHashMap;
assertThat(condition).isTrue();
Map<String, Object> bar = (Map<String, Object>) map.get("bar");
assertEquals("bucket", bar.get("spam"));
assertThat(bar.get("spam")).isEqualTo("bucket");
});
}

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

@@ -26,8 +26,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.tests.TestResourceUtils.qualifiedResource;
/**
@@ -56,10 +55,10 @@ public class CustomProblemReporterTests {
@Test
public void testErrorsAreCollated() {
this.reader.loadBeanDefinitions(qualifiedResource(CustomProblemReporterTests.class, "context.xml"));
assertEquals("Incorrect number of errors collated", 4, this.problemReporter.getErrors().length);
assertThat(this.problemReporter.getErrors().length).as("Incorrect number of errors collated").isEqualTo(4);
TestBean bean = (TestBean) this.beanFactory.getBean("validBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
}

6
spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.beans.factory.parsing;
import org.junit.Test;
import static org.junit.Assert.assertNull;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rick Evans
@@ -30,13 +30,13 @@ public class NullSourceExtractorTests {
public void testPassThroughContract() throws Exception {
Object source = new Object();
Object extractedSource = new NullSourceExtractor().extractSource(source, null);
assertNull("The contract of NullSourceExtractor states that the extraction *always* return null", extractedSource);
assertThat(extractedSource).as("The contract of NullSourceExtractor states that the extraction *always* return null").isNull();
}
@Test
public void testPassThroughContractEvenWithNull() throws Exception {
Object extractedSource = new NullSourceExtractor().extractSource(null, null);
assertNull("The contract of NullSourceExtractor states that the extraction *always* return null", extractedSource);
assertThat(extractedSource).as("The contract of NullSourceExtractor states that the extraction *always* return null").isNull();
}
}

19
spring-beans/src/test/java/org/springframework/beans/factory/parsing/ParseStateTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.beans.factory.parsing;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -34,9 +33,9 @@ public class ParseStateTests {
ParseState parseState = new ParseState();
parseState.push(entry);
assertEquals("Incorrect peek value.", entry, parseState.peek());
assertThat(parseState.peek()).as("Incorrect peek value.").isEqualTo(entry);
parseState.pop();
assertNull("Should get null on peek()", parseState.peek());
assertThat(parseState.peek()).as("Should get null on peek()").isNull();
}
@Test
@@ -47,16 +46,16 @@ public class ParseStateTests {
ParseState parseState = new ParseState();
parseState.push(one);
assertEquals(one, parseState.peek());
assertThat(parseState.peek()).isEqualTo(one);
parseState.push(two);
assertEquals(two, parseState.peek());
assertThat(parseState.peek()).isEqualTo(two);
parseState.push(three);
assertEquals(three, parseState.peek());
assertThat(parseState.peek()).isEqualTo(three);
parseState.pop();
assertEquals(two, parseState.peek());
assertThat(parseState.peek()).isEqualTo(two);
parseState.pop();
assertEquals(one, parseState.peek());
assertThat(parseState.peek()).isEqualTo(one);
}
@Test
@@ -68,7 +67,7 @@ public class ParseStateTests {
ParseState snapshot = original.snapshot();
original.push(new MockEntry());
assertEquals("Snapshot should not have been modified.", entry, snapshot.peek());
assertThat(snapshot.peek()).as("Snapshot should not have been modified.").isEqualTo(entry);
}

11
spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
View File

@@ -18,8 +18,7 @@ package org.springframework.beans.factory.parsing;
import org.junit.Test;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for {@link PassThroughSourceExtractor}.
@@ -33,15 +32,15 @@ public class PassThroughSourceExtractorTests {
public void testPassThroughContract() throws Exception {
Object source = new Object();
Object extractedSource = new PassThroughSourceExtractor().extractSource(source, null);
assertSame("The contract of PassThroughSourceExtractor states that the supplied " +
"source object *must* be returned as-is", source, extractedSource);
assertThat(extractedSource).as("The contract of PassThroughSourceExtractor states that the supplied " +
"source object *must* be returned as-is").isSameAs(source);
}
@Test
public void testPassThroughContractEvenWithNull() throws Exception {
Object extractedSource = new PassThroughSourceExtractor().extractSource(null, null);
assertNull("The contract of PassThroughSourceExtractor states that the supplied " +
"source object *must* be returned as-is (even if null)", extractedSource);
assertThat(extractedSource).as("The contract of PassThroughSourceExtractor states that the supplied " +
"source object *must* be returned as-is (even if null)").isNull();
}
}

11
spring-beans/src/test/java/org/springframework/beans/factory/serviceloader/ServiceLoaderTests.java
View File

@@ -25,7 +25,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assume.assumeTrue;
/**
@@ -43,7 +43,8 @@ public class ServiceLoaderTests {
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());
bf.registerBeanDefinition("service", bd);
ServiceLoader<?> serviceLoader = (ServiceLoader<?>) bf.getBean("service");
assertTrue(serviceLoader.iterator().next() instanceof DocumentBuilderFactory);
boolean condition = serviceLoader.iterator().next() instanceof DocumentBuilderFactory;
assertThat(condition).isTrue();
}
@Test
@@ -54,7 +55,8 @@ public class ServiceLoaderTests {
RootBeanDefinition bd = new RootBeanDefinition(ServiceFactoryBean.class);
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());
bf.registerBeanDefinition("service", bd);
assertTrue(bf.getBean("service") instanceof DocumentBuilderFactory);
boolean condition = bf.getBean("service") instanceof DocumentBuilderFactory;
assertThat(condition).isTrue();
}
@Test
@@ -66,7 +68,8 @@ public class ServiceLoaderTests {
bd.getPropertyValues().add("serviceType", DocumentBuilderFactory.class.getName());
bf.registerBeanDefinition("service", bd);
List<?> serviceList = (List<?>) bf.getBean("service");
assertTrue(serviceList.get(0) instanceof DocumentBuilderFactory);
boolean condition = serviceList.get(0) instanceof DocumentBuilderFactory;
assertThat(condition).isTrue();
}
}

35
spring-beans/src/test/java/org/springframework/beans/factory/support/AutowireUtilsTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Test;
import org.springframework.util.ReflectionUtils;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for {@link AutowireUtils}.
@@ -38,45 +38,36 @@ public class AutowireUtilsTests {
@Test
public void genericMethodReturnTypes() {
Method notParameterized = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterized");
assertEquals(String.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterized, new Object[0], getClass().getClassLoader()));
Object actual = AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterized, new Object[0], getClass().getClassLoader());
assertThat(actual).isEqualTo(String.class);
Method notParameterizedWithArguments = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterizedWithArguments", Integer.class, Boolean.class);
assertEquals(String.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterizedWithArguments, new Object[] {99, true}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterizedWithArguments, new Object[]{99, true}, getClass().getClassLoader())).isEqualTo(String.class);
Method createProxy = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createProxy", Object.class);
assertEquals(String.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createProxy, new Object[] {"foo"}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createProxy, new Object[]{"foo"}, getClass().getClassLoader())).isEqualTo(String.class);
Method createNamedProxyWithDifferentTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy", String.class, Object.class);
assertEquals(Long.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDifferentTypes, new Object[] {"enigma", 99L}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDifferentTypes, new Object[]{"enigma", 99L}, getClass().getClassLoader())).isEqualTo(Long.class);
Method createNamedProxyWithDuplicateTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy", String.class, Object.class);
assertEquals(String.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDuplicateTypes, new Object[] {"enigma", "foo"}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDuplicateTypes, new Object[]{"enigma", "foo"}, getClass().getClassLoader())).isEqualTo(String.class);
Method createMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createMock", Class.class);
assertEquals(Runnable.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] {Runnable.class}, getClass().getClassLoader()));
assertEquals(Runnable.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] {Runnable.class.getName()}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[]{Runnable.class}, getClass().getClassLoader())).isEqualTo(Runnable.class);
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[]{Runnable.class.getName()}, getClass().getClassLoader())).isEqualTo(Runnable.class);
Method createNamedMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedMock", String.class, Class.class);
assertEquals(Runnable.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedMock, new Object[] {"foo", Runnable.class}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedMock, new Object[]{"foo", Runnable.class}, getClass().getClassLoader())).isEqualTo(Runnable.class);
Method createVMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createVMock", Object.class, Class.class);
assertEquals(Runnable.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(createVMock, new Object[] {"foo", Runnable.class}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(createVMock, new Object[]{"foo", Runnable.class}, getClass().getClassLoader())).isEqualTo(Runnable.class);
// Ideally we would expect String.class instead of Object.class, but
// resolveReturnTypeForFactoryMethod() does not currently support this form of
// look-up.
Method extractValueFrom = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractValueFrom", MyInterfaceType.class);
assertEquals(Object.class,
AutowireUtils.resolveReturnTypeForFactoryMethod(extractValueFrom, new Object[] {new MySimpleInterfaceType()}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(extractValueFrom, new Object[]{new MySimpleInterfaceType()}, getClass().getClassLoader())).isEqualTo(Object.class);
// Ideally we would expect Boolean.class instead of Object.class, but this
// information is not available at run-time due to type erasure.
@@ -84,7 +75,7 @@ public class AutowireUtilsTests {
map.put(0, false);
map.put(1, true);
Method extractMagicValue = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractMagicValue", Map.class);
assertEquals(Object.class, AutowireUtils.resolveReturnTypeForFactoryMethod(extractMagicValue, new Object[] {map}, getClass().getClassLoader()));
assertThat(AutowireUtils.resolveReturnTypeForFactoryMethod(extractMagicValue, new Object[]{map}, getClass().getClassLoader())).isEqualTo(Object.class);
}

28
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
View File

@@ -23,9 +23,7 @@ import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rod Johnson
@@ -44,36 +42,36 @@ public class BeanDefinitionBuilderTests {
}
RootBeanDefinition rbd = (RootBeanDefinition) bdb.getBeanDefinition();
assertFalse(rbd.isSingleton());
assertEquals(TestBean.class, rbd.getBeanClass());
assertTrue("Depends on was added", Arrays.equals(dependsOn, rbd.getDependsOn()));
assertTrue(rbd.getPropertyValues().contains("age"));
assertThat(rbd.isSingleton()).isFalse();
assertThat(rbd.getBeanClass()).isEqualTo(TestBean.class);
assertThat(Arrays.equals(dependsOn, rbd.getDependsOn())).as("Depends on was added").isTrue();
assertThat(rbd.getPropertyValues().contains("age")).isTrue();
}
@Test
public void beanClassWithFactoryMethod() {
BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition(TestBean.class, "create");
RootBeanDefinition rbd = (RootBeanDefinition) bdb.getBeanDefinition();
assertTrue(rbd.hasBeanClass());
assertEquals(TestBean.class, rbd.getBeanClass());
assertEquals("create", rbd.getFactoryMethodName());
assertThat(rbd.hasBeanClass()).isTrue();
assertThat(rbd.getBeanClass()).isEqualTo(TestBean.class);
assertThat(rbd.getFactoryMethodName()).isEqualTo("create");
}
@Test
public void beanClassName() {
BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition(TestBean.class.getName());
RootBeanDefinition rbd = (RootBeanDefinition) bdb.getBeanDefinition();
assertFalse(rbd.hasBeanClass());
assertEquals(TestBean.class.getName(), rbd.getBeanClassName());
assertThat(rbd.hasBeanClass()).isFalse();
assertThat(rbd.getBeanClassName()).isEqualTo(TestBean.class.getName());
}
@Test
public void beanClassNameWithFactoryMethod() {
BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition(TestBean.class.getName(), "create");
RootBeanDefinition rbd = (RootBeanDefinition) bdb.getBeanDefinition();
assertFalse(rbd.hasBeanClass());
assertEquals(TestBean.class.getName(), rbd.getBeanClassName());
assertEquals("create", rbd.getFactoryMethodName());
assertThat(rbd.hasBeanClass()).isFalse();
assertThat(rbd.getBeanClassName()).isEqualTo(TestBean.class.getName());
assertThat(rbd.getFactoryMethodName()).isEqualTo("create");
}
}

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

@@ -21,8 +21,7 @@ import org.junit.Test;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -36,14 +35,16 @@ public class BeanDefinitionTests {
bd.setLazyInit(true);
bd.setScope("request");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition1 = !bd.equals(otherBd);
assertThat(condition1).isTrue();
boolean condition = !otherBd.equals(bd);
assertThat(condition).isTrue();
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");
assertTrue(bd.equals(otherBd));
assertTrue(otherBd.equals(bd));
assertTrue(bd.hashCode() == otherBd.hashCode());
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
}
@Test
@@ -53,15 +54,19 @@ public class BeanDefinitionTests {
bd.getPropertyValues().add("age", "99");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getPropertyValues().add("name", "myName");
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition3 = !bd.equals(otherBd);
assertThat(condition3).isTrue();
boolean condition2 = !otherBd.equals(bd);
assertThat(condition2).isTrue();
otherBd.getPropertyValues().add("age", "11");
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition1 = !bd.equals(otherBd);
assertThat(condition1).isTrue();
boolean condition = !otherBd.equals(bd);
assertThat(condition).isTrue();
otherBd.getPropertyValues().add("age", "99");
assertTrue(bd.equals(otherBd));
assertTrue(otherBd.equals(bd));
assertTrue(bd.hashCode() == otherBd.hashCode());
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
}
@Test
@@ -71,15 +76,19 @@ public class BeanDefinitionTests {
bd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(5));
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test");
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition3 = !bd.equals(otherBd);
assertThat(condition3).isTrue();
boolean condition2 = !otherBd.equals(bd);
assertThat(condition2).isTrue();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(9));
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition1 = !bd.equals(otherBd);
assertThat(condition1).isTrue();
boolean condition = !otherBd.equals(bd);
assertThat(condition).isTrue();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(5));
assertTrue(bd.equals(otherBd));
assertTrue(otherBd.equals(bd));
assertTrue(bd.hashCode() == otherBd.hashCode());
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
}
@Test
@@ -90,15 +99,19 @@ public class BeanDefinitionTests {
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test", "int");
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(5));
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition3 = !bd.equals(otherBd);
assertThat(condition3).isTrue();
boolean condition2 = !otherBd.equals(bd);
assertThat(condition2).isTrue();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(5), "int");
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition1 = !bd.equals(otherBd);
assertThat(condition1).isTrue();
boolean condition = !otherBd.equals(bd);
assertThat(condition).isTrue();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, new Integer(5), "long");
assertTrue(bd.equals(otherBd));
assertTrue(otherBd.equals(bd));
assertTrue(bd.hashCode() == otherBd.hashCode());
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd.hashCode() == otherBd.hashCode()).isTrue();
}
@Test
@@ -109,15 +122,17 @@ public class BeanDefinitionTests {
bd.setScope("request");
BeanDefinitionHolder holder = new BeanDefinitionHolder(bd, "bd");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertTrue(!bd.equals(otherBd));
assertTrue(!otherBd.equals(bd));
boolean condition1 = !bd.equals(otherBd);
assertThat(condition1).isTrue();
boolean condition = !otherBd.equals(bd);
assertThat(condition).isTrue();
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");
BeanDefinitionHolder otherHolder = new BeanDefinitionHolder(bd, "bd");
assertTrue(holder.equals(otherHolder));
assertTrue(otherHolder.equals(holder));
assertTrue(holder.hashCode() == otherHolder.hashCode());
assertThat(holder.equals(otherHolder)).isTrue();
assertThat(otherHolder.equals(holder)).isTrue();
assertThat(holder.hashCode() == otherHolder.hashCode()).isTrue();
}
@Test
@@ -134,13 +149,13 @@ public class BeanDefinitionTests {
RootBeanDefinition mergedBd = new RootBeanDefinition(bd);
mergedBd.overrideFrom(childBd);
assertEquals(2, mergedBd.getConstructorArgumentValues().getArgumentCount());
assertEquals(2, mergedBd.getPropertyValues().size());
assertEquals(bd, mergedBd);
assertThat(mergedBd.getConstructorArgumentValues().getArgumentCount()).isEqualTo(2);
assertThat(mergedBd.getPropertyValues().size()).isEqualTo(2);
assertThat(mergedBd).isEqualTo(bd);
mergedBd.getConstructorArgumentValues().getArgumentValue(1, null).setValue(new Integer(9));
assertEquals(new Integer(5), bd.getConstructorArgumentValues().getArgumentValue(1, null).getValue());
assertEquals(getClass(), bd.getQualifiedElement());
assertThat(bd.getConstructorArgumentValues().getArgumentValue(1, null).getValue()).isEqualTo(new Integer(5));
assertThat(bd.getQualifiedElement()).isEqualTo(getClass());
}
}

363
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
View File

@@ -56,13 +56,8 @@ import org.springframework.tests.sample.beans.GenericIntegerBean;
import org.springframework.tests.sample.beans.GenericSetOfIntegerBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/**
* @author Juergen Hoeller
@@ -85,8 +80,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -102,8 +97,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -117,8 +112,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericIntegerBean gb = (GenericIntegerBean) bf.getBean("genericBean");
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -148,7 +143,7 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertNull(gb.getResourceList());
assertThat(gb.getResourceList()).isNull();
}
@Test
@@ -164,8 +159,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -175,11 +170,11 @@ public class BeanFactoryGenericsTests {
new ClassPathResource("genericBeanTests.xml", getClass()));
GenericBean<?> gb = (GenericBean<?>) bf.getBean("listOfArrays");
assertEquals(1, gb.getListOfArrays().size());
assertThat(gb.getListOfArrays().size()).isEqualTo(1);
String[] array = gb.getListOfArrays().get(0);
assertEquals(2, array.length);
assertEquals("value1", array[0]);
assertEquals("value2", array[1]);
assertThat(array.length).isEqualTo(2);
assertThat(array[0]).isEqualTo("value1");
assertThat(array[1]).isEqualTo("value2");
}
@@ -196,8 +191,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -211,8 +206,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -224,7 +219,7 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertNull(gb.getIntegerSet());
assertThat(gb.getIntegerSet()).isNull();
}
@Test
@@ -244,10 +239,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -263,10 +258,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -280,8 +275,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertNull(gb.getIntegerSet());
assertNull(gb.getResourceList());
assertThat(gb.getIntegerSet()).isNull();
assertThat(gb.getResourceList()).isNull();
}
@Test
@@ -301,10 +296,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -321,9 +316,9 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
}
@Test
@@ -343,13 +338,13 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertNotSame(gb.getPlainMap(), gb.getShortMap());
assertEquals(2, gb.getPlainMap().size());
assertEquals("0", gb.getPlainMap().get("1"));
assertEquals("3", gb.getPlainMap().get("2"));
assertEquals(2, gb.getShortMap().size());
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
assertThat(gb.getPlainMap().size()).isEqualTo(2);
assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
assertThat(gb.getShortMap().size()).isEqualTo(2);
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -366,13 +361,13 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertNotSame(gb.getPlainMap(), gb.getShortMap());
assertEquals(2, gb.getPlainMap().size());
assertEquals("0", gb.getPlainMap().get("1"));
assertEquals("3", gb.getPlainMap().get("2"));
assertEquals(2, gb.getShortMap().size());
assertEquals(new Integer(0), gb.getShortMap().get(new Short("1")));
assertEquals(new Integer(3), gb.getShortMap().get(new Short("2")));
assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
assertThat(gb.getPlainMap().size()).isEqualTo(2);
assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
assertThat(gb.getShortMap().size()).isEqualTo(2);
assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(new Integer(0));
assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(new Integer(3));
}
@Test
@@ -389,10 +384,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertSame(gb.getPlainMap(), gb.getShortMap());
assertEquals(2, gb.getShortMap().size());
assertEquals(new Integer(0), gb.getShortMap().get(new Short("1")));
assertEquals(new Integer(3), gb.getShortMap().get(new Short("2")));
assertThat(gb.getShortMap()).isSameAs(gb.getPlainMap());
assertThat(gb.getShortMap().size()).isEqualTo(2);
assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(new Integer(0));
assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(new Integer(3));
}
@Test
@@ -408,8 +403,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals("5", gb.getLongMap().get(new Long("4")));
assertEquals("7", gb.getLongMap().get(new Long("6")));
assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
assertThat(gb.getLongMap().get(new Long("6"))).isEqualTo("7");
}
@Test
@@ -436,8 +431,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getCollectionMap().get(new Integer(1)) instanceof HashSet);
assertTrue(gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList);
boolean condition1 = gb.getCollectionMap().get(new Integer(1)) instanceof HashSet;
assertThat(condition1).isTrue();
boolean condition = gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList;
assertThat(condition).isTrue();
}
@@ -455,8 +452,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
}
@Test
@@ -477,10 +474,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertEquals(new UrlResource("http://localhost:9090"), gb.getResourceList().get(1));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
assertThat(gb.getResourceList().get(1)).isEqualTo(new UrlResource("http://localhost:9090"));
}
@Test
@@ -501,10 +498,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getIntegerSet().contains(new Integer(4)));
assertTrue(gb.getIntegerSet().contains(new Integer(5)));
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getIntegerSet().contains(new Integer(4))).isTrue();
assertThat(gb.getIntegerSet().contains(new Integer(5))).isTrue();
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -522,9 +519,9 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertEquals(new UrlResource("http://localhost:8080"), gb.getResourceList().get(0));
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
}
@Test
@@ -545,10 +542,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals("0", gb.getPlainMap().get("1"));
assertEquals("3", gb.getPlainMap().get("2"));
assertEquals(new Integer(5), gb.getShortMap().get(new Short("4")));
assertEquals(new Integer(7), gb.getShortMap().get(new Short("6")));
assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(new Integer(5));
assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(new Integer(7));
}
@Test
@@ -565,8 +562,8 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertEquals("5", gb.getLongMap().get(new Long("4")));
assertEquals("7", gb.getLongMap().get(new Long("6")));
assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
assertThat(gb.getLongMap().get(new Long("6"))).isEqualTo("7");
}
@Test
@@ -594,8 +591,10 @@ public class BeanFactoryGenericsTests {
bf.registerBeanDefinition("genericBean", rbd);
GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
assertTrue(gb.getCollectionMap().get(new Integer(1)) instanceof HashSet);
assertTrue(gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList);
boolean condition1 = gb.getCollectionMap().get(new Integer(1)) instanceof HashSet;
assertThat(condition1).isTrue();
boolean condition = gb.getCollectionMap().get(new Integer(2)) instanceof ArrayList;
assertThat(condition).isTrue();
}
@Test
@@ -604,8 +603,8 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
List<?> list = (List<?>) bf.getBean("list");
assertEquals(1, list.size());
assertEquals(new URL("http://localhost:8080"), list.get(0));
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(new URL("http://localhost:8080"));
}
@Test
@@ -614,8 +613,8 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
Set<?> set = (Set<?>) bf.getBean("set");
assertEquals(1, set.size());
assertEquals(new URL("http://localhost:8080"), set.iterator().next());
assertThat(set.size()).isEqualTo(1);
assertThat(set.iterator().next()).isEqualTo(new URL("http://localhost:8080"));
}
@Test
@@ -624,9 +623,9 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
Map<?, ?> map = (Map<?, ?>) bf.getBean("map");
assertEquals(1, map.size());
assertEquals(new Integer(10), map.keySet().iterator().next());
assertEquals(new URL("http://localhost:8080"), map.values().iterator().next());
assertThat(map.size()).isEqualTo(1);
assertThat(map.keySet().iterator().next()).isEqualTo(new Integer(10));
assertThat(map.values().iterator().next()).isEqualTo(new URL("http://localhost:8080"));
}
@Test
@@ -635,9 +634,9 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
GenericIntegerBean gb = (GenericIntegerBean) bf.getBean("integerBean");
assertEquals(new Integer(10), gb.getGenericProperty());
assertEquals(new Integer(20), gb.getGenericListProperty().get(0));
assertEquals(new Integer(30), gb.getGenericListProperty().get(1));
assertThat(gb.getGenericProperty()).isEqualTo(new Integer(10));
assertThat(gb.getGenericListProperty().get(0)).isEqualTo(new Integer(20));
assertThat(gb.getGenericListProperty().get(1)).isEqualTo(new Integer(30));
}
@Test
@@ -646,9 +645,9 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
GenericSetOfIntegerBean gb = (GenericSetOfIntegerBean) bf.getBean("setOfIntegerBean");
assertEquals(new Integer(10), gb.getGenericProperty().iterator().next());
assertEquals(new Integer(20), gb.getGenericListProperty().get(0).iterator().next());
assertEquals(new Integer(30), gb.getGenericListProperty().get(1).iterator().next());
assertThat(gb.getGenericProperty().iterator().next()).isEqualTo(new Integer(10));
assertThat(gb.getGenericListProperty().get(0).iterator().next()).isEqualTo(new Integer(20));
assertThat(gb.getGenericListProperty().get(1).iterator().next()).isEqualTo(new Integer(30));
}
@Test
@@ -659,8 +658,8 @@ public class BeanFactoryGenericsTests {
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
new ClassPathResource("genericBeanTests.xml", getClass()));
UrlSet us = (UrlSet) bf.getBean("setBean");
assertEquals(1, us.size());
assertEquals(new URL("https://www.springframework.org"), us.iterator().next());
assertThat(us.size()).isEqualTo(1);
assertThat(us.iterator().next()).isEqualTo(new URL("https://www.springframework.org"));
}
/**
@@ -682,10 +681,10 @@ public class BeanFactoryGenericsTests {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
bf.registerBeanDefinition("mock", rbd);
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
/**
@@ -712,12 +711,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
bf.registerBeanDefinition("mock", rbd);
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
@Test
@@ -733,12 +732,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class.getName());
bf.registerBeanDefinition("mock", rbd);
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
@Test
@@ -752,12 +751,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addGenericArgumentValue(new TypedStringValue(Runnable.class.getName()));
bf.registerBeanDefinition("mock", rbd);
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
@Test
@@ -773,12 +772,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addGenericArgumentValue("x");
bf.registerBeanDefinition("mock", rbd);
assertFalse(bf.isTypeMatch("mock", Runnable.class));
assertFalse(bf.isTypeMatch("mock", Runnable.class));
assertNull(bf.getType("mock"));
assertNull(bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isFalse();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isFalse();
assertThat(bf.getType("mock")).isNull();
assertThat(bf.getType("mock")).isNull();
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(0, beans.size());
assertThat(beans.size()).isEqualTo(0);
}
@Test
@@ -794,12 +793,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addIndexedArgumentValue(0, Runnable.class);
bf.registerBeanDefinition("mock", rbd);
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
@Test // SPR-16720
@@ -816,12 +815,12 @@ public class BeanFactoryGenericsTests {
rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
bf.registerBeanDefinition("mock", rbd);
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertTrue(bf.isTypeMatch("mock", Runnable.class));
assertEquals(Runnable.class, bf.getType("mock"));
assertEquals(Runnable.class, bf.getType("mock"));
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.isTypeMatch("mock", Runnable.class)).isTrue();
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
assertEquals(1, beans.size());
assertThat(beans.size()).isEqualTo(1);
}
@Test
@@ -835,17 +834,17 @@ public class BeanFactoryGenericsTests {
new RootBeanDefinition(NumberBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR, false));
NumberBean nb = bf.getBean(NumberBean.class);
assertSame(bf.getBean("doubleStore"), nb.getDoubleStore());
assertSame(bf.getBean("floatStore"), nb.getFloatStore());
assertThat(nb.getDoubleStore()).isSameAs(bf.getBean("doubleStore"));
assertThat(nb.getFloatStore()).isSameAs(bf.getBean("floatStore"));
String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
assertEquals(2, numberStoreNames.length);
assertEquals("doubleStore", numberStoreNames[0]);
assertEquals("floatStore", numberStoreNames[1]);
assertEquals(0, doubleStoreNames.length);
assertEquals(0, floatStoreNames.length);
assertThat(numberStoreNames.length).isEqualTo(2);
assertThat(numberStoreNames[0]).isEqualTo("doubleStore");
assertThat(numberStoreNames[1]).isEqualTo("floatStore");
assertThat(doubleStoreNames.length).isEqualTo(0);
assertThat(floatStoreNames.length).isEqualTo(0);
}
@Test
@@ -864,80 +863,80 @@ public class BeanFactoryGenericsTests {
new RootBeanDefinition(NumberBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR, false));
NumberBean nb = bf.getBean(NumberBean.class);
assertSame(bf.getBean("store1"), nb.getDoubleStore());
assertSame(bf.getBean("store2"), nb.getFloatStore());
assertThat(nb.getDoubleStore()).isSameAs(bf.getBean("store1"));
assertThat(nb.getFloatStore()).isSameAs(bf.getBean("store2"));
String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
assertEquals(2, numberStoreNames.length);
assertEquals("store1", numberStoreNames[0]);
assertEquals("store2", numberStoreNames[1]);
assertEquals(1, doubleStoreNames.length);
assertEquals("store1", doubleStoreNames[0]);
assertEquals(1, floatStoreNames.length);
assertEquals("store2", floatStoreNames[0]);
assertThat(numberStoreNames.length).isEqualTo(2);
assertThat(numberStoreNames[0]).isEqualTo("store1");
assertThat(numberStoreNames[1]).isEqualTo("store2");
assertThat(doubleStoreNames.length).isEqualTo(1);
assertThat(doubleStoreNames[0]).isEqualTo("store1");
assertThat(floatStoreNames.length).isEqualTo(1);
assertThat(floatStoreNames[0]).isEqualTo("store2");
ObjectProvider<NumberStore<?>> numberStoreProvider = bf.getBeanProvider(ResolvableType.forClass(NumberStore.class));
ObjectProvider<NumberStore<Double>> doubleStoreProvider = bf.getBeanProvider(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
ObjectProvider<NumberStore<Float>> floatStoreProvider = bf.getBeanProvider(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(numberStoreProvider::getObject);
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(numberStoreProvider::getIfAvailable);
assertNull(numberStoreProvider.getIfUnique());
assertSame(bf.getBean("store1"), doubleStoreProvider.getObject());
assertSame(bf.getBean("store1"), doubleStoreProvider.getIfAvailable());
assertSame(bf.getBean("store1"), doubleStoreProvider.getIfUnique());
assertSame(bf.getBean("store2"), floatStoreProvider.getObject());
assertSame(bf.getBean("store2"), floatStoreProvider.getIfAvailable());
assertSame(bf.getBean("store2"), floatStoreProvider.getIfUnique());
assertThat(numberStoreProvider.getIfUnique()).isNull();
assertThat(doubleStoreProvider.getObject()).isSameAs(bf.getBean("store1"));
assertThat(doubleStoreProvider.getIfAvailable()).isSameAs(bf.getBean("store1"));
assertThat(doubleStoreProvider.getIfUnique()).isSameAs(bf.getBean("store1"));
assertThat(floatStoreProvider.getObject()).isSameAs(bf.getBean("store2"));
assertThat(floatStoreProvider.getIfAvailable()).isSameAs(bf.getBean("store2"));
assertThat(floatStoreProvider.getIfUnique()).isSameAs(bf.getBean("store2"));
List<NumberStore<?>> resolved = new ArrayList<>();
for (NumberStore<?> instance : numberStoreProvider) {
resolved.add(instance);
}
assertEquals(2, resolved.size());
assertSame(bf.getBean("store1"), resolved.get(0));
assertSame(bf.getBean("store2"), resolved.get(1));
assertThat(resolved.size()).isEqualTo(2);
assertThat(resolved.get(0)).isSameAs(bf.getBean("store1"));
assertThat(resolved.get(1)).isSameAs(bf.getBean("store2"));
resolved = numberStoreProvider.stream().collect(Collectors.toList());
assertEquals(2, resolved.size());
assertSame(bf.getBean("store1"), resolved.get(0));
assertSame(bf.getBean("store2"), resolved.get(1));
assertThat(resolved.size()).isEqualTo(2);
assertThat(resolved.get(0)).isSameAs(bf.getBean("store1"));
assertThat(resolved.get(1)).isSameAs(bf.getBean("store2"));
resolved = numberStoreProvider.orderedStream().collect(Collectors.toList());
assertEquals(2, resolved.size());
assertSame(bf.getBean("store2"), resolved.get(0));
assertSame(bf.getBean("store1"), resolved.get(1));
assertThat(resolved.size()).isEqualTo(2);
assertThat(resolved.get(0)).isSameAs(bf.getBean("store2"));
assertThat(resolved.get(1)).isSameAs(bf.getBean("store1"));
resolved = new ArrayList<>();
for (NumberStore<Double> instance : doubleStoreProvider) {
resolved.add(instance);
}
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store1")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store1"))).isTrue();
resolved = doubleStoreProvider.stream().collect(Collectors.toList());
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store1")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store1"))).isTrue();
resolved = doubleStoreProvider.orderedStream().collect(Collectors.toList());
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store1")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store1"))).isTrue();
resolved = new ArrayList<>();
for (NumberStore<Float> instance : floatStoreProvider) {
resolved.add(instance);
}
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store2")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store2"))).isTrue();
resolved = floatStoreProvider.stream().collect(Collectors.toList());
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store2")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store2"))).isTrue();
resolved = floatStoreProvider.orderedStream().collect(Collectors.toList());
assertEquals(1, resolved.size());
assertTrue(resolved.contains(bf.getBean("store2")));
assertThat(resolved.size()).isEqualTo(1);
assertThat(resolved.contains(bf.getBean("store2"))).isTrue();
}
@Test
@@ -955,9 +954,9 @@ public class BeanFactoryGenericsTests {
ObjectProvider<NumberStore<?>> numberStoreProvider = bf.getBeanProvider(ResolvableType.forClass(NumberStore.class));
List<NumberStore<?>> resolved = numberStoreProvider.orderedStream().collect(Collectors.toList());
assertEquals(2, resolved.size());
assertSame(bf.getBean("store2"), resolved.get(0));
assertSame(bf.getBean("store1"), resolved.get(1));
assertThat(resolved.size()).isEqualTo(2);
assertThat(resolved.get(0)).isSameAs(bf.getBean("store2"));
assertThat(resolved.get(1)).isSameAs(bf.getBean("store1"));
}
@@ -979,9 +978,9 @@ public class BeanFactoryGenericsTests {
public static class CollectionDependentBean {
public CollectionDependentBean(NamedUrlList list, NamedUrlSet set, NamedUrlMap map) {
assertEquals(1, list.size());
assertEquals(1, set.size());
assertEquals(1, map.size());
assertThat(list.size()).isEqualTo(1);
assertThat(set.size()).isEqualTo(1);
assertThat(map.size()).isEqualTo(1);
}
}

61
spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
View File

@@ -23,10 +23,7 @@ import org.springframework.beans.factory.ObjectFactory;
import org.springframework.tests.sample.beans.DerivedTestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -41,7 +38,7 @@ public class DefaultSingletonBeanRegistryTests {
TestBean tb = new TestBean();
beanRegistry.registerSingleton("tb", tb);
assertSame(tb, beanRegistry.getSingleton("tb"));
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", new ObjectFactory<Object>() {
@Override
@@ -49,19 +46,19 @@ public class DefaultSingletonBeanRegistryTests {
return new TestBean();
}
});
assertSame(tb2, beanRegistry.getSingleton("tb2"));
assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2);
assertSame(tb, beanRegistry.getSingleton("tb"));
assertSame(tb2, beanRegistry.getSingleton("tb2"));
assertEquals(2, beanRegistry.getSingletonCount());
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2);
assertThat(beanRegistry.getSingletonCount()).isEqualTo(2);
String[] names = beanRegistry.getSingletonNames();
assertEquals(2, names.length);
assertEquals("tb", names[0]);
assertEquals("tb2", names[1]);
assertThat(names.length).isEqualTo(2);
assertThat(names[0]).isEqualTo("tb");
assertThat(names[1]).isEqualTo("tb2");
beanRegistry.destroySingletons();
assertEquals(0, beanRegistry.getSingletonCount());
assertEquals(0, beanRegistry.getSingletonNames().length);
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
assertThat(beanRegistry.getSingletonNames().length).isEqualTo(0);
}
@Test
@@ -71,19 +68,19 @@ public class DefaultSingletonBeanRegistryTests {
DerivedTestBean tb = new DerivedTestBean();
beanRegistry.registerSingleton("tb", tb);
beanRegistry.registerDisposableBean("tb", tb);
assertSame(tb, beanRegistry.getSingleton("tb"));
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
assertSame(tb, beanRegistry.getSingleton("tb"));
assertEquals(1, beanRegistry.getSingletonCount());
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
assertThat(beanRegistry.getSingletonCount()).isEqualTo(1);
String[] names = beanRegistry.getSingletonNames();
assertEquals(1, names.length);
assertEquals("tb", names[0]);
assertFalse(tb.wasDestroyed());
assertThat(names.length).isEqualTo(1);
assertThat(names[0]).isEqualTo("tb");
assertThat(tb.wasDestroyed()).isFalse();
beanRegistry.destroySingletons();
assertEquals(0, beanRegistry.getSingletonCount());
assertEquals(0, beanRegistry.getSingletonNames().length);
assertTrue(tb.wasDestroyed());
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
assertThat(beanRegistry.getSingletonNames().length).isEqualTo(0);
assertThat(tb.wasDestroyed()).isTrue();
}
@Test
@@ -93,15 +90,15 @@ public class DefaultSingletonBeanRegistryTests {
beanRegistry.registerDependentBean("a", "b");
beanRegistry.registerDependentBean("b", "c");
beanRegistry.registerDependentBean("c", "b");
assertTrue(beanRegistry.isDependent("a", "b"));
assertTrue(beanRegistry.isDependent("b", "c"));
assertTrue(beanRegistry.isDependent("c", "b"));
assertTrue(beanRegistry.isDependent("a", "c"));
assertFalse(beanRegistry.isDependent("c", "a"));
assertFalse(beanRegistry.isDependent("b", "a"));
assertFalse(beanRegistry.isDependent("a", "a"));
assertTrue(beanRegistry.isDependent("b", "b"));
assertTrue(beanRegistry.isDependent("c", "c"));
assertThat(beanRegistry.isDependent("a", "b")).isTrue();
assertThat(beanRegistry.isDependent("b", "c")).isTrue();
assertThat(beanRegistry.isDependent("c", "b")).isTrue();
assertThat(beanRegistry.isDependent("a", "c")).isTrue();
assertThat(beanRegistry.isDependent("c", "a")).isFalse();
assertThat(beanRegistry.isDependent("b", "a")).isFalse();
assertThat(beanRegistry.isDependent("a", "a")).isFalse();
assertThat(beanRegistry.isDependent("b", "b")).isTrue();
assertThat(beanRegistry.isDependent("c", "c")).isTrue();
}
}

19
spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
View File

@@ -22,8 +22,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for {@code equals()} and {@code hashCode()} in bean definitions.
@@ -69,8 +68,8 @@ public class DefinitionMetadataEqualsHashCodeTests {
// override in 'master' will not. But... the bean definitions should still be
// considered equal.
assertEquals("Should be equal", master, equal);
assertEquals("Hash code for equal instances must match", master.hashCode(), equal.hashCode());
assertThat(equal).as("Should be equal").isEqualTo(master);
assertThat(equal.hashCode()).as("Hash code for equal instances must match").isEqualTo(master.hashCode());
}
@Test
@@ -123,14 +122,14 @@ public class DefinitionMetadataEqualsHashCodeTests {
}
private void assertEqualsAndHashCodeContracts(Object master, Object equal, Object notEqual, Object subclass) {
assertEquals("Should be equal", master, equal);
assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode());
assertThat(equal).as("Should be equal").isEqualTo(master);
assertThat(equal.hashCode()).as("Hash code for equal instances should match").isEqualTo(master.hashCode());
assertNotEquals("Should not be equal", master, notEqual);
assertNotEquals("Hash code for non-equal instances should not match", master.hashCode(), notEqual.hashCode());
assertThat(notEqual).as("Should not be equal").isNotEqualTo(master);
assertThat(notEqual.hashCode()).as("Hash code for non-equal instances should not match").isNotEqualTo((long) master.hashCode());
assertEquals("Subclass should be equal", master, subclass);
assertEquals("Hash code for subclass should match", master.hashCode(), subclass.hashCode());
assertThat(subclass).as("Subclass should be equal").isEqualTo(master);
assertThat(subclass.hashCode()).as("Hash code for subclass should match").isEqualTo(master.hashCode());
}
}

38
spring-beans/src/test/java/org/springframework/beans/factory/support/LookupMethodTests.java
View File

@@ -23,10 +23,8 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* @author Karl Pietrzak
@@ -48,43 +46,43 @@ public class LookupMethodTests {
@Test
public void testWithoutConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
Object expected = bean.get();
assertEquals(TestBean.class, expected.getClass());
assertThat(expected.getClass()).isEqualTo(TestBean.class);
}
@Test
public void testWithOverloadedArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.get("haha");
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
}
@Test
public void testWithOneConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.getOneArgument("haha");
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
}
@Test
public void testWithTwoConstructorArg() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.getTwoArguments("haha", 72);
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertEquals(72, expected.getAge());
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
assertThat(expected.getAge()).isEqualTo(72);
}
@Test
public void testWithThreeArgsShouldFail() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
assertThatExceptionOfType(AbstractMethodError.class).as("does not have a three arg constructor").isThrownBy(() ->
bean.getThreeArguments("name", 1, 2));
}
@@ -92,11 +90,11 @@ public class LookupMethodTests {
@Test
public void testWithOverriddenLookupMethod() {
AbstractBean bean = (AbstractBean) beanFactory.getBean("extendedBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
TestBean expected = bean.getOneArgument("haha");
assertEquals(TestBean.class, expected.getClass());
assertEquals("haha", expected.getName());
assertTrue(expected.isJedi());
assertThat(expected.getClass()).isEqualTo(TestBean.class);
assertThat(expected.getName()).isEqualTo("haha");
assertThat(expected.isJedi()).isTrue();
}

11
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
View File

@@ -20,10 +20,9 @@ import java.util.List;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
/**
* @author Rick Evans
@@ -42,7 +41,7 @@ public class ManagedListTests {
child.add("three");
child.setMergeEnabled(true);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedList.size());
assertThat(mergedList.size()).as("merge() obviously did not work.").isEqualTo(3);
}
@Test
@@ -50,7 +49,7 @@ public class ManagedListTests {
ManagedList child = new ManagedList();
child.add("one");
child.setMergeEnabled(true);
assertSame(child, child.merge(null));
assertThat(child.merge(null)).isSameAs(child);
}
@Test
@@ -77,7 +76,7 @@ public class ManagedListTests {
ManagedList child = new ManagedList();
child.setMergeEnabled(true);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedList.size());
assertThat(mergedList.size()).as("merge() obviously did not work.").isEqualTo(2);
}
@Test
@@ -90,7 +89,7 @@ public class ManagedListTests {
child.add("one");
child.setMergeEnabled(true);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedList.size());
assertThat(mergedList.size()).as("merge() obviously did not work.").isEqualTo(3);
}
}

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

@@ -20,10 +20,9 @@ import java.util.Map;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
/**
* @author Rick Evans
@@ -42,14 +41,14 @@ public class ManagedMapTests {
child.put("three", "three");
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedMap.size());
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(3);
}
@Test
public void mergeWithNullParent() {
ManagedMap child = new ManagedMap();
child.setMergeEnabled(true);
assertSame(child, child.merge(null));
assertThat(child.merge(null)).isSameAs(child);
}
@Test
@@ -74,7 +73,7 @@ public class ManagedMapTests {
ManagedMap child = new ManagedMap();
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedMap.size());
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
}
@Test
@@ -87,8 +86,8 @@ public class ManagedMapTests {
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
// child value for 'one' must override parent value...
assertEquals("merge() obviously did not work.", 2, mergedMap.size());
assertEquals("Parent value not being overridden during merge().", "fork", mergedMap.get("one"));
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap.get("one")).as("Parent value not being overridden during merge().").isEqualTo("fork");
}
}

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

@@ -20,10 +20,9 @@ import java.util.Map;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
/**
* @author Rick Evans
@@ -42,14 +41,14 @@ public class ManagedPropertiesTests {
child.setProperty("three", "three");
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedMap.size());
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(3);
}
@Test
public void mergeWithNullParent() {
ManagedProperties child = new ManagedProperties();
child.setMergeEnabled(true);
assertSame(child, child.merge(null));
assertThat(child.merge(null)).isSameAs(child);
}
@Test
@@ -75,7 +74,7 @@ public class ManagedPropertiesTests {
ManagedProperties child = new ManagedProperties();
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedMap.size());
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
}
@Test
@@ -88,8 +87,8 @@ public class ManagedPropertiesTests {
child.setMergeEnabled(true);
Map mergedMap = (Map) child.merge(parent);
// child value for 'one' must override parent value...
assertEquals("merge() obviously did not work.", 2, mergedMap.size());
assertEquals("Parent value not being overridden during merge().", "fork", mergedMap.get("one"));
assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(2);
assertThat(mergedMap.get("one")).as("Parent value not being overridden during merge().").isEqualTo("fork");
}
}

11
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
View File

@@ -20,10 +20,9 @@ import java.util.Set;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
/**
* @author Rick Evans
@@ -42,7 +41,7 @@ public class ManagedSetTests {
child.add("three");
child.setMergeEnabled(true);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedSet.size());
assertThat(mergedSet.size()).as("merge() obviously did not work.").isEqualTo(3);
}
@Test
@@ -50,7 +49,7 @@ public class ManagedSetTests {
ManagedSet child = new ManagedSet();
child.add("one");
child.setMergeEnabled(true);
assertSame(child, child.merge(null));
assertThat(child.merge(null)).isSameAs(child);
}
@Test
@@ -76,7 +75,7 @@ public class ManagedSetTests {
ManagedSet child = new ManagedSet();
child.setMergeEnabled(true);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedSet.size());
assertThat(mergedSet.size()).as("merge() obviously did not work.").isEqualTo(2);
}
@Test
@@ -89,7 +88,7 @@ public class ManagedSetTests {
child.add("one");
child.setMergeEnabled(true);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedSet.size());
assertThat(mergedSet.size()).as("merge() obviously did not work.").isEqualTo(2);
}
}

10
spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
View File

@@ -21,7 +21,7 @@ import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -37,7 +37,7 @@ public class PropertiesBeanDefinitionReaderTests {
public void withSimpleConstructorArg() {
this.reader.loadBeanDefinitions(new ClassPathResource("simpleConstructorArg.properties", getClass()));
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
assertEquals("Rob Harrop", bean.getName());
assertThat(bean.getName()).isEqualTo("Rob Harrop");
}
@Test
@@ -45,15 +45,15 @@ public class PropertiesBeanDefinitionReaderTests {
this.reader.loadBeanDefinitions(new ClassPathResource("refConstructorArg.properties", getClass()));
TestBean rob = (TestBean) this.beanFactory.getBean("rob");
TestBean sally = (TestBean) this.beanFactory.getBean("sally");
assertEquals(sally, rob.getSpouse());
assertThat(rob.getSpouse()).isEqualTo(sally);
}
@Test
public void withMultipleConstructorsArgs() {
this.reader.loadBeanDefinitions(new ClassPathResource("multiConstructorArgs.properties", getClass()));
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
assertEquals("Rob Harrop", bean.getName());
assertEquals(23, bean.getAge());
assertThat(bean.getName()).isEqualTo("Rob Harrop");
assertThat(bean.getAge()).isEqualTo(23);
}
}

76
spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
View File

@@ -31,9 +31,7 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
import org.springframework.core.MethodParameter;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Fisher
@@ -53,11 +51,11 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
cavs.addGenericArgumentValue(JUERGEN);
RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null);
lbf.registerBeanDefinition(JUERGEN, rbd);
assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
assertTrue(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), false)));
assertTrue(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), true)));
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), false))).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), true))).isTrue();
}
@Test
@@ -68,11 +66,11 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null);
rbd.setAutowireCandidate(false);
lbf.registerBeanDefinition(JUERGEN, rbd);
assertFalse(lbf.isAutowireCandidate(JUERGEN, null));
assertFalse(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), false)));
assertFalse(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), true)));
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isFalse();
assertThat(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), false))).isFalse();
assertThat(lbf.isAutowireCandidate(JUERGEN,
new DependencyDescriptor(Person.class.getDeclaredField("name"), true))).isFalse();
}
@Ignore
@@ -92,12 +90,12 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
QualifiedTestBean.class.getDeclaredField("qualified"), false);
DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
assertTrue(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(MARK, null));
assertTrue(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor));
assertFalse(lbf.isAutowireCandidate(MARK, qualifiedDescriptor));
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, null)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
}
@Test
@@ -113,9 +111,9 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
QualifiedTestBean.class.getDeclaredField("qualified"), false);
DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
assertFalse(lbf.isAutowireCandidate(JUERGEN, null));
assertFalse(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor));
assertFalse(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isFalse();
assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isFalse();
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isFalse();
}
@Test
@@ -130,9 +128,9 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
QualifiedTestBean.class.getDeclaredField("qualified"), false);
DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
assertTrue(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
}
@Ignore
@@ -151,10 +149,10 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
MethodParameter param = new MethodParameter(QualifiedTestBean.class.getDeclaredConstructor(Person.class), 0);
DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(param, false);
param.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
assertEquals("tpb", param.getParameterName());
assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
assertTrue(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertFalse(lbf.isAutowireCandidate(MARK, qualifiedDescriptor));
assertThat(param.getParameterName()).isEqualTo("tpb");
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
}
@Ignore
@@ -177,15 +175,15 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(qualifiedParam, false);
DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(nonqualifiedParam, false);
qualifiedParam.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
assertEquals("tpb", qualifiedParam.getParameterName());
assertThat(qualifiedParam.getParameterName()).isEqualTo("tpb");
nonqualifiedParam.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
assertEquals("tpb", nonqualifiedParam.getParameterName());
assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
assertTrue(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(MARK, null));
assertTrue(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor));
assertFalse(lbf.isAutowireCandidate(MARK, qualifiedDescriptor));
assertThat(nonqualifiedParam.getParameterName()).isEqualTo("tpb");
assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, null)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
}
@Test
@@ -204,8 +202,8 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(
new MethodParameter(QualifiedTestBean.class.getDeclaredConstructor(Person.class), 0),
false);
assertTrue(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor));
assertTrue(lbf.isAutowireCandidate(MARK, qualifiedDescriptor));
assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isTrue();
}

31
spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
View File

@@ -57,9 +57,6 @@ import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
* Security test case. Checks whether the container uses its privileges for its
@@ -115,7 +112,7 @@ public class CallbacksSecurityTests {
}
private void checkCurrentContext() {
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
}
}
@@ -160,7 +157,7 @@ public class CallbacksSecurityTests {
}
private void checkCurrentContext() {
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
}
}
@@ -204,7 +201,7 @@ public class CallbacksSecurityTests {
}
private void checkCurrentContext() {
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
}
}
@@ -215,16 +212,16 @@ public class CallbacksSecurityTests {
public NonPrivilegedFactory(String expected) {
this.expectedName = expected;
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
}
public static Object makeStaticInstance(String expectedName) {
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
return new Object();
}
public Object makeInstance() {
assertEquals(expectedName, getCurrentSubjectName());
assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
return new Object();
}
}
@@ -365,14 +362,14 @@ public class CallbacksSecurityTests {
public void testSpringDestroyBean() throws Exception {
beanFactory.getBean("spring-destroy");
beanFactory.destroySingletons();
assertNull(System.getProperty("security.destroy"));
assertThat(System.getProperty("security.destroy")).isNull();
}
@Test
public void testCustomDestroyBean() throws Exception {
beanFactory.getBean("custom-destroy");
beanFactory.destroySingletons();
assertNull(System.getProperty("security.destroy"));
assertThat(System.getProperty("security.destroy")).isNull();
}
@Test
@@ -384,8 +381,8 @@ public class CallbacksSecurityTests {
@Test
public void testCustomFactoryType() throws Exception {
assertNull(beanFactory.getType("spring-factory"));
assertNull(System.getProperty("factory.object.type"));
assertThat(beanFactory.getType("spring-factory")).isNull();
assertThat(System.getProperty("factory.object.type")).isNull();
}
@Test
@@ -458,7 +455,7 @@ public class CallbacksSecurityTests {
return lbf.getBean("test", NonPrivilegedBean.class);
}
}, null);
assertNotNull(bean);
assertThat(bean).isNotNull();
}
@Test
@@ -480,8 +477,8 @@ public class CallbacksSecurityTests {
@Override
public Object run() {
// sanity check
assertEquals("user1", getCurrentSubjectName());
assertEquals(false, NonPrivilegedBean.destroyed);
assertThat(getCurrentSubjectName()).isEqualTo("user1");
assertThat(NonPrivilegedBean.destroyed).isEqualTo(false);
beanFactory.getBean("trusted-spring-callbacks");
beanFactory.getBean("trusted-custom-init-destroy");
@@ -497,7 +494,7 @@ public class CallbacksSecurityTests {
beanFactory.getBean("trusted-working-property-injection");
beanFactory.destroySingletons();
assertEquals(true, NonPrivilegedBean.destroyed);
assertThat(NonPrivilegedBean.destroyed).isEqualTo(true);
return null;
}
}, provider.getAccessControlContext());

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

@@ -23,9 +23,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -54,7 +53,7 @@ public class BeanConfigurerSupportTests {
configurer.setBeanFactory(new DefaultListableBeanFactory());
configurer.configureBean(beanInstance);
verify(resolver).resolveWiringInfo(beanInstance);
assertNull(beanInstance.getName());
assertThat(beanInstance.getName()).isNull();
}
@Test
@@ -62,7 +61,7 @@ public class BeanConfigurerSupportTests {
TestBean beanInstance = new TestBean();
BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
configurer.configureBean(beanInstance);
assertNull(beanInstance.getName());
assertThat(beanInstance.getName()).isNull();
}
@Test
@@ -78,7 +77,7 @@ public class BeanConfigurerSupportTests {
configurer.setBeanFactory(factory);
configurer.afterPropertiesSet();
configurer.configureBean(beanInstance);
assertEquals("Bean is evidently not being configured (for some reason)", "Harriet Wheeler", beanInstance.getName());
assertThat(beanInstance.getName()).as("Bean is evidently not being configured (for some reason)").isEqualTo("Harriet Wheeler");
}
@Test
@@ -98,7 +97,7 @@ public class BeanConfigurerSupportTests {
configurer.setBeanFactory(factory);
configurer.setBeanWiringInfoResolver(resolver);
configurer.configureBean(beanInstance);
assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
assertThat(beanInstance.getSpouse().getName()).as("Bean is evidently not being configured (for some reason)").isEqualTo("David Gavurin");
}
@Test
@@ -118,7 +117,7 @@ public class BeanConfigurerSupportTests {
configurer.setBeanFactory(factory);
configurer.setBeanWiringInfoResolver(resolver);
configurer.configureBean(beanInstance);
assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
assertThat(beanInstance.getSpouse().getName()).as("Bean is evidently not being configured (for some reason)").isEqualTo("David Gavurin");
}

11
spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanWiringInfoTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.beans.factory.wiring;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for the BeanWiringInfo class.
@@ -63,25 +62,25 @@ public class BeanWiringInfoTests {
@Test
public void usingAutowireCtorIndicatesAutowiring() throws Exception {
BeanWiringInfo info = new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, true);
assertTrue(info.indicatesAutowiring());
assertThat(info.indicatesAutowiring()).isTrue();
}
@Test
public void usingBeanNameCtorDoesNotIndicateAutowiring() throws Exception {
BeanWiringInfo info = new BeanWiringInfo("fooService");
assertFalse(info.indicatesAutowiring());
assertThat(info.indicatesAutowiring()).isFalse();
}
@Test
public void noDependencyCheckValueIsPreserved() throws Exception {
BeanWiringInfo info = new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, true);
assertTrue(info.getDependencyCheck());
assertThat(info.getDependencyCheck()).isTrue();
}
@Test
public void dependencyCheckValueIsPreserved() throws Exception {
BeanWiringInfo info = new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false);
assertFalse(info.getDependencyCheck());
assertThat(info.getDependencyCheck()).isFalse();
}
}

8
spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.beans.factory.wiring;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
* Unit tests for the ClassNameBeanWiringInfoResolver class.
@@ -40,9 +39,8 @@ public class ClassNameBeanWiringInfoResolverTests {
ClassNameBeanWiringInfoResolver resolver = new ClassNameBeanWiringInfoResolver();
Long beanInstance = new Long(1);
BeanWiringInfo info = resolver.resolveWiringInfo(beanInstance);
assertNotNull(info);
assertEquals("Not resolving bean name to the class name of the supplied bean instance as per class contract.",
beanInstance.getClass().getName(), info.getBeanName());
assertThat(info).isNotNull();
assertThat(info.getBeanName()).as("Not resolving bean name to the class name of the supplied bean instance as per class contract.").isEqualTo(beanInstance.getClass().getName());
}
}

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

@@ -37,10 +37,6 @@ import org.springframework.tests.sample.beans.factory.DummyFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* Subclasses must initialize the bean factory and any other variables they need.
@@ -58,15 +54,15 @@ public abstract class AbstractBeanFactoryTests {
*/
@Test
public void inheritance() {
assertTrue(getBeanFactory().containsBean("rod"));
assertTrue(getBeanFactory().containsBean("roderick"));
assertThat(getBeanFactory().containsBean("rod")).isTrue();
assertThat(getBeanFactory().containsBean("roderick")).isTrue();
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
TestBean roderick = (TestBean) getBeanFactory().getBean("roderick");
assertTrue("not == ", rod != roderick);
assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
assertTrue("rod.age is 31", rod.getAge() == 31);
assertTrue("roderick.name is Roderick", roderick.getName().equals("Roderick"));
assertTrue("roderick.age was inherited", roderick.getAge() == rod.getAge());
assertThat(rod != roderick).as("not == ").isTrue();
assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue();
assertThat(rod.getAge() == 31).as("rod.age is 31").isTrue();
assertThat(roderick.getName().equals("Roderick")).as("roderick.name is Roderick").isTrue();
assertThat(roderick.getAge() == rod.getAge()).as("roderick.age was inherited").isTrue();
}
@Test
@@ -93,26 +89,29 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void lifecycleCallbacks() {
LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
assertEquals("lifecycle", lb.getBeanName());
assertThat(lb.getBeanName()).isEqualTo("lifecycle");
// The dummy business method will throw an exception if the
// necessary callbacks weren't invoked in the right order.
lb.businessMethod();
assertTrue("Not destroyed", !lb.isDestroyed());
boolean condition = !lb.isDestroyed();
assertThat(condition).as("Not destroyed").isTrue();
}
@Test
public void findsValidInstance() {
Object o = getBeanFactory().getBean("rod");
assertTrue("Rod bean is a TestBean", o instanceof TestBean);
boolean condition = o instanceof TestBean;
assertThat(condition).as("Rod bean is a TestBean").isTrue();
TestBean rod = (TestBean) o;
assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
assertTrue("rod.age is 31", rod.getAge() == 31);
assertThat(rod.getName().equals("Rod")).as("rod.name is Rod").isTrue();
assertThat(rod.getAge() == 31).as("rod.age is 31").isTrue();
}
@Test
public void getInstanceByMatchingClass() {
Object o = getBeanFactory().getBean("rod", TestBean.class);
assertTrue("Rod bean is a TestBean", o instanceof TestBean);
boolean condition = o instanceof TestBean;
assertThat(condition).as("Rod bean is a TestBean").isTrue();
}
@Test
@@ -129,13 +128,15 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void getSharedInstanceByMatchingClass() {
Object o = getBeanFactory().getBean("rod", TestBean.class);
assertTrue("Rod bean is a TestBean", o instanceof TestBean);
boolean condition = o instanceof TestBean;
assertThat(condition).as("Rod bean is a TestBean").isTrue();
}
@Test
public void getSharedInstanceByMatchingClassNoCatch() {
Object o = getBeanFactory().getBean("rod", TestBean.class);
assertTrue("Rod bean is a TestBean", o instanceof TestBean);
boolean condition = o instanceof TestBean;
assertThat(condition).as("Rod bean is a TestBean").isTrue();
}
@Test
@@ -152,28 +153,31 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void sharedInstancesAreEqual() {
Object o = getBeanFactory().getBean("rod");
assertTrue("Rod bean1 is a TestBean", o instanceof TestBean);
boolean condition1 = o instanceof TestBean;
assertThat(condition1).as("Rod bean1 is a TestBean").isTrue();
Object o1 = getBeanFactory().getBean("rod");
assertTrue("Rod bean2 is a TestBean", o1 instanceof TestBean);
assertTrue("Object equals applies", o == o1);
boolean condition = o1 instanceof TestBean;
assertThat(condition).as("Rod bean2 is a TestBean").isTrue();
assertThat(o == o1).as("Object equals applies").isTrue();
}
@Test
public void prototypeInstancesAreIndependent() {
TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy");
TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy");
assertTrue("ref equal DOES NOT apply", tb1 != tb2);
assertTrue("object equal true", tb1.equals(tb2));
assertThat(tb1 != tb2).as("ref equal DOES NOT apply").isTrue();
assertThat(tb1.equals(tb2)).as("object equal true").isTrue();
tb1.setAge(1);
tb2.setAge(2);
assertTrue("1 age independent = 1", tb1.getAge() == 1);
assertTrue("2 age independent = 2", tb2.getAge() == 2);
assertTrue("object equal now false", !tb1.equals(tb2));
assertThat(tb1.getAge() == 1).as("1 age independent = 1").isTrue();
assertThat(tb2.getAge() == 2).as("2 age independent = 2").isTrue();
boolean condition = !tb1.equals(tb2);
assertThat(condition).as("object equal now false").isTrue();
}
@Test
public void notThere() {
assertFalse(getBeanFactory().containsBean("Mr Squiggle"));
assertThat(getBeanFactory().containsBean("Mr Squiggle")).isFalse();
assertThatExceptionOfType(BeansException.class).isThrownBy(() ->
getBeanFactory().getBean("Mr Squiggle"));
}
@@ -181,9 +185,10 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void validEmpty() {
Object o = getBeanFactory().getBean("validEmpty");
assertTrue("validEmpty bean is a TestBean", o instanceof TestBean);
boolean condition = o instanceof TestBean;
assertThat(condition).as("validEmpty bean is a TestBean").isTrue();
TestBean ve = (TestBean) o;
assertTrue("Valid empty has defaults", ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null);
assertThat(ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null).as("Valid empty has defaults").isTrue();
}
public void xtestTypeMismatch() {
@@ -202,29 +207,30 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void grandparentDefinitionFoundInBeanFactory() throws Exception {
TestBean dad = (TestBean) getBeanFactory().getBean("father");
assertTrue("Dad has correct name", dad.getName().equals("Albert"));
assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue();
}
@Test
public void factorySingleton() throws Exception {
assertTrue(getBeanFactory().isSingleton("&singletonFactory"));
assertTrue(getBeanFactory().isSingleton("singletonFactory"));
assertThat(getBeanFactory().isSingleton("&singletonFactory")).isTrue();
assertThat(getBeanFactory().isSingleton("singletonFactory")).isTrue();
TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
assertTrue("Singleton from factory has correct name, not " + tb.getName(), tb.getName().equals(DummyFactory.SINGLETON_NAME));
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");
assertTrue("Singleton references ==", tb == tb2);
assertTrue("FactoryBean is BeanFactoryAware", factory.getBeanFactory() != null);
assertThat(tb == tb2).as("Singleton references ==").isTrue();
assertThat(factory.getBeanFactory() != null).as("FactoryBean is BeanFactoryAware").isTrue();
}
@Test
public void factoryPrototype() throws Exception {
assertTrue(getBeanFactory().isSingleton("&prototypeFactory"));
assertFalse(getBeanFactory().isSingleton("prototypeFactory"));
assertThat(getBeanFactory().isSingleton("&prototypeFactory")).isTrue();
assertThat(getBeanFactory().isSingleton("prototypeFactory")).isFalse();
TestBean tb = (TestBean) getBeanFactory().getBean("prototypeFactory");
assertTrue(!tb.getName().equals(DummyFactory.SINGLETON_NAME));
boolean condition = !tb.getName().equals(DummyFactory.SINGLETON_NAME);
assertThat(condition).isTrue();
TestBean tb2 = (TestBean) getBeanFactory().getBean("prototypeFactory");
assertTrue("Prototype references !=", tb != tb2);
assertThat(tb != tb2).as("Prototype references !=").isTrue();
}
/**
@@ -233,7 +239,7 @@ public abstract class AbstractBeanFactoryTests {
*/
@Test
public void getFactoryItself() throws Exception {
assertNotNull(getBeanFactory().getBean("&singletonFactory"));
assertThat(getBeanFactory().getBean("&singletonFactory")).isNotNull();
}
/**
@@ -242,9 +248,9 @@ public abstract class AbstractBeanFactoryTests {
@Test
public void factoryIsInitialized() throws Exception {
TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
assertNotNull(tb);
assertThat(tb).isNotNull();
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
assertTrue("Factory was initialized because it implemented InitializingBean", factory.wasInitialized());
assertThat(factory.wasInitialized()).as("Factory was initialized because it implemented InitializingBean").isTrue();
}
/**
@@ -276,7 +282,7 @@ public abstract class AbstractBeanFactoryTests {
cbf.registerAlias("rod", alias);
Object rod = getBeanFactory().getBean("rod");
Object aliasRod = getBeanFactory().getBean(alias);
assertTrue(rod == aliasRod);
assertThat(rod == aliasRod).isTrue();
}

29
spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
View File

@@ -23,7 +23,7 @@ import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rod Johnson
@@ -50,25 +50,24 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
protected final void assertCount(int count) {
String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
assertThat(defnames.length == count).as("We should have " + count + " beans, not " + defnames.length).isTrue();
}
protected void assertTestBeanCount(int count) {
String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
assertTrue("We should have " + count + " beans for class org.springframework.tests.sample.beans.TestBean, not " +
defNames.length, defNames.length == count);
assertThat(defNames.length == count).as("We should have " + count + " beans for class org.springframework.tests.sample.beans.TestBean, not " +
defNames.length).isTrue();
int countIncludingFactoryBeans = count + 2;
String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
assertTrue("We should have " + countIncludingFactoryBeans +
" beans for class org.springframework.tests.sample.beans.TestBean, not " + names.length,
names.length == countIncludingFactoryBeans);
assertThat(names.length == countIncludingFactoryBeans).as("We should have " + countIncludingFactoryBeans +
" beans for class org.springframework.tests.sample.beans.TestBean, not " + names.length).isTrue();
}
@Test
public void getDefinitionsForNoSuchClass() {
String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
assertTrue("No string definitions", defnames.length == 0);
assertThat(defnames.length == 0).as("No string definitions").isTrue();
}
/**
@@ -77,19 +76,17 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
*/
@Test
public void getCountForFactoryClass() {
assertTrue("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isTrue();
assertTrue("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
assertThat(getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2).as("Should have 2 factories, not " +
getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length).isTrue();
}
@Test
public void containsBeanDefinition() {
assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
assertThat(getListableBeanFactory().containsBeanDefinition("rod")).isTrue();
assertThat(getListableBeanFactory().containsBeanDefinition("roderick")).isTrue();
}
}

47
spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
View File

@@ -25,8 +25,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -41,8 +40,8 @@ public class AutowireWithExclusionTests {
beanFactory.preInstantiateSingletons();
TestBean rob = (TestBean) beanFactory.getBean("rob");
TestBean sally = (TestBean) beanFactory.getBean("sally");
assertEquals(sally, rob.getSpouse());
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSpouse()).isEqualTo(sally);
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -51,8 +50,8 @@ public class AutowireWithExclusionTests {
DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-exclusion.xml");
beanFactory.preInstantiateSingletons();
TestBean rob = (TestBean) beanFactory.getBean("rob");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -66,8 +65,8 @@ public class AutowireWithExclusionTests {
robDef.getPropertyValues().add("spouse", new RuntimeBeanReference("sally"));
child.registerBeanDefinition("rob2", robDef);
TestBean rob = (TestBean) child.getBean("rob2");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -85,8 +84,8 @@ public class AutowireWithExclusionTests {
propsDef.getPropertyValues().add("properties", "name=props3");
child.registerBeanDefinition("props3", propsDef);
TestBean rob = (TestBean) child.getBean("rob2");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -104,8 +103,8 @@ public class AutowireWithExclusionTests {
propsDef.setPrimary(true);
child.registerBeanDefinition("props3", propsDef);
TestBean rob = (TestBean) child.getBean("rob2");
assertEquals("props3", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props3");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -124,8 +123,8 @@ public class AutowireWithExclusionTests {
propsDef.setPrimary(true);
child.registerBeanDefinition("props3", propsDef);
TestBean rob = (TestBean) child.getBean("rob2");
assertEquals("props3", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props3");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -134,8 +133,8 @@ public class AutowireWithExclusionTests {
DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-inclusion.xml");
beanFactory.preInstantiateSingletons();
TestBean rob = (TestBean) beanFactory.getBean("rob");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -144,8 +143,8 @@ public class AutowireWithExclusionTests {
DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-selective-inclusion.xml");
beanFactory.preInstantiateSingletons();
TestBean rob = (TestBean) beanFactory.getBean("rob");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
assertThat(CountingFactory.getFactoryBeanInstanceCount()).isEqualTo(1);
}
@Test
@@ -153,19 +152,19 @@ public class AutowireWithExclusionTests {
DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
TestBean rob = (TestBean) beanFactory.getBean("rob");
TestBean sally = (TestBean) beanFactory.getBean("sally");
assertEquals(sally, rob.getSpouse());
assertThat(rob.getSpouse()).isEqualTo(sally);
TestBean rob2 = (TestBean) beanFactory.getBean("rob");
assertEquals(rob, rob2);
assertNotSame(rob, rob2);
assertEquals(rob.getSpouse(), rob2.getSpouse());
assertNotSame(rob.getSpouse(), rob2.getSpouse());
assertThat(rob2).isEqualTo(rob);
assertThat(rob2).isNotSameAs(rob);
assertThat(rob2.getSpouse()).isEqualTo(rob.getSpouse());
assertThat(rob2.getSpouse()).isNotSameAs(rob.getSpouse());
}
@Test
public void constructorAutowireWithExclusion() throws Exception {
DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
TestBean rob = (TestBean) beanFactory.getBean("rob");
assertEquals("props1", rob.getSomeProperties().getProperty("name"));
assertThat(rob.getSomeProperties().getProperty("name")).isEqualTo("props1");
}
private DefaultListableBeanFactory getBeanFactory(String configPath) {

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

@@ -23,9 +23,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -50,21 +48,21 @@ public class BeanNameGenerationTests {
String targetName = className + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR + "0";
GeneratedNameBean topLevel1 = (GeneratedNameBean) beanFactory.getBean(targetName);
assertNotNull(topLevel1);
assertThat(topLevel1).isNotNull();
targetName = className + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR + "1";
GeneratedNameBean topLevel2 = (GeneratedNameBean) beanFactory.getBean(targetName);
assertNotNull(topLevel2);
assertThat(topLevel2).isNotNull();
GeneratedNameBean child1 = topLevel1.getChild();
assertNotNull(child1.getBeanName());
assertTrue(child1.getBeanName().startsWith(className));
assertThat(child1.getBeanName()).isNotNull();
assertThat(child1.getBeanName().startsWith(className)).isTrue();
GeneratedNameBean child2 = topLevel2.getChild();
assertNotNull(child2.getBeanName());
assertTrue(child2.getBeanName().startsWith(className));
assertThat(child2.getBeanName()).isNotNull();
assertThat(child2.getBeanName().startsWith(className)).isTrue();
assertFalse(child1.getBeanName().equals(child2.getBeanName()));
assertThat(child1.getBeanName().equals(child2.getBeanName())).isFalse();
}
}

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

@@ -30,9 +30,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit and integration tests for the collection merging support.
@@ -56,148 +54,154 @@ public class CollectionMergingTests {
public void mergeList() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithList");
List list = bean.getSomeList();
assertEquals("Incorrect size", 3, list.size());
assertEquals("Rob Harrop", list.get(0));
assertEquals("Rod Johnson", list.get(1));
assertEquals("Juergen Hoeller", list.get(2));
assertThat(list.size()).as("Incorrect size").isEqualTo(3);
assertThat(list.get(0)).isEqualTo("Rob Harrop");
assertThat(list.get(1)).isEqualTo("Rod Johnson");
assertThat(list.get(2)).isEqualTo("Juergen Hoeller");
}
@Test
public void mergeListWithInnerBeanAsListElement() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithListOfRefs");
List list = bean.getSomeList();
assertNotNull(list);
assertEquals(3, list.size());
assertNotNull(list.get(2));
assertTrue(list.get(2) instanceof TestBean);
List<?> list = bean.getSomeList();
assertThat(list).isNotNull();
assertThat(list.size()).isEqualTo(3);
assertThat(list.get(2)).isNotNull();
boolean condition = list.get(2) instanceof TestBean;
assertThat(condition).isTrue();
}
@Test
public void mergeSet() {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSet");
Set set = bean.getSomeSet();
assertEquals("Incorrect size", 2, set.size());
assertTrue(set.contains("Rob Harrop"));
assertTrue(set.contains("Sally Greenwood"));
assertThat(set.size()).as("Incorrect size").isEqualTo(2);
assertThat(set.contains("Rob Harrop")).isTrue();
assertThat(set.contains("Sally Greenwood")).isTrue();
}
@Test
public void mergeSetWithInnerBeanAsSetElement() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetOfRefs");
Set set = bean.getSomeSet();
assertNotNull(set);
assertEquals(2, set.size());
Set<?> set = bean.getSomeSet();
assertThat(set).isNotNull();
assertThat(set.size()).isEqualTo(2);
Iterator it = set.iterator();
it.next();
Object o = it.next();
assertNotNull(o);
assertTrue(o instanceof TestBean);
assertEquals("Sally", ((TestBean) o).getName());
assertThat(o).isNotNull();
boolean condition = o instanceof TestBean;
assertThat(condition).isTrue();
assertThat(((TestBean) o).getName()).isEqualTo("Sally");
}
@Test
public void mergeMap() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMap");
Map map = bean.getSomeMap();
assertEquals("Incorrect size", 3, map.size());
assertEquals("Sally", map.get("Rob"));
assertEquals("Kerry", map.get("Rod"));
assertEquals("Eva", map.get("Juergen"));
assertThat(map.size()).as("Incorrect size").isEqualTo(3);
assertThat(map.get("Rob")).isEqualTo("Sally");
assertThat(map.get("Rod")).isEqualTo("Kerry");
assertThat(map.get("Juergen")).isEqualTo("Eva");
}
@Test
public void mergeMapWithInnerBeanAsMapEntryValue() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapOfRefs");
Map map = bean.getSomeMap();
assertNotNull(map);
assertEquals(2, map.size());
assertNotNull(map.get("Rob"));
assertTrue(map.get("Rob") instanceof TestBean);
assertEquals("Sally", ((TestBean) map.get("Rob")).getName());
Map<?, ?> map = bean.getSomeMap();
assertThat(map).isNotNull();
assertThat(map.size()).isEqualTo(2);
assertThat(map.get("Rob")).isNotNull();
boolean condition = map.get("Rob") instanceof TestBean;
assertThat(condition).isTrue();
assertThat(((TestBean) map.get("Rob")).getName()).isEqualTo("Sally");
}
@Test
public void mergeProperties() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithProps");
Properties props = bean.getSomeProperties();
assertEquals("Incorrect size", 3, props.size());
assertEquals("Sally", props.getProperty("Rob"));
assertEquals("Kerry",props.getProperty("Rod"));
assertEquals("Eva", props.getProperty("Juergen"));
assertThat(props.size()).as("Incorrect size").isEqualTo(3);
assertThat(props.getProperty("Rob")).isEqualTo("Sally");
assertThat(props.getProperty("Rod")).isEqualTo("Kerry");
assertThat(props.getProperty("Juergen")).isEqualTo("Eva");
}
@Test
public void mergeListInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithListInConstructor");
List list = bean.getSomeList();
assertEquals("Incorrect size", 3, list.size());
assertEquals("Rob Harrop", list.get(0));
assertEquals("Rod Johnson", list.get(1));
assertEquals("Juergen Hoeller", list.get(2));
assertThat(list.size()).as("Incorrect size").isEqualTo(3);
assertThat(list.get(0)).isEqualTo("Rob Harrop");
assertThat(list.get(1)).isEqualTo("Rod Johnson");
assertThat(list.get(2)).isEqualTo("Juergen Hoeller");
}
@Test
public void mergeListWithInnerBeanAsListElementInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithListOfRefsInConstructor");
List list = bean.getSomeList();
assertNotNull(list);
assertEquals(3, list.size());
assertNotNull(list.get(2));
assertTrue(list.get(2) instanceof TestBean);
List<?> list = bean.getSomeList();
assertThat(list).isNotNull();
assertThat(list.size()).isEqualTo(3);
assertThat(list.get(2)).isNotNull();
boolean condition = list.get(2) instanceof TestBean;
assertThat(condition).isTrue();
}
@Test
public void mergeSetInConstructor() {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetInConstructor");
Set set = bean.getSomeSet();
assertEquals("Incorrect size", 2, set.size());
assertTrue(set.contains("Rob Harrop"));
assertTrue(set.contains("Sally Greenwood"));
assertThat(set.size()).as("Incorrect size").isEqualTo(2);
assertThat(set.contains("Rob Harrop")).isTrue();
assertThat(set.contains("Sally Greenwood")).isTrue();
}
@Test
public void mergeSetWithInnerBeanAsSetElementInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetOfRefsInConstructor");
Set set = bean.getSomeSet();
assertNotNull(set);
assertEquals(2, set.size());
Set<?> set = bean.getSomeSet();
assertThat(set).isNotNull();
assertThat(set.size()).isEqualTo(2);
Iterator it = set.iterator();
it.next();
Object o = it.next();
assertNotNull(o);
assertTrue(o instanceof TestBean);
assertEquals("Sally", ((TestBean) o).getName());
assertThat(o).isNotNull();
boolean condition = o instanceof TestBean;
assertThat(condition).isTrue();
assertThat(((TestBean) o).getName()).isEqualTo("Sally");
}
@Test
public void mergeMapInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapInConstructor");
Map map = bean.getSomeMap();
assertEquals("Incorrect size", 3, map.size());
assertEquals("Sally", map.get("Rob"));
assertEquals("Kerry", map.get("Rod"));
assertEquals("Eva", map.get("Juergen"));
assertThat(map.size()).as("Incorrect size").isEqualTo(3);
assertThat(map.get("Rob")).isEqualTo("Sally");
assertThat(map.get("Rod")).isEqualTo("Kerry");
assertThat(map.get("Juergen")).isEqualTo("Eva");
}
@Test
public void mergeMapWithInnerBeanAsMapEntryValueInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapOfRefsInConstructor");
Map map = bean.getSomeMap();
assertNotNull(map);
assertEquals(2, map.size());
assertNotNull(map.get("Rob"));
assertTrue(map.get("Rob") instanceof TestBean);
assertEquals("Sally", ((TestBean) map.get("Rob")).getName());
Map<?, ?> map = bean.getSomeMap();
assertThat(map).isNotNull();
assertThat(map.size()).isEqualTo(2);
assertThat(map.get("Rob")).isNotNull();
boolean condition = map.get("Rob") instanceof TestBean;
assertThat(condition).isTrue();
assertThat(((TestBean) map.get("Rob")).getName()).isEqualTo("Sally");
}
@Test
public void mergePropertiesInConstructor() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("childWithPropsInConstructor");
Properties props = bean.getSomeProperties();
assertEquals("Incorrect size", 3, props.size());
assertEquals("Sally", props.getProperty("Rob"));
assertEquals("Kerry", props.getProperty("Rod"));
assertEquals("Eva", props.getProperty("Juergen"));
assertThat(props.size()).as("Incorrect size").isEqualTo(3);
assertThat(props.getProperty("Rob")).isEqualTo("Sally");
assertThat(props.getProperty("Rod")).isEqualTo("Kerry");
assertThat(props.getProperty("Juergen")).isEqualTo("Eva");
}
}

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

@@ -25,8 +25,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -46,7 +45,7 @@ public class CollectionsWithDefaultTypesTests {
public void testListHasDefaultType() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
for (Object o : bean.getSomeList()) {
assertEquals("Value type is incorrect", Integer.class, o.getClass());
assertThat(o.getClass()).as("Value type is incorrect").isEqualTo(Integer.class);
}
}
@@ -54,7 +53,7 @@ public class CollectionsWithDefaultTypesTests {
public void testSetHasDefaultType() throws Exception {
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
for (Object o : bean.getSomeSet()) {
assertEquals("Value type is incorrect", Integer.class, o.getClass());
assertThat(o.getClass()).as("Value type is incorrect").isEqualTo(Integer.class);
}
}
@@ -73,8 +72,8 @@ public class CollectionsWithDefaultTypesTests {
@SuppressWarnings("rawtypes")
private void assertMap(Map<?,?> map) {
for (Map.Entry entry : map.entrySet()) {
assertEquals("Key type is incorrect", Integer.class, entry.getKey().getClass());
assertEquals("Value type is incorrect", Boolean.class, entry.getValue().getClass());
assertThat(entry.getKey().getClass()).as("Key type is incorrect").isEqualTo(Integer.class);
assertThat(entry.getValue().getClass()).as("Value type is incorrect").isEqualTo(Boolean.class);
}
}
@@ -82,16 +81,15 @@ public class CollectionsWithDefaultTypesTests {
@SuppressWarnings("rawtypes")
public void testBuildCollectionFromMixtureOfReferencesAndValues() throws Exception {
MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble");
assertTrue("Expected 3 elements, not " + jumble.getJumble().size(),
jumble.getJumble().size() == 3);
assertThat(jumble.getJumble().size() == 3).as("Expected 3 elements, not " + jumble.getJumble().size()).isTrue();
List l = (List) jumble.getJumble();
assertTrue(l.get(0).equals("literal"));
assertThat(l.get(0).equals("literal")).isTrue();
Integer[] array1 = (Integer[]) l.get(1);
assertTrue(array1[0].equals(new Integer(2)));
assertTrue(array1[1].equals(new Integer(4)));
assertThat(array1[0].equals(new Integer(2))).isTrue();
assertThat(array1[1].equals(new Integer(4))).isTrue();
int[] array2 = (int[]) l.get(2);
assertTrue(array2[0] == 3);
assertTrue(array2[1] == 5);
assertThat(array2[0] == 3).isTrue();
assertThat(array2[1] == 5).isTrue();
}
}

47
spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
View File

@@ -22,8 +22,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -44,22 +43,22 @@ public class DefaultLifecycleMethodsTests {
@Test
public void lifecycleMethodsInvoked() {
LifecycleAwareBean bean = (LifecycleAwareBean) this.beanFactory.getBean("lifecycleAware");
assertTrue("Bean not initialized", bean.isInitCalled());
assertFalse("Custom init method called incorrectly", bean.isCustomInitCalled());
assertFalse("Bean destroyed too early", bean.isDestroyCalled());
assertThat(bean.isInitCalled()).as("Bean not initialized").isTrue();
assertThat(bean.isCustomInitCalled()).as("Custom init method called incorrectly").isFalse();
assertThat(bean.isDestroyCalled()).as("Bean destroyed too early").isFalse();
this.beanFactory.destroySingletons();
assertTrue("Bean not destroyed", bean.isDestroyCalled());
assertFalse("Custom destroy method called incorrectly", bean.isCustomDestroyCalled());
assertThat(bean.isDestroyCalled()).as("Bean not destroyed").isTrue();
assertThat(bean.isCustomDestroyCalled()).as("Custom destroy method called incorrectly").isFalse();
}
@Test
public void lifecycleMethodsDisabled() throws Exception {
LifecycleAwareBean bean = (LifecycleAwareBean) this.beanFactory.getBean("lifecycleMethodsDisabled");
assertFalse("Bean init method called incorrectly", bean.isInitCalled());
assertFalse("Custom init method called incorrectly", bean.isCustomInitCalled());
assertThat(bean.isInitCalled()).as("Bean init method called incorrectly").isFalse();
assertThat(bean.isCustomInitCalled()).as("Custom init method called incorrectly").isFalse();
this.beanFactory.destroySingletons();
assertFalse("Bean destroy method called incorrectly", bean.isDestroyCalled());
assertFalse("Custom destroy method called incorrectly", bean.isCustomDestroyCalled());
assertThat(bean.isDestroyCalled()).as("Bean destroy method called incorrectly").isFalse();
assertThat(bean.isCustomDestroyCalled()).as("Custom destroy method called incorrectly").isFalse();
}
@Test
@@ -74,32 +73,32 @@ public class DefaultLifecycleMethodsTests {
@Test
public void overrideDefaultLifecycleMethods() throws Exception {
LifecycleAwareBean bean = (LifecycleAwareBean) this.beanFactory.getBean("overrideLifecycleMethods");
assertFalse("Default init method called incorrectly", bean.isInitCalled());
assertTrue("Custom init method not called", bean.isCustomInitCalled());
assertThat(bean.isInitCalled()).as("Default init method called incorrectly").isFalse();
assertThat(bean.isCustomInitCalled()).as("Custom init method not called").isTrue();
this.beanFactory.destroySingletons();
assertFalse("Default destroy method called incorrectly", bean.isDestroyCalled());
assertTrue("Custom destroy method not called", bean.isCustomDestroyCalled());
assertThat(bean.isDestroyCalled()).as("Default destroy method called incorrectly").isFalse();
assertThat(bean.isCustomDestroyCalled()).as("Custom destroy method not called").isTrue();
}
@Test
public void childWithDefaultLifecycleMethods() throws Exception {
LifecycleAwareBean bean = (LifecycleAwareBean) this.beanFactory.getBean("childWithDefaultLifecycleMethods");
assertTrue("Bean not initialized", bean.isInitCalled());
assertFalse("Custom init method called incorrectly", bean.isCustomInitCalled());
assertFalse("Bean destroyed too early", bean.isDestroyCalled());
assertThat(bean.isInitCalled()).as("Bean not initialized").isTrue();
assertThat(bean.isCustomInitCalled()).as("Custom init method called incorrectly").isFalse();
assertThat(bean.isDestroyCalled()).as("Bean destroyed too early").isFalse();
this.beanFactory.destroySingletons();
assertTrue("Bean not destroyed", bean.isDestroyCalled());
assertFalse("Custom destroy method called incorrectly", bean.isCustomDestroyCalled());
assertThat(bean.isDestroyCalled()).as("Bean not destroyed").isTrue();
assertThat(bean.isCustomDestroyCalled()).as("Custom destroy method called incorrectly").isFalse();
}
@Test
public void childWithLifecycleMethodsDisabled() throws Exception {
LifecycleAwareBean bean = (LifecycleAwareBean) this.beanFactory.getBean("childWithLifecycleMethodsDisabled");
assertFalse("Bean init method called incorrectly", bean.isInitCalled());
assertFalse("Custom init method called incorrectly", bean.isCustomInitCalled());
assertThat(bean.isInitCalled()).as("Bean init method called incorrectly").isFalse();
assertThat(bean.isCustomInitCalled()).as("Custom init method called incorrectly").isFalse();
this.beanFactory.destroySingletons();
assertFalse("Bean destroy method called incorrectly", bean.isDestroyCalled());
assertFalse("Custom destroy method called incorrectly", bean.isCustomDestroyCalled());
assertThat(bean.isDestroyCalled()).as("Bean destroy method called incorrectly").isFalse();
assertThat(bean.isCustomDestroyCalled()).as("Custom destroy method called incorrectly").isFalse();
}

79
spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
View File

@@ -33,8 +33,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.beans.CollectingReaderEventListener;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -60,66 +59,72 @@ public class EventPublicationTests {
@Test
public void defaultsEventReceived() throws Exception {
List defaultsList = this.eventListener.getDefaults();
assertTrue(!defaultsList.isEmpty());
assertTrue(defaultsList.get(0) instanceof DocumentDefaultsDefinition);
boolean condition2 = !defaultsList.isEmpty();
assertThat(condition2).isTrue();
boolean condition1 = defaultsList.get(0) instanceof DocumentDefaultsDefinition;
assertThat(condition1).isTrue();
DocumentDefaultsDefinition defaults = (DocumentDefaultsDefinition) defaultsList.get(0);
assertEquals("true", defaults.getLazyInit());
assertEquals("constructor", defaults.getAutowire());
assertEquals("myInit", defaults.getInitMethod());
assertEquals("myDestroy", defaults.getDestroyMethod());
assertEquals("true", defaults.getMerge());
assertTrue(defaults.getSource() instanceof Element);
assertThat(defaults.getLazyInit()).isEqualTo("true");
assertThat(defaults.getAutowire()).isEqualTo("constructor");
assertThat(defaults.getInitMethod()).isEqualTo("myInit");
assertThat(defaults.getDestroyMethod()).isEqualTo("myDestroy");
assertThat(defaults.getMerge()).isEqualTo("true");
boolean condition = defaults.getSource() instanceof Element;
assertThat(condition).isTrue();
}
@Test
public void beanEventReceived() throws Exception {
ComponentDefinition componentDefinition1 = this.eventListener.getComponentDefinition("testBean");
assertTrue(componentDefinition1 instanceof BeanComponentDefinition);
assertEquals(1, componentDefinition1.getBeanDefinitions().length);
boolean condition3 = componentDefinition1 instanceof BeanComponentDefinition;
assertThat(condition3).isTrue();
assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1);
BeanDefinition beanDefinition1 = componentDefinition1.getBeanDefinitions()[0];
assertEquals(new TypedStringValue("Rob Harrop"),
beanDefinition1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue());
assertEquals(1, componentDefinition1.getBeanReferences().length);
assertEquals("testBean2", componentDefinition1.getBeanReferences()[0].getBeanName());
assertEquals(1, componentDefinition1.getInnerBeanDefinitions().length);
assertThat(beanDefinition1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("Rob Harrop"));
assertThat(componentDefinition1.getBeanReferences().length).isEqualTo(1);
assertThat(componentDefinition1.getBeanReferences()[0].getBeanName()).isEqualTo("testBean2");
assertThat(componentDefinition1.getInnerBeanDefinitions().length).isEqualTo(1);
BeanDefinition innerBd1 = componentDefinition1.getInnerBeanDefinitions()[0];
assertEquals(new TypedStringValue("ACME"),
innerBd1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue());
assertTrue(componentDefinition1.getSource() instanceof Element);
assertThat(innerBd1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("ACME"));
boolean condition2 = componentDefinition1.getSource() instanceof Element;
assertThat(condition2).isTrue();
ComponentDefinition componentDefinition2 = this.eventListener.getComponentDefinition("testBean2");
assertTrue(componentDefinition2 instanceof BeanComponentDefinition);
assertEquals(1, componentDefinition1.getBeanDefinitions().length);
boolean condition1 = componentDefinition2 instanceof BeanComponentDefinition;
assertThat(condition1).isTrue();
assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1);
BeanDefinition beanDefinition2 = componentDefinition2.getBeanDefinitions()[0];
assertEquals(new TypedStringValue("Juergen Hoeller"),
beanDefinition2.getPropertyValues().getPropertyValue("name").getValue());
assertEquals(0, componentDefinition2.getBeanReferences().length);
assertEquals(1, componentDefinition2.getInnerBeanDefinitions().length);
assertThat(beanDefinition2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Juergen Hoeller"));
assertThat(componentDefinition2.getBeanReferences().length).isEqualTo(0);
assertThat(componentDefinition2.getInnerBeanDefinitions().length).isEqualTo(1);
BeanDefinition innerBd2 = componentDefinition2.getInnerBeanDefinitions()[0];
assertEquals(new TypedStringValue("Eva Schallmeiner"),
innerBd2.getPropertyValues().getPropertyValue("name").getValue());
assertTrue(componentDefinition2.getSource() instanceof Element);
assertThat(innerBd2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Eva Schallmeiner"));
boolean condition = componentDefinition2.getSource() instanceof Element;
assertThat(condition).isTrue();
}
@Test
public void aliasEventReceived() throws Exception {
List aliases = this.eventListener.getAliases("testBean");
assertEquals(2, aliases.size());
assertThat(aliases.size()).isEqualTo(2);
AliasDefinition aliasDefinition1 = (AliasDefinition) aliases.get(0);
assertEquals("testBeanAlias1", aliasDefinition1.getAlias());
assertTrue(aliasDefinition1.getSource() instanceof Element);
assertThat(aliasDefinition1.getAlias()).isEqualTo("testBeanAlias1");
boolean condition1 = aliasDefinition1.getSource() instanceof Element;
assertThat(condition1).isTrue();
AliasDefinition aliasDefinition2 = (AliasDefinition) aliases.get(1);
assertEquals("testBeanAlias2", aliasDefinition2.getAlias());
assertTrue(aliasDefinition2.getSource() instanceof Element);
assertThat(aliasDefinition2.getAlias()).isEqualTo("testBeanAlias2");
boolean condition = aliasDefinition2.getSource() instanceof Element;
assertThat(condition).isTrue();
}
@Test
public void importEventReceived() throws Exception {
List imports = this.eventListener.getImports();
assertEquals(1, imports.size());
assertThat(imports.size()).isEqualTo(1);
ImportDefinition importDefinition = (ImportDefinition) imports.get(0);
assertEquals("beanEventsImported.xml", importDefinition.getImportedResource());
assertTrue(importDefinition.getSource() instanceof Element);
assertThat(importDefinition.getImportedResource()).isEqualTo("beanEventsImported.xml");
boolean condition = importDefinition.getSource() instanceof Element;
assertThat(condition).isTrue();
}
}

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

@@ -28,11 +28,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/**
* @author Juergen Hoeller
@@ -47,31 +44,31 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
TestBean tb = (TestBean) xbf.getBean("defaultTestBean");
assertEquals("defaultInstance", tb.getName());
assertEquals(1, tb.getAge());
assertThat(tb.getName()).isEqualTo("defaultInstance");
assertThat(tb.getAge()).isEqualTo(1);
FactoryMethods fm = (FactoryMethods) xbf.getBean("default");
assertEquals(0, fm.getNum());
assertEquals("default", fm.getName());
assertEquals("defaultInstance", fm.getTestBean().getName());
assertEquals("setterString", fm.getStringValue());
assertThat(fm.getNum()).isEqualTo(0);
assertThat(fm.getName()).isEqualTo("default");
assertThat(fm.getTestBean().getName()).isEqualTo("defaultInstance");
assertThat(fm.getStringValue()).isEqualTo("setterString");
fm = (FactoryMethods) xbf.getBean("testBeanOnly");
assertEquals(0, fm.getNum());
assertEquals("default", fm.getName());
assertThat(fm.getNum()).isEqualTo(0);
assertThat(fm.getName()).isEqualTo("default");
// This comes from the test bean
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
fm = (FactoryMethods) xbf.getBean("full");
assertEquals(27, fm.getNum());
assertEquals("gotcha", fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo("gotcha");
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("full");
assertSame(fm, fm2);
assertThat(fm2).isSameAs(fm);
xbf.destroySingletons();
assertTrue(tb.wasDestroyed());
assertThat(tb.wasDestroyed()).isTrue();
}
@Test
@@ -89,7 +86,7 @@ public class FactoryMethodTests {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
assertEquals("null", xbf.getBean("null").toString());
assertThat(xbf.getBean("null").toString()).isEqualTo("null");
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
xbf.getBean("nullWithProperty"));
}
@@ -101,19 +98,19 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
FactoryMethods fm = (FactoryMethods) xbf.getBean("fullWithNull");
assertEquals(27, fm.getNum());
assertEquals(null, fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo(null);
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
fm = (FactoryMethods) xbf.getBean("fullWithGenericNull");
assertEquals(27, fm.getNum());
assertEquals(null, fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo(null);
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
fm = (FactoryMethods) xbf.getBean("fullWithNamedNull");
assertEquals(27, fm.getNum());
assertEquals(null, fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo(null);
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
}
@Test
@@ -123,9 +120,9 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
FactoryMethods fm = (FactoryMethods) xbf.getBean("fullWithAutowire");
assertEquals(27, fm.getNum());
assertEquals("gotchaAutowired", fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo("gotchaAutowired");
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
}
@Test
@@ -135,7 +132,7 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
TestBean tb = (TestBean) xbf.getBean("defaultTestBean.protected");
assertEquals(1, tb.getAge());
assertThat(tb.getAge()).isEqualTo(1);
}
@Test
@@ -145,7 +142,7 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
TestBean tb = (TestBean) xbf.getBean("defaultTestBean.private");
assertEquals(1, tb.getAge());
assertThat(tb.getAge()).isEqualTo(1);
}
@Test
@@ -155,38 +152,38 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
FactoryMethods fm = (FactoryMethods) xbf.getBean("defaultPrototype");
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("defaultPrototype");
assertEquals(0, fm.getNum());
assertEquals("default", fm.getName());
assertEquals("defaultInstance", fm.getTestBean().getName());
assertEquals("setterString", fm.getStringValue());
assertEquals(fm.getNum(), fm2.getNum());
assertEquals(fm.getStringValue(), fm2.getStringValue());
assertThat(fm.getNum()).isEqualTo(0);
assertThat(fm.getName()).isEqualTo("default");
assertThat(fm.getTestBean().getName()).isEqualTo("defaultInstance");
assertThat(fm.getStringValue()).isEqualTo("setterString");
assertThat(fm2.getNum()).isEqualTo(fm.getNum());
assertThat(fm2.getStringValue()).isEqualTo(fm.getStringValue());
// The TestBean is created separately for each bean
assertNotSame(fm.getTestBean(), fm2.getTestBean());
assertNotSame(fm, fm2);
assertThat(fm2.getTestBean()).isNotSameAs(fm.getTestBean());
assertThat(fm2).isNotSameAs(fm);
fm = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype");
fm2 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype");
assertEquals(0, fm.getNum());
assertEquals("default", fm.getName());
assertThat(fm.getNum()).isEqualTo(0);
assertThat(fm.getName()).isEqualTo("default");
// This comes from the test bean
assertEquals("Juergen", fm.getTestBean().getName());
assertEquals(fm.getNum(), fm2.getNum());
assertEquals(fm.getStringValue(), fm2.getStringValue());
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
assertThat(fm2.getNum()).isEqualTo(fm.getNum());
assertThat(fm2.getStringValue()).isEqualTo(fm.getStringValue());
// The TestBean reference is resolved to a prototype in the factory
assertSame(fm.getTestBean(), fm2.getTestBean());
assertNotSame(fm, fm2);
assertThat(fm2.getTestBean()).isSameAs(fm.getTestBean());
assertThat(fm2).isNotSameAs(fm);
fm = (FactoryMethods) xbf.getBean("fullPrototype");
fm2 = (FactoryMethods) xbf.getBean("fullPrototype");
assertEquals(27, fm.getNum());
assertEquals("gotcha", fm.getName());
assertEquals("Juergen", fm.getTestBean().getName());
assertEquals(fm.getNum(), fm2.getNum());
assertEquals(fm.getStringValue(), fm2.getStringValue());
assertThat(fm.getNum()).isEqualTo(27);
assertThat(fm.getName()).isEqualTo("gotcha");
assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
assertThat(fm2.getNum()).isEqualTo(fm.getNum());
assertThat(fm2.getStringValue()).isEqualTo(fm.getStringValue());
// The TestBean reference is resolved to a prototype in the factory
assertSame(fm.getTestBean(), fm2.getTestBean());
assertNotSame(fm, fm2);
assertThat(fm2.getTestBean()).isSameAs(fm.getTestBean());
assertThat(fm2).isNotSameAs(fm);
}
/**
@@ -198,24 +195,24 @@ public class FactoryMethodTests {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
assertEquals(TestBean.class, xbf.getType("externalFactoryMethodWithoutArgs"));
assertEquals(TestBean.class, xbf.getType("externalFactoryMethodWithArgs"));
assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
String[] names = xbf.getBeanNamesForType(TestBean.class);
assertTrue(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs"));
assertTrue(Arrays.asList(names).contains("externalFactoryMethodWithArgs"));
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
TestBean tb = (TestBean) xbf.getBean("externalFactoryMethodWithoutArgs");
assertEquals(2, tb.getAge());
assertEquals("Tristan", tb.getName());
assertThat(tb.getAge()).isEqualTo(2);
assertThat(tb.getName()).isEqualTo("Tristan");
tb = (TestBean) xbf.getBean("externalFactoryMethodWithArgs");
assertEquals(33, tb.getAge());
assertEquals("Rod", tb.getName());
assertThat(tb.getAge()).isEqualTo(33);
assertThat(tb.getName()).isEqualTo("Rod");
assertEquals(TestBean.class, xbf.getType("externalFactoryMethodWithoutArgs"));
assertEquals(TestBean.class, xbf.getType("externalFactoryMethodWithArgs"));
assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
names = xbf.getBeanNamesForType(TestBean.class);
assertTrue(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs"));
assertTrue(Arrays.asList(names).contains("externalFactoryMethodWithArgs"));
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
}
@Test
@@ -226,14 +223,14 @@ public class FactoryMethodTests {
InstanceFactory.count = 0;
xbf.preInstantiateSingletons();
assertEquals(1, InstanceFactory.count);
assertThat(InstanceFactory.count).isEqualTo(1);
FactoryMethods fm = (FactoryMethods) xbf.getBean("instanceFactoryMethodWithoutArgs");
assertEquals("instanceFactory", fm.getTestBean().getName());
assertEquals(1, InstanceFactory.count);
assertThat(fm.getTestBean().getName()).isEqualTo("instanceFactory");
assertThat(InstanceFactory.count).isEqualTo(1);
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("instanceFactoryMethodWithoutArgs");
assertEquals("instanceFactory", fm2.getTestBean().getName());
assertSame(fm2, fm);
assertEquals(1, InstanceFactory.count);
assertThat(fm2.getTestBean().getName()).isEqualTo("instanceFactory");
assertThat(fm).isSameAs(fm2);
assertThat(InstanceFactory.count).isEqualTo(1);
}
@Test
@@ -276,29 +273,29 @@ public class FactoryMethodTests {
tbArg2.setName("arg2");
FactoryMethods fm1 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype", tbArg);
assertEquals(0, fm1.getNum());
assertEquals("default", fm1.getName());
assertThat(fm1.getNum()).isEqualTo(0);
assertThat(fm1.getName()).isEqualTo("default");
// This comes from the test bean
assertEquals("arg1", fm1.getTestBean().getName());
assertThat(fm1.getTestBean().getName()).isEqualTo("arg1");
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype", tbArg2);
assertEquals("arg2", fm2.getTestBean().getName());
assertEquals(fm1.getNum(), fm2.getNum());
assertEquals(fm2.getStringValue(), "testBeanOnlyPrototypeDISetterString");
assertEquals(fm2.getStringValue(), fm2.getStringValue());
assertThat(fm2.getTestBean().getName()).isEqualTo("arg2");
assertThat(fm2.getNum()).isEqualTo(fm1.getNum());
assertThat("testBeanOnlyPrototypeDISetterString").isEqualTo(fm2.getStringValue());
assertThat(fm2.getStringValue()).isEqualTo(fm2.getStringValue());
// The TestBean reference is resolved to a prototype in the factory
assertSame(fm2.getTestBean(), fm2.getTestBean());
assertNotSame(fm1, fm2);
assertThat(fm2.getTestBean()).isSameAs(fm2.getTestBean());
assertThat(fm2).isNotSameAs(fm1);
FactoryMethods fm3 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype", tbArg2, new Integer(1), "myName");
assertEquals(1, fm3.getNum());
assertEquals("myName", fm3.getName());
assertEquals("arg2", fm3.getTestBean().getName());
assertThat(fm3.getNum()).isEqualTo(1);
assertThat(fm3.getName()).isEqualTo("myName");
assertThat(fm3.getTestBean().getName()).isEqualTo("arg2");
FactoryMethods fm4 = (FactoryMethods) xbf.getBean("testBeanOnlyPrototype", tbArg);
assertEquals(0, fm4.getNum());
assertEquals("default", fm4.getName());
assertEquals("arg1", fm4.getTestBean().getName());
assertThat(fm4.getNum()).isEqualTo(0);
assertThat(fm4.getName()).isEqualTo("default");
assertThat(fm4.getTestBean().getName()).isEqualTo("arg1");
}
@Test
@@ -310,10 +307,10 @@ public class FactoryMethodTests {
// First getBean call triggers actual creation of the singleton bean
TestBean tb = new TestBean();
FactoryMethods fm1 = (FactoryMethods) xbf.getBean("testBeanOnly", tb);
assertSame(tb, fm1.getTestBean());
assertThat(fm1.getTestBean()).isSameAs(tb);
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnly", new TestBean());
assertSame(fm1, fm2);
assertSame(tb, fm2.getTestBean());
assertThat(fm2).isSameAs(fm1);
assertThat(fm2.getTestBean()).isSameAs(tb);
}
@Test
@@ -326,8 +323,8 @@ public class FactoryMethodTests {
FactoryMethods fm1 = (FactoryMethods) xbf.getBean("testBeanOnly");
TestBean tb = fm1.getTestBean();
FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnly", new TestBean());
assertSame(fm1, fm2);
assertSame(tb, fm2.getTestBean());
assertThat(fm2).isSameAs(fm1);
assertThat(fm2.getTestBean()).isSameAs(tb);
}
@Test
@@ -337,20 +334,22 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
// Check that listInstance is not considered a bean of type FactoryMethods.
assertTrue(List.class.isAssignableFrom(xbf.getType("listInstance")));
assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
String[] names = xbf.getBeanNamesForType(FactoryMethods.class);
assertTrue(!Arrays.asList(names).contains("listInstance"));
boolean condition1 = !Arrays.asList(names).contains("listInstance");
assertThat(condition1).isTrue();
names = xbf.getBeanNamesForType(List.class);
assertTrue(Arrays.asList(names).contains("listInstance"));
assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
xbf.preInstantiateSingletons();
assertTrue(List.class.isAssignableFrom(xbf.getType("listInstance")));
assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
names = xbf.getBeanNamesForType(FactoryMethods.class);
assertTrue(!Arrays.asList(names).contains("listInstance"));
boolean condition = !Arrays.asList(names).contains("listInstance");
assertThat(condition).isTrue();
names = xbf.getBeanNamesForType(List.class);
assertTrue(Arrays.asList(names).contains("listInstance"));
assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
List<?> list = (List<?>) xbf.getBean("listInstance");
assertEquals(Collections.EMPTY_LIST, list);
assertThat(list).isEqualTo(Collections.EMPTY_LIST);
}
@Test
@@ -360,8 +359,8 @@ public class FactoryMethodTests {
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
MailSession session = (MailSession) xbf.getBean("javaMailSession");
assertEquals("someuser", session.getProperty("mail.smtp.user"));
assertEquals("somepw", session.getProperty("mail.smtp.password"));
assertThat(session.getProperty("mail.smtp.user")).isEqualTo("someuser");
assertThat(session.getProperty("mail.smtp.password")).isEqualTo("somepw");
}
}

10
spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -44,21 +44,21 @@ public class MetadataAttachmentTests {
@Test
public void metadataAttachment() throws Exception {
BeanDefinition beanDefinition1 = this.beanFactory.getMergedBeanDefinition("testBean1");
assertEquals("bar", beanDefinition1.getAttribute("foo"));
assertThat(beanDefinition1.getAttribute("foo")).isEqualTo("bar");
}
@Test
public void metadataIsInherited() throws Exception {
BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("testBean2");
assertEquals("Metadata not inherited", "bar", beanDefinition.getAttribute("foo"));
assertEquals("Child metdata not attached", "123", beanDefinition.getAttribute("abc"));
assertThat(beanDefinition.getAttribute("foo")).as("Metadata not inherited").isEqualTo("bar");
assertThat(beanDefinition.getAttribute("abc")).as("Child metdata not attached").isEqualTo("123");
}
@Test
public void propertyMetadata() throws Exception {
BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("testBean3");
PropertyValue pv = beanDefinition.getPropertyValues().getPropertyValue("name");
assertEquals("Harrop", pv.getAttribute("surname"));
assertThat(pv.getAttribute("surname")).isEqualTo("Harrop");
}
}

7
spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
View File

@@ -24,9 +24,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
* @author Rob Harrop
@@ -60,8 +59,8 @@ public class SchemaValidationTests {
reader.loadBeanDefinitions(new ClassPathResource("schemaValidated.xml", getClass()));
TestBean foo = (TestBean) bf.getBean("fooBean");
assertNotNull("Spouse is null", foo.getSpouse());
assertEquals("Incorrect number of friends", 2, foo.getFriends().size());
assertThat(foo.getSpouse()).as("Spouse is null").isNotNull();
assertThat(foo.getFriends().size()).as("Incorrect number of friends").isEqualTo(2);
}
}

28
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
View File

@@ -24,8 +24,8 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.DummyBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
/**
* @author Costin Leau
@@ -38,7 +38,7 @@ public class SimpleConstructorNamespaceHandlerTests {
String name = "simple";
// beanFactory.getBean("simple1", DummyBean.class);
DummyBean nameValue = beanFactory.getBean(name, DummyBean.class);
assertEquals("simple", nameValue.getValue());
assertThat(nameValue.getValue()).isEqualTo("simple");
}
@Test
@@ -47,7 +47,7 @@ public class SimpleConstructorNamespaceHandlerTests {
String name = "simple-ref";
// beanFactory.getBean("name-value1", TestBean.class);
DummyBean nameValue = beanFactory.getBean(name, DummyBean.class);
assertEquals(beanFactory.getBean("name"), nameValue.getValue());
assertThat(nameValue.getValue()).isEqualTo(beanFactory.getBean("name"));
}
@Test
@@ -56,8 +56,8 @@ public class SimpleConstructorNamespaceHandlerTests {
String name = "name-value";
// beanFactory.getBean("name-value1", TestBean.class);
TestBean nameValue = beanFactory.getBean(name, TestBean.class);
assertEquals(name, nameValue.getName());
assertEquals(10, nameValue.getAge());
assertThat(nameValue.getName()).isEqualTo(name);
assertThat(nameValue.getAge()).isEqualTo(10);
}
@Test
@@ -66,8 +66,8 @@ public class SimpleConstructorNamespaceHandlerTests {
TestBean nameValue = beanFactory.getBean("name-value", TestBean.class);
DummyBean nameRef = beanFactory.getBean("name-ref", DummyBean.class);
assertEquals("some-name", nameRef.getName());
assertEquals(nameValue, nameRef.getSpouse());
assertThat(nameRef.getName()).isEqualTo("some-name");
assertThat(nameRef.getSpouse()).isEqualTo(nameValue);
}
@Test
@@ -75,9 +75,9 @@ public class SimpleConstructorNamespaceHandlerTests {
DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
DummyBean typeRef = beanFactory.getBean("indexed-value", DummyBean.class);
assertEquals("at", typeRef.getName());
assertEquals("austria", typeRef.getValue());
assertEquals(10, typeRef.getAge());
assertThat(typeRef.getName()).isEqualTo("at");
assertThat(typeRef.getValue()).isEqualTo("austria");
assertThat(typeRef.getAge()).isEqualTo(10);
}
@Test
@@ -85,8 +85,8 @@ public class SimpleConstructorNamespaceHandlerTests {
DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
DummyBean typeRef = beanFactory.getBean("indexed-ref", DummyBean.class);
assertEquals("some-name", typeRef.getName());
assertEquals(beanFactory.getBean("name-value"), typeRef.getSpouse());
assertThat(typeRef.getName()).isEqualTo("some-name");
assertThat(typeRef.getSpouse()).isEqualTo(beanFactory.getBean("name-value"));
}
@Test
@@ -101,8 +101,8 @@ public class SimpleConstructorNamespaceHandlerTests {
public void constructorWithNameEndingInRef() throws Exception {
DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
DummyBean derivedBean = beanFactory.getBean("beanWithRefConstructorArg", DummyBean.class);
assertEquals(10, derivedBean.getAge());
assertEquals("silly name", derivedBean.getName());
assertThat(derivedBean.getAge()).isEqualTo(10);
assertThat(derivedBean.getName()).isEqualTo("silly name");
}
private DefaultListableBeanFactory createFactory(String resourceName) {

16
spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
View File

@@ -24,8 +24,8 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
/**
* @author Rob Harrop
@@ -41,9 +41,9 @@ public class SimplePropertyNamespaceHandlerTests {
new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
ITestBean rob = (TestBean) beanFactory.getBean("rob");
ITestBean sally = (TestBean) beanFactory.getBean("sally");
assertEquals("Rob Harrop", rob.getName());
assertEquals(24, rob.getAge());
assertEquals(rob.getSpouse(), sally);
assertThat(rob.getName()).isEqualTo("Rob Harrop");
assertThat(rob.getAge()).isEqualTo(24);
assertThat(sally).isEqualTo(rob.getSpouse());
}
@Test
@@ -53,9 +53,9 @@ public class SimplePropertyNamespaceHandlerTests {
new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
TestBean sally = (TestBean) beanFactory.getBean("sally2");
ITestBean rob = sally.getSpouse();
assertEquals("Rob Harrop", rob.getName());
assertEquals(24, rob.getAge());
assertEquals(rob.getSpouse(), sally);
assertThat(rob.getName()).isEqualTo("Rob Harrop");
assertThat(rob.getAge()).isEqualTo(24);
assertThat(sally).isEqualTo(rob.getSpouse());
}
@Test
@@ -72,7 +72,7 @@ public class SimplePropertyNamespaceHandlerTests {
new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
ITestBean sally = (TestBean) beanFactory.getBean("derivedSally");
assertEquals("r", sally.getSpouse().getName());
assertThat(sally.getSpouse().getName()).isEqualTo("r");
}
}

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

@@ -38,10 +38,7 @@ import org.springframework.tests.sample.beans.CustomEnum;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.LinkedCaseInsensitiveMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Harrop
@@ -68,110 +65,112 @@ public class UtilNamespaceHandlerTests {
@Test
public void testConstant() {
Integer min = (Integer) this.beanFactory.getBean("min");
assertEquals(Integer.MIN_VALUE, min.intValue());
assertThat(min.intValue()).isEqualTo(Integer.MIN_VALUE);
}
@Test
public void testConstantWithDefaultName() {
Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE");
assertEquals(Integer.MAX_VALUE, max.intValue());
assertThat(max.intValue()).isEqualTo(Integer.MAX_VALUE);
}
@Test
public void testEvents() {
ComponentDefinition propertiesComponent = this.listener.getComponentDefinition("myProperties");
assertNotNull("Event for 'myProperties' not sent", propertiesComponent);
assertThat(propertiesComponent).as("Event for 'myProperties' not sent").isNotNull();
AbstractBeanDefinition propertiesBean = (AbstractBeanDefinition) propertiesComponent.getBeanDefinitions()[0];
assertEquals("Incorrect BeanDefinition", PropertiesFactoryBean.class, propertiesBean.getBeanClass());
assertThat(propertiesBean.getBeanClass()).as("Incorrect BeanDefinition").isEqualTo(PropertiesFactoryBean.class);
ComponentDefinition constantComponent = this.listener.getComponentDefinition("min");
assertNotNull("Event for 'min' not sent", propertiesComponent);
assertThat(propertiesComponent).as("Event for 'min' not sent").isNotNull();
AbstractBeanDefinition constantBean = (AbstractBeanDefinition) constantComponent.getBeanDefinitions()[0];
assertEquals("Incorrect BeanDefinition", FieldRetrievingFactoryBean.class, constantBean.getBeanClass());
assertThat(constantBean.getBeanClass()).as("Incorrect BeanDefinition").isEqualTo(FieldRetrievingFactoryBean.class);
}
@Test
public void testNestedProperties() {
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
Properties props = bean.getSomeProperties();
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
}
@Test
public void testPropertyPath() {
String name = (String) this.beanFactory.getBean("name");
assertEquals("Rob Harrop", name);
assertThat(name).isEqualTo("Rob Harrop");
}
@Test
public void testNestedPropertyPath() {
TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
assertEquals("Rob Harrop", bean.getName());
assertThat(bean.getName()).isEqualTo("Rob Harrop");
}
@Test
public void testSimpleMap() {
Map map = (Map) this.beanFactory.getBean("simpleMap");
assertEquals("bar", map.get("foo"));
assertThat(map.get("foo")).isEqualTo("bar");
Map map2 = (Map) this.beanFactory.getBean("simpleMap");
assertTrue(map == map2);
assertThat(map == map2).isTrue();
}
@Test
public void testScopedMap() {
Map map = (Map) this.beanFactory.getBean("scopedMap");
assertEquals("bar", map.get("foo"));
assertThat(map.get("foo")).isEqualTo("bar");
Map map2 = (Map) this.beanFactory.getBean("scopedMap");
assertEquals("bar", map2.get("foo"));
assertTrue(map != map2);
assertThat(map2.get("foo")).isEqualTo("bar");
assertThat(map != map2).isTrue();
}
@Test
public void testSimpleList() {
List list = (List) this.beanFactory.getBean("simpleList");
assertEquals("Rob Harrop", list.get(0));
assertThat(list.get(0)).isEqualTo("Rob Harrop");
List list2 = (List) this.beanFactory.getBean("simpleList");
assertTrue(list == list2);
assertThat(list == list2).isTrue();
}
@Test
public void testScopedList() {
List list = (List) this.beanFactory.getBean("scopedList");
assertEquals("Rob Harrop", list.get(0));
assertThat(list.get(0)).isEqualTo("Rob Harrop");
List list2 = (List) this.beanFactory.getBean("scopedList");
assertEquals("Rob Harrop", list2.get(0));
assertTrue(list != list2);
assertThat(list2.get(0)).isEqualTo("Rob Harrop");
assertThat(list != list2).isTrue();
}
@Test
public void testSimpleSet() {
Set set = (Set) this.beanFactory.getBean("simpleSet");
assertTrue(set.contains("Rob Harrop"));
assertThat(set.contains("Rob Harrop")).isTrue();
Set set2 = (Set) this.beanFactory.getBean("simpleSet");
assertTrue(set == set2);
assertThat(set == set2).isTrue();
}
@Test
public void testScopedSet() {
Set set = (Set) this.beanFactory.getBean("scopedSet");
assertTrue(set.contains("Rob Harrop"));
assertThat(set.contains("Rob Harrop")).isTrue();
Set set2 = (Set) this.beanFactory.getBean("scopedSet");
assertTrue(set2.contains("Rob Harrop"));
assertTrue(set != set2);
assertThat(set2.contains("Rob Harrop")).isTrue();
assertThat(set != set2).isTrue();
}
@Test
public void testMapWithRef() {
Map map = (Map) this.beanFactory.getBean("mapWithRef");
assertTrue(map instanceof TreeMap);
assertEquals(this.beanFactory.getBean("testBean"), map.get("bean"));
boolean condition = map instanceof TreeMap;
assertThat(condition).isTrue();
assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean"));
}
@Test
public void testMapWithTypes() {
Map map = (Map) this.beanFactory.getBean("mapWithTypes");
assertTrue(map instanceof LinkedCaseInsensitiveMap);
assertEquals(this.beanFactory.getBean("testBean"), map.get("bean"));
boolean condition = map instanceof LinkedCaseInsensitiveMap;
assertThat(condition).isTrue();
assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean"));
}
@Test
@@ -179,51 +178,52 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("nestedCollectionsBean");
List list = bean.getSomeList();
assertEquals(1, list.size());
assertEquals("foo", list.get(0));
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo("foo");
Set set = bean.getSomeSet();
assertEquals(1, set.size());
assertTrue(set.contains("bar"));
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains("bar")).isTrue();
Map map = bean.getSomeMap();
assertEquals(1, map.size());
assertTrue(map.get("foo") instanceof Set);
assertThat(map.size()).isEqualTo(1);
boolean condition = map.get("foo") instanceof Set;
assertThat(condition).isTrue();
Set innerSet = (Set) map.get("foo");
assertEquals(1, innerSet.size());
assertTrue(innerSet.contains("bar"));
assertThat(innerSet.size()).isEqualTo(1);
assertThat(innerSet.contains("bar")).isTrue();
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCollectionsBean");
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertEquals(map, bean2.getSomeMap());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
assertFalse(map == bean2.getSomeMap());
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();
}
@Test
public void testNestedShortcutCollections() {
TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
assertEquals(1, bean.getStringArray().length);
assertEquals("fooStr", bean.getStringArray()[0]);
assertThat(bean.getStringArray().length).isEqualTo(1);
assertThat(bean.getStringArray()[0]).isEqualTo("fooStr");
List list = bean.getSomeList();
assertEquals(1, list.size());
assertEquals("foo", list.get(0));
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo("foo");
Set set = bean.getSomeSet();
assertEquals(1, set.size());
assertTrue(set.contains("bar"));
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains("bar")).isTrue();
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
assertTrue(Arrays.equals(bean.getStringArray(), bean2.getStringArray()));
assertFalse(bean.getStringArray() == bean2.getStringArray());
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
assertThat(Arrays.equals(bean.getStringArray(), bean2.getStringArray())).isTrue();
assertThat(bean.getStringArray() == bean2.getStringArray()).isFalse();
assertThat(bean2.getSomeList()).isEqualTo(list);
assertThat(bean2.getSomeSet()).isEqualTo(set);
assertThat(list == bean2.getSomeList()).isFalse();
assertThat(set == bean2.getSomeSet()).isFalse();
}
@Test
@@ -231,25 +231,25 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("nestedCustomTagBean");
List list = bean.getSomeList();
assertEquals(1, list.size());
assertEquals(Integer.MIN_VALUE, list.get(0));
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(Integer.MIN_VALUE);
Set set = bean.getSomeSet();
assertEquals(2, set.size());
assertTrue(set.contains(Thread.State.NEW));
assertTrue(set.contains(Thread.State.RUNNABLE));
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains(Thread.State.NEW)).isTrue();
assertThat(set.contains(Thread.State.RUNNABLE)).isTrue();
Map map = bean.getSomeMap();
assertEquals(1, map.size());
assertEquals(CustomEnum.VALUE_1, map.get("min"));
assertThat(map.size()).isEqualTo(1);
assertThat(map.get("min")).isEqualTo(CustomEnum.VALUE_1);
TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCustomTagBean");
assertEquals(list, bean2.getSomeList());
assertEquals(set, bean2.getSomeSet());
assertEquals(map, bean2.getSomeMap());
assertFalse(list == bean2.getSomeList());
assertFalse(set == bean2.getSomeSet());
assertFalse(map == bean2.getSomeMap());
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();
}
@Test
@@ -257,16 +257,16 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionsBean");
List list = bean.getSomeList();
assertEquals(1, list.size());
assertEquals(bean, list.get(0));
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(bean);
Set set = bean.getSomeSet();
assertEquals(1, set.size());
assertTrue(set.contains(bean));
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains(bean)).isTrue();
Map map = bean.getSomeMap();
assertEquals(1, map.size());
assertEquals(bean, map.get("foo"));
assertThat(map.size()).isEqualTo(1);
assertThat(map.get("foo")).isEqualTo(bean);
}
@Test
@@ -275,19 +275,19 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
List list = bean.getSomeList();
assertTrue(Proxy.isProxyClass(list.getClass()));
assertEquals(1, list.size());
assertEquals(bean, list.get(0));
assertThat(Proxy.isProxyClass(list.getClass())).isTrue();
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(bean);
Set set = bean.getSomeSet();
assertFalse(Proxy.isProxyClass(set.getClass()));
assertEquals(1, set.size());
assertTrue(set.contains(bean));
assertThat(Proxy.isProxyClass(set.getClass())).isFalse();
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains(bean)).isTrue();
Map map = bean.getSomeMap();
assertFalse(Proxy.isProxyClass(map.getClass()));
assertEquals(1, map.size());
assertEquals(bean, map.get("foo"));
assertThat(Proxy.isProxyClass(map.getClass())).isFalse();
assertThat(map.size()).isEqualTo(1);
assertThat(map.get("foo")).isEqualTo(bean);
}
@Test
@@ -296,19 +296,19 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
List list = bean.getSomeList();
assertFalse(Proxy.isProxyClass(list.getClass()));
assertEquals(1, list.size());
assertEquals(bean, list.get(0));
assertThat(Proxy.isProxyClass(list.getClass())).isFalse();
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(bean);
Set set = bean.getSomeSet();
assertTrue(Proxy.isProxyClass(set.getClass()));
assertEquals(1, set.size());
assertTrue(set.contains(bean));
assertThat(Proxy.isProxyClass(set.getClass())).isTrue();
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains(bean)).isTrue();
Map map = bean.getSomeMap();
assertFalse(Proxy.isProxyClass(map.getClass()));
assertEquals(1, map.size());
assertEquals(bean, map.get("foo"));
assertThat(Proxy.isProxyClass(map.getClass())).isFalse();
assertThat(map.size()).isEqualTo(1);
assertThat(map.get("foo")).isEqualTo(bean);
}
@Test
@@ -317,80 +317,80 @@ public class UtilNamespaceHandlerTests {
TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
List list = bean.getSomeList();
assertFalse(Proxy.isProxyClass(list.getClass()));
assertEquals(1, list.size());
assertEquals(bean, list.get(0));
assertThat(Proxy.isProxyClass(list.getClass())).isFalse();
assertThat(list.size()).isEqualTo(1);
assertThat(list.get(0)).isEqualTo(bean);
Set set = bean.getSomeSet();
assertFalse(Proxy.isProxyClass(set.getClass()));
assertEquals(1, set.size());
assertTrue(set.contains(bean));
assertThat(Proxy.isProxyClass(set.getClass())).isFalse();
assertThat(set.size()).isEqualTo(1);
assertThat(set.contains(bean)).isTrue();
Map map = bean.getSomeMap();
assertTrue(Proxy.isProxyClass(map.getClass()));
assertEquals(1, map.size());
assertEquals(bean, map.get("foo"));
assertThat(Proxy.isProxyClass(map.getClass())).isTrue();
assertThat(map.size()).isEqualTo(1);
assertThat(map.get("foo")).isEqualTo(bean);
}
@Test
public void testNestedInConstructor() {
TestBean bean = (TestBean) this.beanFactory.getBean("constructedTestBean");
assertEquals("Rob Harrop", bean.getName());
assertThat(bean.getName()).isEqualTo("Rob Harrop");
}
@Test
public void testLoadProperties() {
Properties props = (Properties) this.beanFactory.getBean("myProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", null, props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
Properties props2 = (Properties) this.beanFactory.getBean("myProperties");
assertTrue(props == props2);
assertThat(props == props2).isTrue();
}
@Test
public void testScopedProperties() {
Properties props = (Properties) this.beanFactory.getBean("myScopedProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", null, props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
Properties props2 = (Properties) this.beanFactory.getBean("myScopedProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", null, props.get("foo2"));
assertTrue(props != props2);
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
assertThat(props != props2).isTrue();
}
@Test
public void testLocalProperties() {
Properties props = (Properties) this.beanFactory.getBean("myLocalProperties");
assertEquals("Incorrect property value", null, props.get("foo"));
assertEquals("Incorrect property value", "bar2", props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo(null);
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2");
}
@Test
public void testMergedProperties() {
Properties props = (Properties) this.beanFactory.getBean("myMergedProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", "bar2", props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2");
}
@Test
public void testLocalOverrideDefault() {
Properties props = (Properties) this.beanFactory.getBean("defaultLocalOverrideProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", "local2", props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
}
@Test
public void testLocalOverrideFalse() {
Properties props = (Properties) this.beanFactory.getBean("falseLocalOverrideProperties");
assertEquals("Incorrect property value", "bar", props.get("foo"));
assertEquals("Incorrect property value", "local2", props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
}
@Test
public void testLocalOverrideTrue() {
Properties props = (Properties) this.beanFactory.getBean("trueLocalOverrideProperties");
assertEquals("Incorrect property value", "local", props.get("foo"));
assertEquals("Incorrect property value", "local2", props.get("foo2"));
assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("local");
assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2");
}
}

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

@@ -42,10 +42,8 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.tests.sample.beans.HasMap;
import org.springframework.tests.sample.beans.TestBean;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* Tests for collections in XML bean definitions.
@@ -72,17 +70,20 @@ public class XmlBeanCollectionTests {
ListFactoryBean listFactory = new ListFactoryBean();
listFactory.setSourceList(new LinkedList());
listFactory.afterPropertiesSet();
assertTrue(listFactory.getObject() instanceof ArrayList);
boolean condition2 = listFactory.getObject() instanceof ArrayList;
assertThat(condition2).isTrue();
SetFactoryBean setFactory = new SetFactoryBean();
setFactory.setSourceSet(new TreeSet());
setFactory.afterPropertiesSet();
assertTrue(setFactory.getObject() instanceof LinkedHashSet);
boolean condition1 = setFactory.getObject() instanceof LinkedHashSet;
assertThat(condition1).isTrue();
MapFactoryBean mapFactory = new MapFactoryBean();
mapFactory.setSourceMap(new TreeMap());
mapFactory.afterPropertiesSet();
assertTrue(mapFactory.getObject() instanceof LinkedHashMap);
boolean condition = mapFactory.getObject() instanceof LinkedHashMap;
assertThat(condition).isTrue();
}
@Test
@@ -90,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");
assertTrue(jen.getSpouse() == dave);
assertThat(jen.getSpouse() == dave).isTrue();
}
@Test
public void testPropertyWithLiteralValueSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose");
assertTrue(verbose.getName().equals("verbose"));
assertThat(verbose.getName().equals("verbose")).isTrue();
}
@Test
public void testPropertyWithIdRefLocalAttrSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose2");
assertTrue(verbose.getName().equals("verbose"));
assertThat(verbose.getName().equals("verbose")).isTrue();
}
@Test
public void testPropertyWithIdRefBeanAttrSubelement() throws Exception {
TestBean verbose = (TestBean) this.beanFactory.getBean("verbose3");
assertTrue(verbose.getName().equals("verbose"));
assertThat(verbose.getName().equals("verbose")).isTrue();
}
@Test
@@ -121,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();
assertTrue(friends.length == 2);
assertThat(friends.length == 2).isTrue();
assertTrue("First friend must be jen, not " + friends[0], friends[0] == jen);
assertTrue(friends[1] == dave);
assertThat(friends[0] == jen).as("First friend must be jen, not " + friends[0]).isTrue();
assertThat(friends[1] == dave).isTrue();
// Should be ordered
}
@@ -135,45 +136,42 @@ public class XmlBeanCollectionTests {
TestBean rod = (TestBean) this.beanFactory.getBean("pRod");
Object[] friends = rod.getFriends().toArray();
assertTrue(friends.length == 2);
assertTrue("First friend must be jen, not " + friends[0],
friends[0].toString().equals(jen.toString()));
assertTrue("Jen not same instance", friends[0] != jen);
assertTrue(friends[1].toString().equals(dave.toString()));
assertTrue("Dave not same instance", friends[1] != dave);
assertEquals("Jen", dave.getSpouse().getName());
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(dave.getSpouse().getName()).isEqualTo("Jen");
TestBean rod2 = (TestBean) this.beanFactory.getBean("pRod");
Object[] friends2 = rod2.getFriends().toArray();
assertTrue(friends2.length == 2);
assertTrue("First friend must be jen, not " + friends2[0],
friends2[0].toString().equals(jen.toString()));
assertTrue("Jen not same instance", friends2[0] != friends[0]);
assertTrue(friends2[1].toString().equals(dave.toString()));
assertTrue("Dave not same instance", friends2[1] != friends[1]);
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();
}
@Test
public void testRefSubelementsBuildCollectionFromSingleElement() throws Exception {
TestBean loner = (TestBean) this.beanFactory.getBean("loner");
TestBean dave = (TestBean) this.beanFactory.getBean("david");
assertTrue(loner.getFriends().size() == 1);
assertTrue(loner.getFriends().contains(dave));
assertThat(loner.getFriends().size() == 1).isTrue();
assertThat(loner.getFriends().contains(dave)).isTrue();
}
@Test
public void testBuildCollectionFromMixtureOfReferencesAndValues() throws Exception {
MixedCollectionBean jumble = (MixedCollectionBean) this.beanFactory.getBean("jumble");
assertTrue("Expected 5 elements, not " + jumble.getJumble().size(),
jumble.getJumble().size() == 5);
assertThat(jumble.getJumble().size() == 5).as("Expected 5 elements, not " + jumble.getJumble().size()).isTrue();
List l = (List) jumble.getJumble();
assertTrue(l.get(0).equals(this.beanFactory.getBean("david")));
assertTrue(l.get(1).equals("literal"));
assertTrue(l.get(2).equals(this.beanFactory.getBean("jenny")));
assertTrue(l.get(3).equals("rod"));
assertThat(l.get(0).equals(this.beanFactory.getBean("david"))).isTrue();
assertThat(l.get(1).equals("literal")).isTrue();
assertThat(l.get(2).equals(this.beanFactory.getBean("jenny"))).isTrue();
assertThat(l.get(3).equals("rod")).isTrue();
Object[] array = (Object[]) l.get(4);
assertTrue(array[0].equals(this.beanFactory.getBean("david")));
assertTrue(array[1].equals("literal2"));
assertThat(array[0].equals(this.beanFactory.getBean("david"))).isTrue();
assertThat(array[1].equals("literal2")).isTrue();
}
@Test
@@ -187,258 +185,265 @@ public class XmlBeanCollectionTests {
@Test
public void testEmptyMap() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyMap");
assertTrue(hasMap.getMap().size() == 0);
assertThat(hasMap.getMap().size() == 0).isTrue();
}
@Test
public void testMapWithLiteralsOnly() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("literalMap");
assertTrue(hasMap.getMap().size() == 3);
assertTrue(hasMap.getMap().get("foo").equals("bar"));
assertTrue(hasMap.getMap().get("fi").equals("fum"));
assertTrue(hasMap.getMap().get("fa") == null);
assertThat(hasMap.getMap().size() == 3).isTrue();
assertThat(hasMap.getMap().get("foo").equals("bar")).isTrue();
assertThat(hasMap.getMap().get("fi").equals("fum")).isTrue();
assertThat(hasMap.getMap().get("fa") == null).isTrue();
}
@Test
public void testMapWithLiteralsAndReferences() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMap");
assertTrue(hasMap.getMap().size() == 5);
assertTrue(hasMap.getMap().get("foo").equals(new Integer(10)));
assertThat(hasMap.getMap().size() == 5).isTrue();
assertThat(hasMap.getMap().get("foo").equals(new Integer(10))).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertTrue(hasMap.getMap().get("jenny") == jenny);
assertTrue(hasMap.getMap().get(new Integer(5)).equals("david"));
assertTrue(hasMap.getMap().get("bar") instanceof Long);
assertTrue(hasMap.getMap().get("bar").equals(new Long(100)));
assertTrue(hasMap.getMap().get("baz") instanceof Integer);
assertTrue(hasMap.getMap().get("baz").equals(new Integer(200)));
assertThat(hasMap.getMap().get("jenny") == jenny).isTrue();
assertThat(hasMap.getMap().get(new Integer(5)).equals("david")).isTrue();
boolean condition1 = hasMap.getMap().get("bar") instanceof Long;
assertThat(condition1).isTrue();
assertThat(hasMap.getMap().get("bar").equals(new Long(100))).isTrue();
boolean condition = hasMap.getMap().get("baz") instanceof Integer;
assertThat(condition).isTrue();
assertThat(hasMap.getMap().get("baz").equals(new Integer(200))).isTrue();
}
@Test
public void testMapWithLiteralsAndPrototypeReferences() throws Exception {
TestBean jenny = (TestBean) this.beanFactory.getBean("pJenny");
HasMap hasMap = (HasMap) this.beanFactory.getBean("pMixedMap");
assertTrue(hasMap.getMap().size() == 2);
assertTrue(hasMap.getMap().get("foo").equals("bar"));
assertTrue(hasMap.getMap().get("jenny").toString().equals(jenny.toString()));
assertTrue("Not same instance", hasMap.getMap().get("jenny") != jenny);
assertThat(hasMap.getMap().size() == 2).isTrue();
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();
HasMap hasMap2 = (HasMap) this.beanFactory.getBean("pMixedMap");
assertTrue(hasMap2.getMap().size() == 2);
assertTrue(hasMap2.getMap().get("foo").equals("bar"));
assertTrue(hasMap2.getMap().get("jenny").toString().equals(jenny.toString()));
assertTrue("Not same instance", hasMap2.getMap().get("jenny") != hasMap.getMap().get("jenny"));
assertThat(hasMap2.getMap().size() == 2).isTrue();
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();
}
@Test
public void testMapWithLiteralsReferencesAndList() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMapWithList");
assertTrue(hasMap.getMap().size() == 4);
assertTrue(hasMap.getMap().get(null).equals("bar"));
assertThat(hasMap.getMap().size() == 4).isTrue();
assertThat(hasMap.getMap().get(null).equals("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertTrue(hasMap.getMap().get("jenny").equals(jenny));
assertThat(hasMap.getMap().get("jenny").equals(jenny)).isTrue();
// Check list
List l = (List) hasMap.getMap().get("list");
assertNotNull(l);
assertTrue(l.size() == 4);
assertTrue(l.get(0).equals("zero"));
assertTrue(l.get(3) == null);
assertThat(l).isNotNull();
assertThat(l.size() == 4).isTrue();
assertThat(l.get(0).equals("zero")).isTrue();
assertThat(l.get(3) == null).isTrue();
// Check nested map in list
Map m = (Map) l.get(1);
assertNotNull(m);
assertTrue(m.size() == 2);
assertTrue(m.get("fo").equals("bar"));
assertTrue("Map element 'jenny' should be equal to jenny bean, not " + m.get("jen"),
m.get("jen").equals(jenny));
assertThat(m).isNotNull();
assertThat(m.size() == 2).isTrue();
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);
assertNotNull(l);
assertTrue(l.size() == 2);
assertTrue(l.get(0).equals(jenny));
assertTrue(l.get(1).equals("ba"));
assertThat(l).isNotNull();
assertThat(l.size() == 2).isTrue();
assertThat(l.get(0).equals(jenny)).isTrue();
assertThat(l.get(1).equals("ba")).isTrue();
// Check nested map
m = (Map) hasMap.getMap().get("map");
assertNotNull(m);
assertTrue(m.size() == 2);
assertTrue(m.get("foo").equals("bar"));
assertTrue("Map element 'jenny' should be equal to jenny bean, not " + m.get("jenny"),
m.get("jenny").equals(jenny));
assertThat(m).isNotNull();
assertThat(m.size() == 2).isTrue();
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();
}
@Test
public void testEmptySet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptySet");
assertTrue(hasMap.getSet().size() == 0);
assertThat(hasMap.getSet().size() == 0).isTrue();
}
@Test
public void testPopulatedSet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("set");
assertTrue(hasMap.getSet().size() == 3);
assertTrue(hasMap.getSet().contains("bar"));
assertThat(hasMap.getSet().size() == 3).isTrue();
assertThat(hasMap.getSet().contains("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertTrue(hasMap.getSet().contains(jenny));
assertTrue(hasMap.getSet().contains(null));
assertThat(hasMap.getSet().contains(jenny)).isTrue();
assertThat(hasMap.getSet().contains(null)).isTrue();
Iterator it = hasMap.getSet().iterator();
assertEquals("bar", it.next());
assertEquals(jenny, it.next());
assertEquals(null, it.next());
assertThat(it.next()).isEqualTo("bar");
assertThat(it.next()).isEqualTo(jenny);
assertThat(it.next()).isEqualTo(null);
}
@Test
public void testPopulatedConcurrentSet() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("concurrentSet");
assertTrue(hasMap.getConcurrentSet().size() == 3);
assertTrue(hasMap.getConcurrentSet().contains("bar"));
assertThat(hasMap.getConcurrentSet().size() == 3).isTrue();
assertThat(hasMap.getConcurrentSet().contains("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertTrue(hasMap.getConcurrentSet().contains(jenny));
assertTrue(hasMap.getConcurrentSet().contains(null));
assertThat(hasMap.getConcurrentSet().contains(jenny)).isTrue();
assertThat(hasMap.getConcurrentSet().contains(null)).isTrue();
}
@Test
public void testPopulatedIdentityMap() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("identityMap");
assertTrue(hasMap.getIdentityMap().size() == 2);
assertThat(hasMap.getIdentityMap().size() == 2).isTrue();
HashSet set = new HashSet(hasMap.getIdentityMap().keySet());
assertTrue(set.contains("foo"));
assertTrue(set.contains("jenny"));
assertThat(set.contains("foo")).isTrue();
assertThat(set.contains("jenny")).isTrue();
}
@Test
public void testEmptyProps() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("emptyProps");
assertTrue(hasMap.getProps().size() == 0);
assertEquals(hasMap.getProps().getClass(), Properties.class);
assertThat(hasMap.getProps().size() == 0).isTrue();
assertThat(Properties.class).isEqualTo(hasMap.getProps().getClass());
}
@Test
public void testPopulatedProps() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("props");
assertTrue(hasMap.getProps().size() == 2);
assertTrue(hasMap.getProps().get("foo").equals("bar"));
assertTrue(hasMap.getProps().get("2").equals("TWO"));
assertThat(hasMap.getProps().size() == 2).isTrue();
assertThat(hasMap.getProps().get("foo").equals("bar")).isTrue();
assertThat(hasMap.getProps().get("2").equals("TWO")).isTrue();
}
@Test
public void testObjectArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("objectArray");
assertTrue(hasMap.getObjectArray().length == 2);
assertTrue(hasMap.getObjectArray()[0].equals("one"));
assertTrue(hasMap.getObjectArray()[1].equals(this.beanFactory.getBean("jenny")));
assertThat(hasMap.getObjectArray().length == 2).isTrue();
assertThat(hasMap.getObjectArray()[0].equals("one")).isTrue();
assertThat(hasMap.getObjectArray()[1].equals(this.beanFactory.getBean("jenny"))).isTrue();
}
@Test
public void testIntegerArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("integerArray");
assertTrue(hasMap.getIntegerArray().length == 3);
assertTrue(hasMap.getIntegerArray()[0].intValue() == 0);
assertTrue(hasMap.getIntegerArray()[1].intValue() == 1);
assertTrue(hasMap.getIntegerArray()[2].intValue() == 2);
assertThat(hasMap.getIntegerArray().length == 3).isTrue();
assertThat(hasMap.getIntegerArray()[0].intValue() == 0).isTrue();
assertThat(hasMap.getIntegerArray()[1].intValue() == 1).isTrue();
assertThat(hasMap.getIntegerArray()[2].intValue() == 2).isTrue();
}
@Test
public void testClassArray() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("classArray");
assertTrue(hasMap.getClassArray().length == 2);
assertTrue(hasMap.getClassArray()[0].equals(String.class));
assertTrue(hasMap.getClassArray()[1].equals(Exception.class));
assertThat(hasMap.getClassArray().length == 2).isTrue();
assertThat(hasMap.getClassArray()[0].equals(String.class)).isTrue();
assertThat(hasMap.getClassArray()[1].equals(Exception.class)).isTrue();
}
@Test
public void testClassList() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("classList");
assertTrue(hasMap.getClassList().size()== 2);
assertTrue(hasMap.getClassList().get(0).equals(String.class));
assertTrue(hasMap.getClassList().get(1).equals(Exception.class));
assertThat(hasMap.getClassList().size()== 2).isTrue();
assertThat(hasMap.getClassList().get(0).equals(String.class)).isTrue();
assertThat(hasMap.getClassList().get(1).equals(Exception.class)).isTrue();
}
@Test
public void testProps() throws Exception {
HasMap hasMap = (HasMap) this.beanFactory.getBean("props");
assertEquals(2, hasMap.getProps().size());
assertEquals("bar", hasMap.getProps().getProperty("foo"));
assertEquals("TWO", hasMap.getProps().getProperty("2"));
assertThat(hasMap.getProps().size()).isEqualTo(2);
assertThat(hasMap.getProps().getProperty("foo")).isEqualTo("bar");
assertThat(hasMap.getProps().getProperty("2")).isEqualTo("TWO");
HasMap hasMap2 = (HasMap) this.beanFactory.getBean("propsViaMap");
assertEquals(2, hasMap2.getProps().size());
assertEquals("bar", hasMap2.getProps().getProperty("foo"));
assertEquals("TWO", hasMap2.getProps().getProperty("2"));
assertThat(hasMap2.getProps().size()).isEqualTo(2);
assertThat(hasMap2.getProps().getProperty("foo")).isEqualTo("bar");
assertThat(hasMap2.getProps().getProperty("2")).isEqualTo("TWO");
}
@Test
public void testListFactory() throws Exception {
List list = (List) this.beanFactory.getBean("listFactory");
assertTrue(list instanceof LinkedList);
assertTrue(list.size() == 2);
assertEquals("bar", list.get(0));
assertEquals("jenny", list.get(1));
boolean condition = list instanceof LinkedList;
assertThat(condition).isTrue();
assertThat(list.size() == 2).isTrue();
assertThat(list.get(0)).isEqualTo("bar");
assertThat(list.get(1)).isEqualTo("jenny");
}
@Test
public void testPrototypeListFactory() throws Exception {
List list = (List) this.beanFactory.getBean("pListFactory");
assertTrue(list instanceof LinkedList);
assertTrue(list.size() == 2);
assertEquals("bar", list.get(0));
assertEquals("jenny", list.get(1));
boolean condition = list instanceof LinkedList;
assertThat(condition).isTrue();
assertThat(list.size() == 2).isTrue();
assertThat(list.get(0)).isEqualTo("bar");
assertThat(list.get(1)).isEqualTo("jenny");
}
@Test
public void testSetFactory() throws Exception {
Set set = (Set) this.beanFactory.getBean("setFactory");
assertTrue(set instanceof TreeSet);
assertTrue(set.size() == 2);
assertTrue(set.contains("bar"));
assertTrue(set.contains("jenny"));
boolean condition = set instanceof TreeSet;
assertThat(condition).isTrue();
assertThat(set.size() == 2).isTrue();
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
}
@Test
public void testPrototypeSetFactory() throws Exception {
Set set = (Set) this.beanFactory.getBean("pSetFactory");
assertTrue(set instanceof TreeSet);
assertTrue(set.size() == 2);
assertTrue(set.contains("bar"));
assertTrue(set.contains("jenny"));
boolean condition = set instanceof TreeSet;
assertThat(condition).isTrue();
assertThat(set.size() == 2).isTrue();
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
}
@Test
public void testMapFactory() throws Exception {
Map map = (Map) this.beanFactory.getBean("mapFactory");
assertTrue(map instanceof TreeMap);
assertTrue(map.size() == 2);
assertEquals("bar", map.get("foo"));
assertEquals("jenny", map.get("jen"));
boolean condition = map instanceof TreeMap;
assertThat(condition).isTrue();
assertThat(map.size() == 2).isTrue();
assertThat(map.get("foo")).isEqualTo("bar");
assertThat(map.get("jen")).isEqualTo("jenny");
}
@Test
public void testPrototypeMapFactory() throws Exception {
Map map = (Map) this.beanFactory.getBean("pMapFactory");
assertTrue(map instanceof TreeMap);
assertTrue(map.size() == 2);
assertEquals("bar", map.get("foo"));
assertEquals("jenny", map.get("jen"));
boolean condition = map instanceof TreeMap;
assertThat(condition).isTrue();
assertThat(map.size() == 2).isTrue();
assertThat(map.get("foo")).isEqualTo("bar");
assertThat(map.get("jen")).isEqualTo("jenny");
}
@Test
public void testChoiceBetweenSetAndMap() {
MapAndSet sam = (MapAndSet) this.beanFactory.getBean("setAndMap");
assertTrue("Didn't choose constructor with Map argument", sam.getObject() instanceof Map);
boolean condition = sam.getObject() instanceof Map;
assertThat(condition).as("Didn't choose constructor with Map argument").isTrue();
Map map = (Map) sam.getObject();
assertEquals(3, map.size());
assertEquals("val1", map.get("key1"));
assertEquals("val2", map.get("key2"));
assertEquals("val3", map.get("key3"));
assertThat(map.size()).isEqualTo(3);
assertThat(map.get("key1")).isEqualTo("val1");
assertThat(map.get("key2")).isEqualTo("val2");
assertThat(map.get("key3")).isEqualTo("val3");
}
@Test
public void testEnumSetFactory() throws Exception {
Set set = (Set) this.beanFactory.getBean("enumSetFactory");
assertTrue(set.size() == 2);
assertTrue(set.contains("ONE"));
assertTrue(set.contains("TWO"));
assertThat(set.size() == 2).isTrue();
assertThat(set.contains("ONE")).isTrue();
assertThat(set.contains("TWO")).isTrue();
}

30
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
View File

@@ -31,10 +31,8 @@ import org.springframework.core.io.Resource;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.ObjectUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* @author Rick Evans
@@ -110,19 +108,19 @@ public class XmlBeanDefinitionReaderTests {
}
private void testBeanDefinitions(BeanDefinitionRegistry registry) {
assertEquals(24, registry.getBeanDefinitionCount());
assertEquals(24, registry.getBeanDefinitionNames().length);
assertTrue(Arrays.asList(registry.getBeanDefinitionNames()).contains("rod"));
assertTrue(Arrays.asList(registry.getBeanDefinitionNames()).contains("aliased"));
assertTrue(registry.containsBeanDefinition("rod"));
assertTrue(registry.containsBeanDefinition("aliased"));
assertEquals(TestBean.class.getName(), registry.getBeanDefinition("rod").getBeanClassName());
assertEquals(TestBean.class.getName(), registry.getBeanDefinition("aliased").getBeanClassName());
assertTrue(registry.isAlias("youralias"));
assertThat(registry.getBeanDefinitionCount()).isEqualTo(24);
assertThat(registry.getBeanDefinitionNames().length).isEqualTo(24);
assertThat(Arrays.asList(registry.getBeanDefinitionNames()).contains("rod")).isTrue();
assertThat(Arrays.asList(registry.getBeanDefinitionNames()).contains("aliased")).isTrue();
assertThat(registry.containsBeanDefinition("rod")).isTrue();
assertThat(registry.containsBeanDefinition("aliased")).isTrue();
assertThat(registry.getBeanDefinition("rod").getBeanClassName()).isEqualTo(TestBean.class.getName());
assertThat(registry.getBeanDefinition("aliased").getBeanClassName()).isEqualTo(TestBean.class.getName());
assertThat(registry.isAlias("youralias")).isTrue();
String[] aliases = registry.getAliases("aliased");
assertEquals(2, aliases.length);
assertTrue(ObjectUtils.containsElement(aliases, "myalias"));
assertTrue(ObjectUtils.containsElement(aliases, "youralias"));
assertThat(aliases.length).isEqualTo(2);
assertThat(ObjectUtils.containsElement(aliases, "myalias")).isTrue();
assertThat(ObjectUtils.containsElement(aliases, "youralias")).isTrue();
}
@Test
@@ -140,7 +138,7 @@ public class XmlBeanDefinitionReaderTests {
Resource resource = new ClassPathResource(resourceName, getClass());
new XmlBeanDefinitionReader(factory).loadBeanDefinitions(resource);
TestBean bean = (TestBean) factory.getBean("testBean");
assertNotNull(bean);
assertThat(bean).isNotNull();
}
}

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

@@ -36,9 +36,7 @@ import org.springframework.tests.sample.beans.LifecycleBean;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.sample.beans.factory.DummyFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -125,7 +123,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
@Test
public void descriptionButNoProperties() {
TestBean validEmpty = (TestBean) getBeanFactory().getBean("validEmptyWithDescription");
assertEquals(0, validEmpty.getAge());
assertThat(validEmpty.getAge()).isEqualTo(0);
}
/**
@@ -137,71 +135,71 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
TestBean tb1 = (TestBean) getBeanFactory().getBean("aliased");
TestBean alias1 = (TestBean) getBeanFactory().getBean("myalias");
assertTrue(tb1 == alias1);
assertThat(tb1 == alias1).isTrue();
List tb1Aliases = Arrays.asList(getBeanFactory().getAliases("aliased"));
assertEquals(2, tb1Aliases.size());
assertTrue(tb1Aliases.contains("myalias"));
assertTrue(tb1Aliases.contains("youralias"));
assertTrue(beanNames.contains("aliased"));
assertFalse(beanNames.contains("myalias"));
assertFalse(beanNames.contains("youralias"));
assertThat(tb1Aliases.size()).isEqualTo(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();
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");
assertTrue(tb2 == alias2);
assertTrue(tb2 == alias3);
assertTrue(tb2 == alias3a);
assertTrue(tb2 == alias3b);
assertThat(tb2 == alias2).isTrue();
assertThat(tb2 == alias3).isTrue();
assertThat(tb2 == alias3a).isTrue();
assertThat(tb2 == alias3b).isTrue();
List tb2Aliases = Arrays.asList(getBeanFactory().getAliases("multiAliased"));
assertEquals(4, tb2Aliases.size());
assertTrue(tb2Aliases.contains("alias1"));
assertTrue(tb2Aliases.contains("alias2"));
assertTrue(tb2Aliases.contains("alias3"));
assertTrue(tb2Aliases.contains("alias4"));
assertTrue(beanNames.contains("multiAliased"));
assertFalse(beanNames.contains("alias1"));
assertFalse(beanNames.contains("alias2"));
assertFalse(beanNames.contains("alias3"));
assertFalse(beanNames.contains("alias4"));
assertThat(tb2Aliases.size()).isEqualTo(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();
TestBean tb3 = (TestBean) getBeanFactory().getBean("aliasWithoutId1");
TestBean alias4 = (TestBean) getBeanFactory().getBean("aliasWithoutId2");
TestBean alias5 = (TestBean) getBeanFactory().getBean("aliasWithoutId3");
assertTrue(tb3 == alias4);
assertTrue(tb3 == alias5);
assertThat(tb3 == alias4).isTrue();
assertThat(tb3 == alias5).isTrue();
List tb3Aliases = Arrays.asList(getBeanFactory().getAliases("aliasWithoutId1"));
assertEquals(2, tb3Aliases.size());
assertTrue(tb3Aliases.contains("aliasWithoutId2"));
assertTrue(tb3Aliases.contains("aliasWithoutId3"));
assertTrue(beanNames.contains("aliasWithoutId1"));
assertFalse(beanNames.contains("aliasWithoutId2"));
assertFalse(beanNames.contains("aliasWithoutId3"));
assertThat(tb3Aliases.size()).isEqualTo(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();
TestBean tb4 = (TestBean) getBeanFactory().getBean(TestBean.class.getName() + "#0");
assertEquals(null, tb4.getName());
assertThat(tb4.getName()).isEqualTo(null);
Map drs = getListableBeanFactory().getBeansOfType(DummyReferencer.class, false, false);
assertEquals(5, drs.size());
assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#0"));
assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#1"));
assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#2"));
assertThat(drs.size()).isEqualTo(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();
}
@Test
public void factoryNesting() {
ITestBean father = (ITestBean) getBeanFactory().getBean("father");
assertTrue("Bean from root context", father != null);
assertThat(father != null).as("Bean from root context").isTrue();
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
assertTrue("Bean from child context", "Rod".equals(rod.getName()));
assertTrue("Bean has external reference", rod.getSpouse() == father);
assertThat("Rod".equals(rod.getName())).as("Bean from child context").isTrue();
assertThat(rod.getSpouse() == father).as("Bean has external reference").isTrue();
rod = (TestBean) parent.getBean("rod");
assertTrue("Bean from root context", "Roderick".equals(rod.getName()));
assertThat("Roderick".equals(rod.getName())).as("Bean from root context").isTrue();
}
@Test
@@ -209,25 +207,25 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
DummyReferencer ref = (DummyReferencer) getBeanFactory().getBean("factoryReferencer");
assertTrue(ref.getTestBean1() == ref.getTestBean2());
assertTrue(ref.getDummyFactory() == factory);
assertThat(ref.getTestBean1() == ref.getTestBean2()).isTrue();
assertThat(ref.getDummyFactory() == factory).isTrue();
DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("factoryReferencerWithConstructor");
assertTrue(ref2.getTestBean1() == ref2.getTestBean2());
assertTrue(ref2.getDummyFactory() == factory);
assertThat(ref2.getTestBean1() == ref2.getTestBean2()).isTrue();
assertThat(ref2.getDummyFactory() == factory).isTrue();
}
@Test
public void prototypeReferences() {
// check that not broken by circular reference resolution mechanism
DummyReferencer ref1 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref1.getTestBean2());
assertThat(ref1.getTestBean1() != ref1.getTestBean2()).as("Not referencing same bean twice").isTrue();
DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
assertTrue("Not the same referencer", ref1 != ref2);
assertTrue("Not referencing same bean twice", ref2.getTestBean1() != ref2.getTestBean2());
assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean1());
assertTrue("Not referencing same bean twice", ref1.getTestBean2() != ref2.getTestBean2());
assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean2());
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();
}
@Test
@@ -236,24 +234,24 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
TestBean kathy = (TestBean) getBeanFactory().getBean("kathy");
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
TestBean factoryCreated = (TestBean) getBeanFactory().getBean("singletonFactory");
assertTrue(kerry.isPostProcessed());
assertTrue(kathy.isPostProcessed());
assertTrue(factory.isPostProcessed());
assertTrue(factoryCreated.isPostProcessed());
assertThat(kerry.isPostProcessed()).isTrue();
assertThat(kathy.isPostProcessed()).isTrue();
assertThat(factory.isPostProcessed()).isTrue();
assertThat(factoryCreated.isPostProcessed()).isTrue();
}
@Test
public void emptyValues() {
TestBean rod = (TestBean) getBeanFactory().getBean("rod");
TestBean kerry = (TestBean) getBeanFactory().getBean("kerry");
assertTrue("Touchy is empty", "".equals(rod.getTouchy()));
assertTrue("Touchy is empty", "".equals(kerry.getTouchy()));
assertThat("".equals(rod.getTouchy())).as("Touchy is empty").isTrue();
assertThat("".equals(kerry.getTouchy())).as("Touchy is empty").isTrue();
}
@Test
public void commentsAndCdataInValue() {
TestBean bean = (TestBean) getBeanFactory().getBean("commentsInValue");
assertEquals("Failed to handle comments and CDATA properly", "this is a <!--comment-->", bean.getName());
assertThat(bean.getName()).as("Failed to handle comments and CDATA properly").isEqualTo("this is a <!--comment-->");
}
}

11
spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
View File

@@ -22,9 +22,8 @@ import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
import org.springframework.beans.factory.xml.NamespaceHandler;
import org.springframework.beans.factory.xml.UtilNamespaceHandler;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
* Unit and integration tests for the {@link DefaultNamespaceHandlerResolver} class.
@@ -38,16 +37,16 @@ public class DefaultNamespaceHandlerResolverTests {
public void testResolvedMappedHandler() {
DefaultNamespaceHandlerResolver resolver = new DefaultNamespaceHandlerResolver(getClass().getClassLoader());
NamespaceHandler handler = resolver.resolve("http://www.springframework.org/schema/util");
assertNotNull("Handler should not be null.", handler);
assertEquals("Incorrect handler loaded", UtilNamespaceHandler.class, handler.getClass());
assertThat(handler).as("Handler should not be null.").isNotNull();
assertThat(handler.getClass()).as("Incorrect handler loaded").isEqualTo(UtilNamespaceHandler.class);
}
@Test
public void testResolvedMappedHandlerWithNoArgCtor() {
DefaultNamespaceHandlerResolver resolver = new DefaultNamespaceHandlerResolver();
NamespaceHandler handler = resolver.resolve("http://www.springframework.org/schema/util");
assertNotNull("Handler should not be null.", handler);
assertEquals("Incorrect handler loaded", UtilNamespaceHandler.class, handler.getClass());
assertThat(handler).as("Handler should not be null.").isNotNull();
assertThat(handler.getClass()).as("Incorrect handler loaded").isEqualTo(UtilNamespaceHandler.class);
}
@Test

11
spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
View File

@@ -27,8 +27,7 @@ import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.FatalBeanException;
import org.springframework.util.Assert;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -43,17 +42,17 @@ public class BeanInfoTests {
Integer value = new Integer(1);
bw.setPropertyValue("value", value);
assertEquals("value not set correctly", bean.getValue(), value);
assertThat(value).as("value not set correctly").isEqualTo(bean.getValue());
value = new Integer(2);
bw.setPropertyValue("value", value.toString());
assertEquals("value not converted", bean.getValue(), value);
assertThat(value).as("value not converted").isEqualTo(bean.getValue());
bw.setPropertyValue("value", null);
assertNull("value not null", bean.getValue());
assertThat(bean.getValue()).as("value not null").isNull();
bw.setPropertyValue("value", "");
assertNull("value not converted to null", bean.getValue());
assertThat(bean.getValue()).as("value not converted to null").isNull();
}

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

@@ -20,9 +20,7 @@ import java.beans.PropertyEditor;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for the {@link ByteArrayPropertyEditor} class.
@@ -39,21 +37,20 @@ public class ByteArrayPropertyEditorTests {
byteEditor.setAsText(text);
Object value = byteEditor.getValue();
assertNotNull(value);
assertTrue(value instanceof byte[]);
assertThat(value).isNotNull().isInstanceOf(byte[].class);
byte[] bytes = (byte[]) value;
for (int i = 0; i < text.length(); ++i) {
assertEquals("cyte[] differs at index '" + i + "'", text.charAt(i), bytes[i]);
assertThat(bytes[i]).as("cyte[] differs at index '" + i + "'").isEqualTo((byte) text.charAt(i));
}
assertEquals(text, byteEditor.getAsText());
assertThat(byteEditor.getAsText()).isEqualTo(text);
}
@Test
public void getAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
assertEquals("", byteEditor.getAsText());
assertThat(byteEditor.getAsText()).isEqualTo("");
byteEditor.setAsText(null);
assertEquals("", byteEditor.getAsText());
assertThat(byteEditor.getAsText()).isEqualTo("");
}
}

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

@@ -20,9 +20,7 @@ import java.beans.PropertyEditor;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for the {@link CharArrayPropertyEditor} class.
@@ -39,21 +37,20 @@ public class CharArrayPropertyEditorTests {
charEditor.setAsText(text);
Object value = charEditor.getValue();
assertNotNull(value);
assertTrue(value instanceof char[]);
assertThat(value).isNotNull().isInstanceOf(char[].class);
char[] chars = (char[]) value;
for (int i = 0; i < text.length(); ++i) {
assertEquals("char[] differs at index '" + i + "'", text.charAt(i), chars[i]);
assertThat(chars[i]).as("char[] differs at index '" + i + "'").isEqualTo(text.charAt(i));
}
assertEquals(text, charEditor.getAsText());
assertThat(charEditor.getAsText()).isEqualTo(text);
}
@Test
public void getAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
assertEquals("", charEditor.getAsText());
assertThat(charEditor.getAsText()).isEqualTo("");
charEditor.setAsText(null);
assertEquals("", charEditor.getAsText());
assertThat(charEditor.getAsText()).isEqualTo("");
}
}

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

@@ -22,10 +22,8 @@ import java.util.List;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link CustomCollectionEditor} class.
@@ -60,13 +58,14 @@ public class CustomCollectionEditorTests {
CustomCollectionEditor editor = new CustomCollectionEditor(ArrayList.class);
editor.setValue(new int[] {0, 1, 2});
Object value = editor.getValue();
assertNotNull(value);
assertTrue(value instanceof ArrayList);
assertThat(value).isNotNull();
boolean condition = value instanceof ArrayList;
assertThat(condition).isTrue();
List<?> list = (List<?>) value;
assertEquals("There must be 3 elements in the converted collection", 3, list.size());
assertEquals(new Integer(0), list.get(0));
assertEquals(new Integer(1), list.get(1));
assertEquals(new Integer(2), list.get(2));
assertThat(list.size()).as("There must be 3 elements in the converted collection").isEqualTo(3);
assertThat(list.get(0)).isEqualTo(new Integer(0));
assertThat(list.get(1)).isEqualTo(new Integer(1));
assertThat(list.get(2)).isEqualTo(new Integer(2));
}
@Test
@@ -74,9 +73,9 @@ public class CustomCollectionEditorTests {
CustomCollectionEditor editor = new CustomCollectionEditor(Collection.class);
editor.setValue("0, 1, 2");
Collection<?> value = (Collection<?>) editor.getValue();
assertNotNull(value);
assertEquals("There must be 1 element in the converted collection", 1, value.size());
assertEquals("0, 1, 2", value.iterator().next());
assertThat(value).isNotNull();
assertThat(value.size()).as("There must be 1 element in the converted collection").isEqualTo(1);
assertThat(value.iterator().next()).isEqualTo("0, 1, 2");
}
@Test
@@ -84,11 +83,12 @@ public class CustomCollectionEditorTests {
CustomCollectionEditor editor = new CustomCollectionEditor(ArrayList.class);
editor.setValue("0, 1, 2");
Object value = editor.getValue();
assertNotNull(value);
assertTrue(value instanceof ArrayList);
assertThat(value).isNotNull();
boolean condition = value instanceof ArrayList;
assertThat(condition).isTrue();
List<?> list = (List<?>) value;
assertEquals("There must be 1 element in the converted collection", 1, list.size());
assertEquals("0, 1, 2", list.get(0));
assertThat(list.size()).as("There must be 1 element in the converted collection").isEqualTo(1);
assertThat(list.get(0)).isEqualTo("0, 1, 2");
}

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

File diff suppressed because it is too large Load Diff

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

@@ -23,9 +23,8 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Thomas Risberg
@@ -40,9 +39,10 @@ public class FileEditorTests {
fileEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
ClassUtils.getShortName(getClass()) + ".class");
Object value = fileEditor.getValue();
assertTrue(value instanceof File);
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertTrue(file.exists());
assertThat(file.exists()).isTrue();
}
@Test
@@ -57,9 +57,11 @@ public class FileEditorTests {
PropertyEditor fileEditor = new FileEditor();
fileEditor.setAsText("file:no_way_this_file_is_found.doc");
Object value = fileEditor.getValue();
assertTrue(value instanceof File);
boolean condition1 = value instanceof File;
assertThat(condition1).isTrue();
File file = (File) value;
assertTrue(!file.exists());
boolean condition = !file.exists();
assertThat(condition).isTrue();
}
@Test
@@ -67,9 +69,11 @@ public class FileEditorTests {
PropertyEditor fileEditor = new FileEditor();
fileEditor.setAsText("/no_way_this_file_is_found.doc");
Object value = fileEditor.getValue();
assertTrue(value instanceof File);
boolean condition1 = value instanceof File;
assertThat(condition1).isTrue();
File file = (File) value;
assertTrue(!file.exists());
boolean condition = !file.exists();
assertThat(condition).isTrue();
}
@Test
@@ -79,11 +83,12 @@ public class FileEditorTests {
ClassUtils.getShortName(getClass()) + ".class";
fileEditor.setAsText(fileName);
Object value = fileEditor.getValue();
assertTrue(value instanceof File);
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertTrue(file.exists());
assertThat(file.exists()).isTrue();
String absolutePath = file.getAbsolutePath().replace('\\', '/');
assertTrue(absolutePath.endsWith(fileName));
assertThat(absolutePath.endsWith(fileName)).isTrue();
}
@Test
@@ -93,11 +98,12 @@ public class FileEditorTests {
ClassUtils.getShortName(getClass()) + ".clazz";
fileEditor.setAsText(fileName);
Object value = fileEditor.getValue();
assertTrue(value instanceof File);
boolean condition = value instanceof File;
assertThat(condition).isTrue();
File file = (File) value;
assertFalse(file.exists());
assertThat(file.exists()).isFalse();
String absolutePath = file.getAbsolutePath().replace('\\', '/');
assertTrue(absolutePath.endsWith(fileName));
assertThat(absolutePath.endsWith(fileName)).isTrue();
}
}

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

@@ -22,10 +22,8 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link InputStreamEditor} class.
@@ -50,10 +48,11 @@ public class InputStreamEditorTests {
InputStreamEditor editor = new InputStreamEditor();
editor.setAsText(resource);
Object value = editor.getValue();
assertNotNull(value);
assertTrue(value instanceof InputStream);
assertThat(value).isNotNull();
boolean condition = value instanceof InputStream;
assertThat(condition).isTrue();
stream = (InputStream) value;
assertTrue(stream.available() > 0);
assertThat(stream.available() > 0).isTrue();
}
finally {
if (stream != null) {
@@ -71,12 +70,12 @@ public class InputStreamEditorTests {
@Test
public void testGetAsTextReturnsNullByDefault() throws Exception {
assertNull(new InputStreamEditor().getAsText());
assertThat(new InputStreamEditor().getAsText()).isNull();
String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) +
"/" + ClassUtils.getShortName(getClass()) + ".class";
InputStreamEditor editor = new InputStreamEditor();
editor.setAsText(resource);
assertNull(editor.getAsText());
assertThat(editor.getAsText()).isNull();
}
}

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

@@ -24,9 +24,8 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Juergen Hoeller
@@ -40,9 +39,10 @@ public class PathEditorTests {
pathEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
ClassUtils.getShortName(getClass()) + ".class");
Object value = pathEditor.getValue();
assertTrue(value instanceof Path);
boolean condition = value instanceof Path;
assertThat(condition).isTrue();
Path path = (Path) value;
assertTrue(path.toFile().exists());
assertThat(path.toFile().exists()).isTrue();
}
@Test
@@ -57,9 +57,11 @@ public class PathEditorTests {
PropertyEditor pathEditor = new PathEditor();
pathEditor.setAsText("file:/no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertTrue(value instanceof Path);
boolean condition1 = value instanceof Path;
assertThat(condition1).isTrue();
Path path = (Path) value;
assertTrue(!path.toFile().exists());
boolean condition = !path.toFile().exists();
assertThat(condition).isTrue();
}
@Test
@@ -67,9 +69,11 @@ public class PathEditorTests {
PropertyEditor pathEditor = new PathEditor();
pathEditor.setAsText("/no_way_this_file_is_found.doc");
Object value = pathEditor.getValue();
assertTrue(value instanceof Path);
boolean condition1 = value instanceof Path;
assertThat(condition1).isTrue();
Path path = (Path) value;
assertTrue(!path.toFile().exists());
boolean condition = !path.toFile().exists();
assertThat(condition).isTrue();
}
@Test
@@ -79,15 +83,16 @@ public class PathEditorTests {
ClassUtils.getShortName(getClass()) + ".class";
pathEditor.setAsText(fileName);
Object value = pathEditor.getValue();
assertTrue(value instanceof Path);
boolean condition = value instanceof Path;
assertThat(condition).isTrue();
Path path = (Path) value;
File file = path.toFile();
assertTrue(file.exists());
assertThat(file.exists()).isTrue();
String absolutePath = file.getAbsolutePath();
if (File.separatorChar == '\\') {
absolutePath = absolutePath.replace('\\', '/');
}
assertTrue(absolutePath.endsWith(fileName));
assertThat(absolutePath.endsWith(fileName)).isTrue();
}
@Test
@@ -97,15 +102,16 @@ public class PathEditorTests {
ClassUtils.getShortName(getClass()) + ".clazz";
pathEditor.setAsText(fileName);
Object value = pathEditor.getValue();
assertTrue(value instanceof Path);
boolean condition = value instanceof Path;
assertThat(condition).isTrue();
Path path = (Path) value;
File file = path.toFile();
assertFalse(file.exists());
assertThat(file.exists()).isFalse();
String absolutePath = file.getAbsolutePath();
if (File.separatorChar == '\\') {
absolutePath = absolutePath.replace('\\', '/');
}
assertTrue(absolutePath.endsWith(fileName));
assertThat(absolutePath.endsWith(fileName)).isTrue();
}
}

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

@@ -22,9 +22,7 @@ import java.util.Properties;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Test the conversion of Strings to {@link java.util.Properties} objects,
@@ -42,8 +40,8 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains one entry", p.entrySet().size() == 1);
assertTrue("foo=bar", p.get("foo").equals("bar"));
assertThat(p.entrySet().size() == 1).as("contains one entry").isTrue();
assertThat(p.get("foo").equals("bar")).as("foo=bar").isTrue();
}
@Test
@@ -53,9 +51,9 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains two entries", p.entrySet().size() == 2);
assertTrue("foo=bar with whitespace", p.get("foo").equals("bar with whitespace"));
assertTrue("me=mi", p.get("me").equals("mi"));
assertThat(p.entrySet().size() == 2).as("contains two entries").isTrue();
assertThat(p.get("foo").equals("bar with whitespace")).as("foo=bar with whitespace").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
@Test
@@ -66,10 +64,10 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains two entries", p.entrySet().size() == 3);
assertTrue("foo=bar", p.get("foo").equals("bar"));
assertTrue("me=mi", p.get("me").equals("mi"));
assertTrue("x='y=z'", p.get("x").equals("y=z"));
assertThat(p.entrySet().size() == 3).as("contains two entries").isTrue();
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();
}
@Test
@@ -78,10 +76,10 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains two entries", p.entrySet().size() == 3);
assertTrue("foo=bar", p.get("foo").equals("bar"));
assertTrue("me=mi", p.get("me").equals("mi"));
assertTrue("x='y=z'", p.get("x").equals(""));
assertThat(p.entrySet().size() == 3).as("contains two entries").isTrue();
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();
}
@Test
@@ -90,9 +88,9 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains three entries", p.entrySet().size() == 3);
assertTrue("foo is empty", p.get("foo").equals(""));
assertTrue("me=mi", p.get("me").equals("mi"));
assertThat(p.entrySet().size() == 3).as("contains three entries").isTrue();
assertThat(p.get("foo").equals("")).as("foo is empty").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
/**
@@ -109,9 +107,9 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains three entries", p.entrySet().size() == 3);
assertTrue("foo is bar", p.get("foo").equals("bar"));
assertTrue("me=mi", p.get("me").equals("mi"));
assertThat(p.entrySet().size() == 3).as("contains three entries").isTrue();
assertThat(p.get("foo").equals("bar")).as("foo is bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
/**
@@ -131,9 +129,9 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(s);
Properties p = (Properties) pe.getValue();
assertTrue("contains 3 entries, not " + p.size(), p.size() == 3);
assertTrue("foo is bar", p.get("foo").equals("bar"));
assertTrue("me=mi", p.get("me").equals("mi"));
assertThat(p.size() == 3).as("contains 3 entries, not " + p.size()).isTrue();
assertThat(p.get("foo").equals("bar")).as("foo is bar").isTrue();
assertThat(p.get("me").equals("mi")).as("me=mi").isTrue();
}
@Test
@@ -141,7 +139,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe= new PropertiesEditor();
pe.setAsText(null);
Properties p = (Properties) pe.getValue();
assertEquals(0, p.size());
assertThat(p.size()).isEqualTo(0);
}
@Test
@@ -149,7 +147,7 @@ public class PropertiesEditorTests {
PropertiesEditor pe = new PropertiesEditor();
pe.setAsText("");
Properties p = (Properties) pe.getValue();
assertTrue("empty string means empty properties", p.isEmpty());
assertThat(p.isEmpty()).as("empty string means empty properties").isTrue();
}
@Test
@@ -161,13 +159,14 @@ public class PropertiesEditorTests {
PropertiesEditor pe = new PropertiesEditor();
pe.setValue(map);
Object value = pe.getValue();
assertNotNull(value);
assertTrue(value instanceof Properties);
assertThat(value).isNotNull();
boolean condition = value instanceof Properties;
assertThat(condition).isTrue();
Properties props = (Properties) value;
assertEquals(3, props.size());
assertEquals("1", props.getProperty("one"));
assertEquals("2", props.getProperty("two"));
assertEquals("3", props.getProperty("three"));
assertThat(props.size()).isEqualTo(3);
assertThat(props.getProperty("one")).isEqualTo("1");
assertThat(props.getProperty("two")).isEqualTo("2");
assertThat(props.getProperty("three")).isEqualTo("3");
}
}

15
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ReaderEditorTests.java
View File

@@ -22,10 +22,8 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link ReaderEditor} class.
@@ -50,10 +48,11 @@ public class ReaderEditorTests {
ReaderEditor editor = new ReaderEditor();
editor.setAsText(resource);
Object value = editor.getValue();
assertNotNull(value);
assertTrue(value instanceof Reader);
assertThat(value).isNotNull();
boolean condition = value instanceof Reader;
assertThat(condition).isTrue();
reader = (Reader) value;
assertTrue(reader.ready());
assertThat(reader.ready()).isTrue();
}
finally {
if (reader != null) {
@@ -72,12 +71,12 @@ public class ReaderEditorTests {
@Test
public void testGetAsTextReturnsNullByDefault() throws Exception {
assertNull(new ReaderEditor().getAsText());
assertThat(new ReaderEditor().getAsText()).isNull();
String resource = "classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) +
"/" + ClassUtils.getShortName(getClass()) + ".class";
ReaderEditor editor = new ReaderEditor();
editor.setAsText(resource);
assertNull(editor.getAsText());
assertThat(editor.getAsText()).isNull();
}
}

44
spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.java
View File

@@ -20,10 +20,8 @@ import java.util.ResourceBundle;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link ResourceBundleEditor} class.
@@ -43,12 +41,12 @@ public class ResourceBundleEditorTests {
ResourceBundleEditor editor = new ResourceBundleEditor();
editor.setAsText(BASE_NAME);
Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull();
boolean condition = value instanceof ResourceBundle;
assertThat(condition).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue();
ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY);
assertEquals(MESSAGE_KEY, string);
assertThat(string).isEqualTo(MESSAGE_KEY);
}
@Test
@@ -56,12 +54,12 @@ public class ResourceBundleEditorTests {
ResourceBundleEditor editor = new ResourceBundleEditor();
editor.setAsText(BASE_NAME + "_");
Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull();
boolean condition = value instanceof ResourceBundle;
assertThat(condition).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue();
ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY);
assertEquals(MESSAGE_KEY, string);
assertThat(string).isEqualTo(MESSAGE_KEY);
}
@Test
@@ -69,12 +67,12 @@ public class ResourceBundleEditorTests {
ResourceBundleEditor editor = new ResourceBundleEditor();
editor.setAsText(BASE_NAME + "Lang" + "_en");
Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull();
boolean condition = value instanceof ResourceBundle;
assertThat(condition).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue();
ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY);
assertEquals("yob", string);
assertThat(string).isEqualTo("yob");
}
@Test
@@ -82,12 +80,12 @@ public class ResourceBundleEditorTests {
ResourceBundleEditor editor = new ResourceBundleEditor();
editor.setAsText(BASE_NAME + "LangCountry" + "_en_GB");
Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull();
boolean condition = value instanceof ResourceBundle;
assertThat(condition).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue();
ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY);
assertEquals("chav", string);
assertThat(string).isEqualTo("chav");
}
@Test
@@ -95,12 +93,12 @@ public class ResourceBundleEditorTests {
ResourceBundleEditor editor = new ResourceBundleEditor();
editor.setAsText(BASE_NAME + "LangCountryDialect" + "_en_GB_GLASGOW");
Object value = editor.getValue();
assertNotNull("Returned ResourceBundle was null (must not be for valid setAsText(..) call).", value);
assertTrue("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).",
value instanceof ResourceBundle);
assertThat(value).as("Returned ResourceBundle was null (must not be for valid setAsText(..) call).").isNotNull();
boolean condition = value instanceof ResourceBundle;
assertThat(condition).as("Returned object was not a ResourceBundle (must be for valid setAsText(..) call).").isTrue();
ResourceBundle bundle = (ResourceBundle) value;
String string = bundle.getString(MESSAGE_KEY);
assertEquals("ned", string);
assertThat(string).isEqualTo("ned");
}
@Test

45
spring-beans/src/test/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditorTests.java
View File

@@ -18,10 +18,7 @@ package org.springframework.beans.propertyeditors;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rick Evans
@@ -34,13 +31,14 @@ public class StringArrayPropertyEditorTests {
StringArrayPropertyEditor editor = new StringArrayPropertyEditor();
editor.setAsText("0,1,2");
Object value = editor.getValue();
assertNotNull(value);
assertTrue(value instanceof String[]);
assertThat(value).isNotNull();
boolean condition = value instanceof String[];
assertThat(condition).isTrue();
String[] array = (String[]) value;
for (int i = 0; i < array.length; ++i) {
assertEquals("" + i, array[i]);
assertThat(array[i]).isEqualTo(("" + i));
}
assertEquals("0,1,2", editor.getAsText());
assertThat(editor.getAsText()).isEqualTo("0,1,2");
}
@Test
@@ -50,9 +48,9 @@ public class StringArrayPropertyEditorTests {
Object value = editor.getValue();
String[] array = (String[]) value;
for (int i = 0; i < array.length; ++i) {
assertEquals("" + i, array[i]);
assertThat(array[i]).isEqualTo(("" + i));
}
assertEquals("0,1,2", editor.getAsText());
assertThat(editor.getAsText()).isEqualTo("0,1,2");
}
@Test
@@ -62,10 +60,10 @@ public class StringArrayPropertyEditorTests {
Object value = editor.getValue();
String[] array = (String[]) value;
for (int i = 0; i < array.length; ++i) {
assertEquals(3, array[i].length());
assertEquals("" + i, array[i].trim());
assertThat(array[i].length()).isEqualTo(3);
assertThat(array[i].trim()).isEqualTo(("" + i));
}
assertEquals(" 0,1 , 2 ", editor.getAsText());
assertThat(editor.getAsText()).isEqualTo(" 0,1 , 2 ");
}
@Test
@@ -73,12 +71,13 @@ public class StringArrayPropertyEditorTests {
StringArrayPropertyEditor editor = new StringArrayPropertyEditor(":");
editor.setAsText("0:1:2");
Object value = editor.getValue();
assertTrue(value instanceof String[]);
boolean condition = value instanceof String[];
assertThat(condition).isTrue();
String[] array = (String[]) value;
for (int i = 0; i < array.length; ++i) {
assertEquals("" + i, array[i]);
assertThat(array[i]).isEqualTo(("" + i));
}
assertEquals("0:1:2", editor.getAsText());
assertThat(editor.getAsText()).isEqualTo("0:1:2");
}
@Test
@@ -86,12 +85,13 @@ public class StringArrayPropertyEditorTests {
StringArrayPropertyEditor editor = new StringArrayPropertyEditor(",", "\r\n", false);
editor.setAsText("0\r,1,\n2");
Object value = editor.getValue();
assertTrue(value instanceof String[]);
boolean condition = value instanceof String[];
assertThat(condition).isTrue();
String[] array = (String[]) value;
for (int i = 0; i < array.length; ++i) {
assertEquals("" + i, array[i]);
assertThat(array[i]).isEqualTo(("" + i));
}
assertEquals("0,1,2", editor.getAsText());
assertThat(editor.getAsText()).isEqualTo("0,1,2");
}
@Test
@@ -99,15 +99,16 @@ public class StringArrayPropertyEditorTests {
StringArrayPropertyEditor editor = new StringArrayPropertyEditor();
editor.setAsText("");
Object value = editor.getValue();
assertTrue(value instanceof String[]);
assertEquals(0, ((String[]) value).length);
boolean condition = value instanceof String[];
assertThat(condition).isTrue();
assertThat(((String[]) value).length).isEqualTo(0);
}
@Test
public void withEmptyArrayAsNull() throws Exception {
StringArrayPropertyEditor editor = new StringArrayPropertyEditor(",", true);
editor.setAsText("");
assertNull(editor.getValue());
assertThat(editor.getValue()).isNull();
}
}

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

@@ -23,9 +23,7 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -58,9 +56,10 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText(" https://www.springframework.org ");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition = value instanceof URI;
assertThat(condition).isTrue();
URI uri = (URI) value;
assertEquals("https://www.springframework.org", uri.toString());
assertThat(uri.toString()).isEqualTo("https://www.springframework.org");
}
@Test
@@ -69,10 +68,12 @@ public class URIEditorTests {
uriEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) +
"/" + ClassUtils.getShortName(getClass()) + ".class");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition1 = value instanceof URI;
assertThat(condition1).isTrue();
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
assertTrue(!uri.getScheme().startsWith("classpath"));
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
boolean condition = !uri.getScheme().startsWith("classpath");
assertThat(condition).isTrue();
}
@Test
@@ -81,10 +82,12 @@ public class URIEditorTests {
uriEditor.setAsText(" classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) +
"/" + ClassUtils.getShortName(getClass()) + ".class ");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition1 = value instanceof URI;
assertThat(condition1).isTrue();
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
assertTrue(!uri.getScheme().startsWith("classpath"));
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
boolean condition = !uri.getScheme().startsWith("classpath");
assertThat(condition).isTrue();
}
@Test
@@ -92,24 +95,25 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText("classpath:test.txt");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition = value instanceof URI;
assertThat(condition).isTrue();
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
assertTrue(uri.getScheme().startsWith("classpath"));
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
assertThat(uri.getScheme().startsWith("classpath")).isTrue();
}
@Test
public void setAsTextWithNull() throws Exception {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText(null);
assertNull(uriEditor.getValue());
assertEquals("", uriEditor.getAsText());
assertThat(uriEditor.getValue()).isNull();
assertThat(uriEditor.getAsText()).isEqualTo("");
}
@Test
public void getAsTextReturnsEmptyStringIfValueNotSet() throws Exception {
PropertyEditor uriEditor = new URIEditor();
assertEquals("", uriEditor.getAsText());
assertThat(uriEditor.getAsText()).isEqualTo("");
}
@Test
@@ -117,10 +121,11 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText("https://example.com/spaces and \u20AC");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition = value instanceof URI;
assertThat(condition).isTrue();
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
assertThat(uri.toASCIIString()).isEqualTo("https://example.com/spaces%20and%20%E2%82%AC");
}
@Test
@@ -128,10 +133,11 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor(false);
uriEditor.setAsText("https://example.com/spaces%20and%20%E2%82%AC");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition = value instanceof URI;
assertThat(condition).isTrue();
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
assertThat(uriEditor.getAsText()).isEqualTo(uri.toString());
assertThat(uri.toASCIIString()).isEqualTo("https://example.com/spaces%20and%20%E2%82%AC");
}
@@ -139,9 +145,10 @@ public class URIEditorTests {
PropertyEditor uriEditor = new URIEditor();
uriEditor.setAsText(uriSpec);
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
boolean condition = value instanceof URI;
assertThat(condition).isTrue();
URI uri = (URI) value;
assertEquals(uriSpec, uri.toString());
assertThat(uri.toString()).isEqualTo(uriSpec);
}
}

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

@@ -23,10 +23,8 @@ import org.junit.Test;
import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* @author Rick Evans
@@ -45,9 +43,10 @@ public class URLEditorTests {
PropertyEditor urlEditor = new URLEditor();
urlEditor.setAsText("mailto:juergen.hoeller@interface21.com");
Object value = urlEditor.getValue();
assertTrue(value instanceof URL);
boolean condition = value instanceof URL;
assertThat(condition).isTrue();
URL url = (URL) value;
assertEquals(url.toExternalForm(), urlEditor.getAsText());
assertThat(urlEditor.getAsText()).isEqualTo(url.toExternalForm());
}
@Test
@@ -55,9 +54,10 @@ public class URLEditorTests {
PropertyEditor urlEditor = new URLEditor();
urlEditor.setAsText("https://www.springframework.org");
Object value = urlEditor.getValue();
assertTrue(value instanceof URL);
boolean condition = value instanceof URL;
assertThat(condition).isTrue();
URL url = (URL) value;
assertEquals(url.toExternalForm(), urlEditor.getAsText());
assertThat(urlEditor.getAsText()).isEqualTo(url.toExternalForm());
}
@Test
@@ -66,10 +66,12 @@ public class URLEditorTests {
urlEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) +
"/" + ClassUtils.getShortName(getClass()) + ".class");
Object value = urlEditor.getValue();
assertTrue(value instanceof URL);
boolean condition1 = value instanceof URL;
assertThat(condition1).isTrue();
URL url = (URL) value;
assertEquals(url.toExternalForm(), urlEditor.getAsText());
assertTrue(!url.getProtocol().startsWith("classpath"));
assertThat(urlEditor.getAsText()).isEqualTo(url.toExternalForm());
boolean condition = !url.getProtocol().startsWith("classpath");
assertThat(condition).isTrue();
}
@Test
@@ -83,14 +85,14 @@ public class URLEditorTests {
public void testSetAsTextWithNull() throws Exception {
PropertyEditor urlEditor = new URLEditor();
urlEditor.setAsText(null);
assertNull(urlEditor.getValue());
assertEquals("", urlEditor.getAsText());
assertThat(urlEditor.getValue()).isNull();
assertThat(urlEditor.getAsText()).isEqualTo("");
}
@Test
public void testGetAsTextReturnsEmptyStringIfValueNotSet() throws Exception {
PropertyEditor urlEditor = new URLEditor();
assertEquals("", urlEditor.getAsText());
assertThat(urlEditor.getAsText()).isEqualTo("");
}
}

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

@@ -20,8 +20,7 @@ import java.time.ZoneId;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Nicholas Williams
@@ -35,10 +34,10 @@ public class ZoneIdEditorTests {
editor.setAsText("America/Chicago");
ZoneId zoneId = (ZoneId) editor.getValue();
assertNotNull("The zone ID should not be null.", zoneId);
assertEquals("The zone ID is not correct.", ZoneId.of("America/Chicago"), zoneId);
assertThat(zoneId).as("The zone ID should not be null.").isNotNull();
assertThat(zoneId).as("The zone ID is not correct.").isEqualTo(ZoneId.of("America/Chicago"));
assertEquals("The text version is not correct.", "America/Chicago", editor.getAsText());
assertThat(editor.getAsText()).as("The text version is not correct.").isEqualTo("America/Chicago");
}
@Test
@@ -46,21 +45,21 @@ public class ZoneIdEditorTests {
editor.setAsText("America/Los_Angeles");
ZoneId zoneId = (ZoneId) editor.getValue();
assertNotNull("The zone ID should not be null.", zoneId);
assertEquals("The zone ID is not correct.", ZoneId.of("America/Los_Angeles"), zoneId);
assertThat(zoneId).as("The zone ID should not be null.").isNotNull();
assertThat(zoneId).as("The zone ID is not correct.").isEqualTo(ZoneId.of("America/Los_Angeles"));
assertEquals("The text version is not correct.", "America/Los_Angeles", editor.getAsText());
assertThat(editor.getAsText()).as("The text version is not correct.").isEqualTo("America/Los_Angeles");
}
@Test
public void getNullAsText() {
assertEquals("The returned value is not correct.", "", editor.getAsText());
assertThat(editor.getAsText()).as("The returned value is not correct.").isEqualTo("");
}
@Test
public void getValueAsText() {
editor.setValue(ZoneId.of("America/New_York"));
assertEquals("The text version is not correct.", "America/New_York", editor.getAsText());
assertThat(editor.getAsText()).as("The text version is not correct.").isEqualTo("America/New_York");
}
}

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

@@ -25,9 +25,7 @@ import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
@@ -57,114 +55,114 @@ public class PagedListHolderTests {
tbs.add(tb3);
PagedListHolder holder = new PagedListHolder(tbs);
assertTrue("Correct source", holder.getSource() == tbs);
assertTrue("Correct number of elements", holder.getNrOfElements() == 3);
assertTrue("Correct number of pages", holder.getPageCount() == 1);
assertTrue("Correct page size", holder.getPageSize() == PagedListHolder.DEFAULT_PAGE_SIZE);
assertTrue("Correct page number", holder.getPage() == 0);
assertTrue("First page", holder.isFirstPage());
assertTrue("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 0);
assertTrue("Correct first element", holder.getLastElementOnPage() == 2);
assertTrue("Correct page list size", holder.getPageList().size() == 3);
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb1);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb2);
assertTrue("Correct page list contents", holder.getPageList().get(2) == tb3);
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.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();
holder.setPageSize(2);
assertTrue("Correct number of pages", holder.getPageCount() == 2);
assertTrue("Correct page size", holder.getPageSize() == 2);
assertTrue("Correct page number", holder.getPage() == 0);
assertTrue("First page", holder.isFirstPage());
assertFalse("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 0);
assertTrue("Correct last element", holder.getLastElementOnPage() == 1);
assertTrue("Correct page list size", holder.getPageList().size() == 2);
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb1);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb2);
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.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();
holder.setPage(1);
assertTrue("Correct page number", holder.getPage() == 1);
assertFalse("First page", holder.isFirstPage());
assertTrue("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 2);
assertTrue("Correct last element", holder.getLastElementOnPage() == 2);
assertTrue("Correct page list size", holder.getPageList().size() == 1);
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb3);
assertThat(holder.getPage() == 1).as("Correct page number").isTrue();
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();
holder.setPageSize(3);
assertTrue("Correct number of pages", holder.getPageCount() == 1);
assertTrue("Correct page size", holder.getPageSize() == 3);
assertTrue("Correct page number", holder.getPage() == 0);
assertTrue("First page", holder.isFirstPage());
assertTrue("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 0);
assertTrue("Correct last element", holder.getLastElementOnPage() == 2);
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.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();
holder.setPage(1);
holder.setPageSize(2);
assertTrue("Correct number of pages", holder.getPageCount() == 2);
assertTrue("Correct page size", holder.getPageSize() == 2);
assertTrue("Correct page number", holder.getPage() == 1);
assertFalse("First page", holder.isFirstPage());
assertTrue("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 2);
assertTrue("Correct last element", holder.getLastElementOnPage() == 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.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();
holder.setPageSize(2);
holder.setPage(1);
((MutableSortDefinition) holder.getSort()).setProperty("name");
((MutableSortDefinition) holder.getSort()).setIgnoreCase(false);
holder.resort();
assertTrue("Correct source", holder.getSource() == tbs);
assertTrue("Correct number of elements", holder.getNrOfElements() == 3);
assertTrue("Correct number of pages", holder.getPageCount() == 2);
assertTrue("Correct page size", holder.getPageSize() == 2);
assertTrue("Correct page number", holder.getPage() == 0);
assertTrue("First page", holder.isFirstPage());
assertFalse("Last page", holder.isLastPage());
assertTrue("Correct first element", holder.getFirstElementOnPage() == 0);
assertTrue("Correct last element", holder.getLastElementOnPage() == 1);
assertTrue("Correct page list size", holder.getPageList().size() == 2);
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb3);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb1);
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.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();
((MutableSortDefinition) holder.getSort()).setProperty("name");
holder.resort();
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb2);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb1);
assertThat(holder.getPageList().get(0) == tb2).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb1).as("Correct page list contents").isTrue();
((MutableSortDefinition) holder.getSort()).setProperty("name");
holder.resort();
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb3);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb1);
assertThat(holder.getPageList().get(0) == tb3).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb1).as("Correct page list contents").isTrue();
holder.setPage(1);
assertTrue("Correct page list size", holder.getPageList().size() == 1);
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb2);
assertThat(holder.getPageList().size() == 1).as("Correct page list size").isTrue();
assertThat(holder.getPageList().get(0) == tb2).as("Correct page list contents").isTrue();
((MutableSortDefinition) holder.getSort()).setProperty("age");
holder.resort();
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb1);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb3);
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb3).as("Correct page list contents").isTrue();
((MutableSortDefinition) holder.getSort()).setIgnoreCase(true);
holder.resort();
assertTrue("Correct page list contents", holder.getPageList().get(0) == tb1);
assertTrue("Correct page list contents", holder.getPageList().get(1) == tb3);
assertThat(holder.getPageList().get(0) == tb1).as("Correct page list contents").isTrue();
assertThat(holder.getPageList().get(1) == tb3).as("Correct page list contents").isTrue();
holder.nextPage();
assertEquals(1, holder.getPage());
assertThat(holder.getPage()).isEqualTo(1);
holder.previousPage();
assertEquals(0, holder.getPage());
assertThat(holder.getPage()).isEqualTo(0);
holder.nextPage();
assertEquals(1, holder.getPage());
assertThat(holder.getPage()).isEqualTo(1);
holder.nextPage();
assertEquals(1, holder.getPage());
assertThat(holder.getPage()).isEqualTo(1);
holder.previousPage();
assertEquals(0, holder.getPage());
assertThat(holder.getPage()).isEqualTo(0);
holder.previousPage();
assertEquals(0, holder.getPage());
assertThat(holder.getPage()).isEqualTo(0);
}

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

@@ -20,7 +20,7 @@ import java.util.Comparator;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for {@link PropertyComparator}.
@@ -39,9 +39,9 @@ public class PropertyComparatorTests {
dog2.setNickName("biscy");
PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
assertTrue(c.compare(dog, dog2) > 0);
assertTrue(c.compare(dog, dog) == 0);
assertTrue(c.compare(dog2, dog) < 0);
assertThat(c.compare(dog, dog2) > 0).isTrue();
assertThat(c.compare(dog, dog) == 0).isTrue();
assertThat(c.compare(dog2, dog) < 0).isTrue();
}
@Test
@@ -49,7 +49,7 @@ public class PropertyComparatorTests {
Dog dog = new Dog();
Dog dog2 = new Dog();
PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
assertTrue(c.compare(dog, dog2) == 0);
assertThat(c.compare(dog, dog2) == 0).isTrue();
}
@Test
@@ -64,13 +64,13 @@ public class PropertyComparatorTests {
dog2.setFirstName("biscuit");
dog2.setLastName("grayspots");
assertTrue(c.compare(dog1, dog2) == 0);
assertThat(c.compare(dog1, dog2) == 0).isTrue();
c = c.thenComparing(new PropertyComparator<>("firstName", false, true));
assertTrue(c.compare(dog1, dog2) > 0);
assertThat(c.compare(dog1, dog2) > 0).isTrue();
dog2.setLastName("konikk dog");
assertTrue(c.compare(dog2, dog1) > 0);
assertThat(c.compare(dog2, dog1) > 0).isTrue();
}
@Test
@@ -86,9 +86,9 @@ public class PropertyComparatorTests {
dog2.setFirstName("biscuit");
dog2.setLastName("grayspots");
assertTrue(c.compare(dog1, dog2) > 0);
assertThat(c.compare(dog1, dog2) > 0).isTrue();
c = c.reversed();
assertTrue(c.compare(dog1, dog2) < 0);
assertThat(c.compare(dog1, dog2) < 0).isTrue();
}