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

Discontinue use of deprecated AssertThrows 

This commit refactors ReflectionTestUtilsTests so that it no longer uses
the deprecated AssertThrows class.
This commit is contained in:
Sam Brannen 2014-08-29 15:27:26 +02:00
parent 27be396b06
commit 1bce6ac60c
1 changed files with 61 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,24 +16,21 @@
package org.springframework.test.util; package org.springframework.test.util;
import static org.junit.Assert.*;
import static org.springframework.test.util.ReflectionTestUtils.*;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.test.AssertThrows;
import org.springframework.test.util.subpackage.Component; import org.springframework.test.util.subpackage.Component;
import org.springframework.test.util.subpackage.LegacyEntity; import org.springframework.test.util.subpackage.LegacyEntity;
import org.springframework.test.util.subpackage.Person; import org.springframework.test.util.subpackage.Person;
import static org.junit.Assert.*;
import static org.springframework.test.util.ReflectionTestUtils.*;
/** /**
* Unit tests for {@link ReflectionTestUtils}. * Unit tests for {@link ReflectionTestUtils}.
* *
* @author Sam Brannen * @author Sam Brannen
* @author Juergen Hoeller * @author Juergen Hoeller
*/ */
@SuppressWarnings("deprecation")
public class ReflectionTestUtilsTests { public class ReflectionTestUtilsTests {
private static final Float PI = new Float((float) 22 / 7); private static final Float PI = new Float((float) 22 / 7);
@ -43,11 +40,7 @@ public class ReflectionTestUtilsTests {
@Test @Test
public void setAndGetFields() throws Exception { public void setFieldForStandardUseCases() throws Exception {
// ---------------------------------------------------------------------
// Standard
setField(person, "id", new Long(99), long.class); setField(person, "id", new Long(99), long.class);
setField(person, "name", "Tom"); setField(person, "name", "Tom");
setField(person, "age", new Integer(42)); setField(person, "age", new Integer(42));
@ -68,10 +61,10 @@ public class ReflectionTestUtilsTests {
assertEquals("blue", getField(person, "eyeColor")); assertEquals("blue", getField(person, "eyeColor"));
assertEquals(Boolean.TRUE, getField(person, "likesPets")); assertEquals(Boolean.TRUE, getField(person, "likesPets"));
assertEquals(PI, getField(person, "favoriteNumber")); assertEquals(PI, getField(person, "favoriteNumber"));
}
// --------------------------------------------------------------------- @Test
// Null - non-primitives public void setFieldWithNullValuesForNonPrimitives() throws Exception {
setField(person, "name", null, String.class); setField(person, "name", null, String.class);
setField(person, "eyeColor", null, String.class); setField(person, "eyeColor", null, String.class);
setField(person, "favoriteNumber", null, Number.class); setField(person, "favoriteNumber", null, Number.class);
@ -79,36 +72,21 @@ public class ReflectionTestUtilsTests {
assertNull("name (protected field)", person.getName()); assertNull("name (protected field)", person.getName());
assertNull("eye color (package private field)", person.getEyeColor()); assertNull("eye color (package private field)", person.getEyeColor());
assertNull("'favorite number' (package field)", person.getFavoriteNumber()); assertNull("'favorite number' (package field)", person.getFavoriteNumber());
}
// --------------------------------------------------------------------- @Test(expected = IllegalArgumentException.class)
// Null - primitives public void setFieldWithNullValueForPrimitiveLong() throws Exception {
setField(person, "id", null, long.class);
}
new AssertThrows(IllegalArgumentException.class, @Test(expected = IllegalArgumentException.class)
"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { public void setFieldWithNullValueForPrimitiveInt() throws Exception {
setField(person, "age", null, int.class);
}
@Override @Test(expected = IllegalArgumentException.class)
public void test() throws Exception { public void setFieldWithNullValueForPrimitiveBoolean() throws Exception {
setField(person, "id", null, long.class); setField(person, "likesPets", null, boolean.class);
}
}.runTest();
new AssertThrows(IllegalArgumentException.class,
"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") {
@Override
public void test() throws Exception {
setField(person, "age", null, int.class);
}
}.runTest();
new AssertThrows(IllegalArgumentException.class,
"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") {
@Override
public void test() throws Exception {
setField(person, "likesPets", null, boolean.class);
}
}.runTest();
} }
/** /**
@ -123,35 +101,7 @@ public class ReflectionTestUtilsTests {
} }
@Test @Test
public void invokeSetterAndMethods() throws Exception { public void invokeSetterMethodWithExplicitSetterMethodNames() throws Exception {
// ---------------------------------------------------------------------
// Standard - properties
invokeSetterMethod(person, "id", new Long(99), long.class);
invokeSetterMethod(person, "name", "Tom");
invokeSetterMethod(person, "age", new Integer(42));
invokeSetterMethod(person, "eyeColor", "blue", String.class);
invokeSetterMethod(person, "likesPets", Boolean.TRUE);
invokeSetterMethod(person, "favoriteNumber", PI, Number.class);
assertEquals("ID (protected method in a superclass)", 99, person.getId());
assertEquals("name (private method)", "Tom", person.getName());
assertEquals("age (protected method)", 42, person.getAge());
assertEquals("eye color (package private method)", "blue", person.getEyeColor());
assertEquals("'likes pets' flag (protected method for a boolean)", true, person.likesPets());
assertEquals("'favorite number' (protected method for a Number)", PI, person.getFavoriteNumber());
assertEquals(new Long(99), invokeGetterMethod(person, "id"));
assertEquals("Tom", invokeGetterMethod(person, "name"));
assertEquals(new Integer(42), invokeGetterMethod(person, "age"));
assertEquals("blue", invokeGetterMethod(person, "eyeColor"));
assertEquals(Boolean.TRUE, invokeGetterMethod(person, "likesPets"));
assertEquals(PI, invokeGetterMethod(person, "favoriteNumber"));
// ---------------------------------------------------------------------
// Standard - setter methods
invokeSetterMethod(person, "setId", new Long(1), long.class); invokeSetterMethod(person, "setId", new Long(1), long.class);
invokeSetterMethod(person, "setName", "Jerry", String.class); invokeSetterMethod(person, "setName", "Jerry", String.class);
invokeSetterMethod(person, "setAge", new Integer(33), int.class); invokeSetterMethod(person, "setAge", new Integer(33), int.class);
@ -172,10 +122,34 @@ public class ReflectionTestUtilsTests {
assertEquals("green", invokeGetterMethod(person, "getEyeColor")); assertEquals("green", invokeGetterMethod(person, "getEyeColor"));
assertEquals(Boolean.FALSE, invokeGetterMethod(person, "likesPets")); assertEquals(Boolean.FALSE, invokeGetterMethod(person, "likesPets"));
assertEquals(new Integer(42), invokeGetterMethod(person, "getFavoriteNumber")); assertEquals(new Integer(42), invokeGetterMethod(person, "getFavoriteNumber"));
}
// --------------------------------------------------------------------- @Test
// Null - non-primitives public void invokeSetterMethodWithJavaBeanPropertyNames() throws Exception {
invokeSetterMethod(person, "id", new Long(99), long.class);
invokeSetterMethod(person, "name", "Tom");
invokeSetterMethod(person, "age", new Integer(42));
invokeSetterMethod(person, "eyeColor", "blue", String.class);
invokeSetterMethod(person, "likesPets", Boolean.TRUE);
invokeSetterMethod(person, "favoriteNumber", PI, Number.class);
assertEquals("ID (protected method in a superclass)", 99, person.getId());
assertEquals("name (private method)", "Tom", person.getName());
assertEquals("age (protected method)", 42, person.getAge());
assertEquals("eye color (package private method)", "blue", person.getEyeColor());
assertEquals("'likes pets' flag (protected method for a boolean)", true, person.likesPets());
assertEquals("'favorite number' (protected method for a Number)", PI, person.getFavoriteNumber());
assertEquals(new Long(99), invokeGetterMethod(person, "id"));
assertEquals("Tom", invokeGetterMethod(person, "name"));
assertEquals(new Integer(42), invokeGetterMethod(person, "age"));
assertEquals("blue", invokeGetterMethod(person, "eyeColor"));
assertEquals(Boolean.TRUE, invokeGetterMethod(person, "likesPets"));
assertEquals(PI, invokeGetterMethod(person, "favoriteNumber"));
}
@Test
public void invokeSetterMethodWithNullValuesForNonPrimitives() throws Exception {
invokeSetterMethod(person, "name", null, String.class); invokeSetterMethod(person, "name", null, String.class);
invokeSetterMethod(person, "eyeColor", null, String.class); invokeSetterMethod(person, "eyeColor", null, String.class);
invokeSetterMethod(person, "favoriteNumber", null, Number.class); invokeSetterMethod(person, "favoriteNumber", null, Number.class);
@ -183,36 +157,21 @@ public class ReflectionTestUtilsTests {
assertNull("name (private method)", person.getName()); assertNull("name (private method)", person.getName());
assertNull("eye color (package private method)", person.getEyeColor()); assertNull("eye color (package private method)", person.getEyeColor());
assertNull("'favorite number' (protected method for a Number)", person.getFavoriteNumber()); assertNull("'favorite number' (protected method for a Number)", person.getFavoriteNumber());
}
// --------------------------------------------------------------------- @Test(expected = IllegalArgumentException.class)
// Null - primitives public void invokeSetterMethodWithNullValueForPrimitiveLong() throws Exception {
invokeSetterMethod(person, "id", null, long.class);
}
new AssertThrows(IllegalArgumentException.class, @Test(expected = IllegalArgumentException.class)
"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { public void invokeSetterMethodWithNullValueForPrimitiveInt() throws Exception {
invokeSetterMethod(person, "age", null, int.class);
}
@Override @Test(expected = IllegalArgumentException.class)
public void test() throws Exception { public void invokeSetterMethodWithNullValueForPrimitiveBoolean() throws Exception {
invokeSetterMethod(person, "id", null, long.class); invokeSetterMethod(person, "likesPets", null, boolean.class);
}
}.runTest();
new AssertThrows(IllegalArgumentException.class,
"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") {
@Override
public void test() throws Exception {
invokeSetterMethod(person, "age", null, int.class);
}
}.runTest();
new AssertThrows(IllegalArgumentException.class,
"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") {
@Override
public void test() throws Exception {
invokeSetterMethod(person, "likesPets", null, boolean.class);
}
}.runTest();
} }
@Test @Test
@ -222,8 +181,8 @@ public class ReflectionTestUtilsTests {
assertEquals("subtract(5, 2)", 3, difference.intValue()); assertEquals("subtract(5, 2)", 3, difference.intValue());
} }
@Ignore("[SPR-8644] findMethod() does not currently support var-args")
@Test @Test
@Ignore("[SPR-8644] findMethod() does not currently support var-args")
public void invokeMethodWithPrimitiveVarArgs() { public void invokeMethodWithPrimitiveVarArgs() {
// IntelliJ IDEA 11 won't accept int assignment here // IntelliJ IDEA 11 won't accept int assignment here
Integer sum = invokeMethod(component, "add", 1, 2, 3, 4); Integer sum = invokeMethod(component, "add", 1, 2, 3, 4);
@ -238,7 +197,7 @@ public class ReflectionTestUtilsTests {
} }
@Test @Test
public void invokeMethodsSimulatingLifecycleEvents() { public void invokeMethodSimulatingLifecycleEvents() {
assertNull("number", component.getNumber()); assertNull("number", component.getNumber());
assertNull("text", component.getText()); assertNull("text", component.getText());