root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Changed use of AssertThrows to @Test(expected = ...) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@236 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma 2008-10-31 09:05:50 +00:00
parent 15dc671dd9
commit 42a01cbeed
1 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
org.springframework.testsuite/src/test/java/org/springframework/util/ReflectionUtilsTests.java
View File

@ -25,26 +25,24 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import junit.framework.TestCase; import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.TestBean; import org.springframework.beans.TestBean;
import org.springframework.test.AssertThrows;
/** /**
* <p> * <p> JUnit 4 based unit tests for {@link ReflectionUtils}. </p>
* JUnit 3.8 based unit tests for {@link ReflectionUtils}.
* </p>
* *
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen * @author Sam Brannen
* @author Arjen Poutsma
*/ */
public class ReflectionUtilsTests extends TestCase { public class ReflectionUtilsTests {
public void testFindField() { @Test
Field field; public void findField() {
Field field = ReflectionUtils.findField(TestBeanSubclassWithPublicField.class, "publicField", String.class);
field = ReflectionUtils.findField(TestBeanSubclassWithPublicField.class, "publicField", String.class);
assertNotNull(field); assertNotNull(field);
assertEquals("publicField", field.getName()); assertEquals("publicField", field.getName());
assertEquals(String.class, field.getType()); assertEquals(String.class, field.getType());
@ -63,18 +61,11 @@ public class ReflectionUtilsTests extends TestCase {
assertTrue("Field should be private.", Modifier.isPrivate(field.getModifiers())); assertTrue("Field should be private.", Modifier.isPrivate(field.getModifiers()));
} }
public void testSetField() { @Test
public void setField() {
final TestBeanSubclassWithNewField testBean = new TestBeanSubclassWithNewField(); final TestBeanSubclassWithNewField testBean = new TestBeanSubclassWithNewField();
final Field field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class); final Field field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class);
new AssertThrows(IllegalStateException.class,
"Calling setField() with on a private field without making it accessible should throw an IllegalStateException.") {
public void test() throws Exception {
ReflectionUtils.setField(field, testBean, "FooBar");
}
}.runTest();
ReflectionUtils.makeAccessible(field); ReflectionUtils.makeAccessible(field);
ReflectionUtils.setField(field, testBean, "FooBar"); ReflectionUtils.setField(field, testBean, "FooBar");
@ -85,10 +76,16 @@ public class ReflectionUtilsTests extends TestCase {
assertNull(testBean.getName()); assertNull(testBean.getName());
} }
@Test(expected = IllegalStateException.class)
public void setFieldIllegal() {
final TestBeanSubclassWithNewField testBean = new TestBeanSubclassWithNewField();
final Field field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class);
ReflectionUtils.setField(field, testBean, "FooBar");
}
public void testInvokeMethod() throws Exception { @Test
public void invokeMethod() throws Exception {
String rob = "Rob Harrop"; String rob = "Rob Harrop";
String juergen = "Juergen Hoeller";
TestBean bean = new TestBean(); TestBean bean = new TestBean();
bean.setName(rob); bean.setName(rob);
@ -99,11 +96,13 @@ public class ReflectionUtilsTests extends TestCase {
Object name = ReflectionUtils.invokeMethod(getName, bean); Object name = ReflectionUtils.invokeMethod(getName, bean);
assertEquals("Incorrect name returned", rob, name); assertEquals("Incorrect name returned", rob, name);
String juergen = "Juergen Hoeller";
ReflectionUtils.invokeMethod(setName, bean, new Object[]{juergen}); ReflectionUtils.invokeMethod(setName, bean, new Object[]{juergen});
assertEquals("Incorrect name set", juergen, bean.getName()); assertEquals("Incorrect name set", juergen, bean.getName());
} }
public void testDeclaresException() throws Exception { @Test
public void declaresException() throws Exception {
Method remoteExMethod = A.class.getDeclaredMethod("foo", new Class[]{Integer.class}); Method remoteExMethod = A.class.getDeclaredMethod("foo", new Class[]{Integer.class});
assertTrue(ReflectionUtils.declaresException(remoteExMethod, RemoteException.class)); assertTrue(ReflectionUtils.declaresException(remoteExMethod, RemoteException.class));
assertTrue(ReflectionUtils.declaresException(remoteExMethod, ConnectException.class)); assertTrue(ReflectionUtils.declaresException(remoteExMethod, ConnectException.class));
@ -117,7 +116,8 @@ public class ReflectionUtilsTests extends TestCase {
assertFalse(ReflectionUtils.declaresException(illegalExMethod, Exception.class)); assertFalse(ReflectionUtils.declaresException(illegalExMethod, Exception.class));
} }
public void testCopySrcToDestinationOfIncorrectClass() { @Test
public void copySrcToDestinationOfIncorrectClass() {
TestBean src = new TestBean(); TestBean src = new TestBean();
String dest = new String(); String dest = new String();
try { try {
@ -129,7 +129,8 @@ public class ReflectionUtilsTests extends TestCase {
} }
} }
public void testRejectsNullSrc() { @Test
public void rejectsNullSrc() {
TestBean src = null; TestBean src = null;
String dest = new String(); String dest = new String();
try { try {
@ -141,7 +142,8 @@ public class ReflectionUtilsTests extends TestCase {
} }
} }
public void testRejectsNullDest() { @Test
public void rejectsNullDest() {
TestBean src = new TestBean(); TestBean src = new TestBean();
String dest = null; String dest = null;
try { try {
@ -153,13 +155,15 @@ public class ReflectionUtilsTests extends TestCase {
} }
} }
public void testValidCopy() { @Test
public void validCopy() {
TestBean src = new TestBean(); TestBean src = new TestBean();
TestBean dest = new TestBean(); TestBean dest = new TestBean();
testValidCopy(src, dest); testValidCopy(src, dest);
} }
public void testValidCopyOnSubTypeWithNewField() { @Test
public void validCopyOnSubTypeWithNewField() {
TestBeanSubclassWithNewField src = new TestBeanSubclassWithNewField(); TestBeanSubclassWithNewField src = new TestBeanSubclassWithNewField();
TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField(); TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField();
src.magic = 11; src.magic = 11;
@ -172,7 +176,8 @@ public class ReflectionUtilsTests extends TestCase {
assertEquals(src.prot, dest.prot); assertEquals(src.prot, dest.prot);
} }
public void testValidCopyToSubType() { @Test
public void validCopyToSubType() {
TestBean src = new TestBean(); TestBean src = new TestBean();
TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField(); TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField();
dest.magic = 11; dest.magic = 11;
@ -181,7 +186,8 @@ public class ReflectionUtilsTests extends TestCase {
assertEquals(11, dest.magic); assertEquals(11, dest.magic);
} }
public void testValidCopyToSubTypeWithFinalField() { @Test
public void validCopyToSubTypeWithFinalField() {
TestBeanSubclassWithFinalField src = new TestBeanSubclassWithFinalField(); TestBeanSubclassWithFinalField src = new TestBeanSubclassWithFinalField();
TestBeanSubclassWithFinalField dest = new TestBeanSubclassWithFinalField(); TestBeanSubclassWithFinalField dest = new TestBeanSubclassWithFinalField();
// Check that this doesn't fail due to attempt to assign final // Check that this doesn't fail due to attempt to assign final
@ -201,9 +207,10 @@ public class ReflectionUtilsTests extends TestCase {
} }
static class ListSavingMethodCallback implements ReflectionUtils.MethodCallback { static class ListSavingMethodCallback implements ReflectionUtils.MethodCallback {
private List methodNames = new LinkedList();
private List methods = new LinkedList(); private List<String> methodNames = new LinkedList<String>();
private List<Method> methods = new LinkedList<Method>();
public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException { public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException {
this.methodNames.add(m.getName()); this.methodNames.add(m.getName());
@ -217,7 +224,7 @@ public class ReflectionUtilsTests extends TestCase {
public List getMethods() { public List getMethods() {
return this.methods; return this.methods;
} }
}; }
public void testDoWithProtectedMethods() { public void testDoWithProtectedMethods() {
ListSavingMethodCallback mc = new ListSavingMethodCallback(); ListSavingMethodCallback mc = new ListSavingMethodCallback();
@ -234,6 +241,8 @@ public class ReflectionUtilsTests extends TestCase {
} }
public static class TestBeanSubclass extends TestBean { public static class TestBeanSubclass extends TestBean {
@Override
public void absquatulate() { public void absquatulate() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -257,29 +266,33 @@ public class ReflectionUtilsTests extends TestCase {
assertNotNull(ReflectionUtils.findMethod(B.class, "foo", new Class[]{Integer.class})); assertNotNull(ReflectionUtils.findMethod(B.class, "foo", new Class[]{Integer.class}));
} }
public static class TestBeanSubclassWithPublicField extends TestBean { public static class TestBeanSubclassWithPublicField extends TestBean {
public String publicField = "foo"; public String publicField = "foo";
} }
public static class TestBeanSubclassWithNewField extends TestBean { public static class TestBeanSubclassWithNewField extends TestBean {
private int magic; private int magic;
protected String prot = "foo"; protected String prot = "foo";
} }
public static class TestBeanSubclassWithFinalField extends TestBean { public static class TestBeanSubclassWithFinalField extends TestBean {
private final String foo = "will break naive copy that doesn't exclude statics"; private final String foo = "will break naive copy that doesn't exclude statics";
} }
private static class A { private static class A {
private void foo(Integer i) throws RemoteException {}
}
private void foo(Integer i) throws RemoteException {
}
}
private static class B extends A { private static class B extends A {
void bar(String s) throws IllegalArgumentException {}
void bar(String s) throws IllegalArgumentException {
}
} }
} }