From 670aa4b7ef33bd1d8944f335cc6521859d39b9be Mon Sep 17 00:00:00 2001
From: Min-soo <viviennes7@naver.com>
Date: Sun, 24 Mar 2019 00:15:07 +0900
Subject: [PATCH] Use JUnit 4's expected exception support in BeanUtilsTests

This commit uses JUnit 4's built-in expected exception support in
BeanUtilsTests,

Closes gh-22354
---
 .../springframework/beans/BeanUtilsTests.java | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index 12f3469500..25289d3224 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -47,28 +47,16 @@ import static org.junit.Assert.*;
  */
 public class BeanUtilsTests {
 
-	@Test
-	public void testInstantiateClass() {
-		// give proper class
+	@Test(expected = FatalBeanException.class)
+	public void testInstantiateClassGivenInterface() {
 		BeanUtils.instantiateClass(ArrayList.class);
+		BeanUtils.instantiateClass(List.class);
+	}
 
-		try {
-			// give interface
-			BeanUtils.instantiateClass(List.class);
-			fail("Should have thrown FatalBeanException");
-		}
-		catch (FatalBeanException ex) {
-			// expected
-		}
-
-		try {
-			// give class without default constructor
-			BeanUtils.instantiateClass(CustomDateEditor.class);
-			fail("Should have thrown FatalBeanException");
-		}
-		catch (FatalBeanException ex) {
-			// expected
-		}
+	@Test(expected = FatalBeanException.class)
+	public void testInstantiateClassGivenClassWithoutDefaultConstructor() {
+		BeanUtils.instantiateClass(ArrayList.class);
+		BeanUtils.instantiateClass(CustomDateEditor.class);
 	}
 
 	@Test  // gh-22531
@@ -233,23 +221,14 @@ public class BeanUtilsTests {
 		assertSignatureEquals(desiredMethod, "doSomething()");
 	}
 
-	@Test
-	public void testResolveInvalidSignature() throws Exception {
-		try {
-			BeanUtils.resolveSignature("doSomething(", MethodSignatureBean.class);
-			fail("Should not be able to parse with opening but no closing paren.");
-		}
-		catch (IllegalArgumentException ex) {
-			// success
-		}
+	@Test(expected = IllegalArgumentException.class)
+	public void testResolveInvalidSignatureEndParen() {
+		BeanUtils.resolveSignature("doSomething(", MethodSignatureBean.class);
+	}
 
-		try {
-			BeanUtils.resolveSignature("doSomething)", MethodSignatureBean.class);
-			fail("Should not be able to parse with closing but no opening paren.");
-		}
-		catch (IllegalArgumentException ex) {
-			// success
-		}
+	@Test(expected = IllegalArgumentException.class)
+	public void testResolveInvalidSignatureStartParen() {
+		BeanUtils.resolveSignature("doSomething)", MethodSignatureBean.class);
 	}
 
 	@Test