From 0392b80ad3e0a7411af0f2cfd7182e9e5ab5f857 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Fri, 31 Oct 2008 09:34:55 +0000
Subject: [PATCH] Changed use of AssertThrows to @Test(expected = ...)

---
 .../core/io/ResourceEditorTests.java          | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/io/ResourceEditorTests.java b/org.springframework.testsuite/src/test/java/org/springframework/core/io/ResourceEditorTests.java
index c9a4797c3a..ab2f7e12f8 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/core/io/ResourceEditorTests.java
+++ b/org.springframework.testsuite/src/test/java/org/springframework/core/io/ResourceEditorTests.java
@@ -16,19 +16,21 @@
 
 package org.springframework.core.io;
 
-import junit.framework.TestCase;
-import org.springframework.test.AssertThrows;
-
 import java.beans.PropertyEditor;
 
+import static org.junit.Assert.*;
+import org.junit.Test;
+
 /**
  * Unit tests for the {@link ResourceEditor} class.
  *
  * @author Rick Evans
+ * @author Arjen Poutsma
  */
-public final class ResourceEditorTests extends TestCase {
+public final class ResourceEditorTests {
 
-	public void testSunnyDay() throws Exception {
+	@Test
+	public void sunnyDay() throws Exception {
 		PropertyEditor editor = new ResourceEditor();
 		editor.setAsText("classpath:org/springframework/core/io/ResourceEditorTests.class");
 		Resource resource = (Resource) editor.getValue();
@@ -36,21 +38,20 @@ public final class ResourceEditorTests extends TestCase {
 		assertTrue(resource.exists());
 	}
 
-	public void testCtorWithNullResourceLoader() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new ResourceEditor(null);
-			}
-		}.runTest();
+	@Test(expected = IllegalArgumentException.class)
+	public void ctorWithNullResourceLoader() throws Exception {
+		new ResourceEditor(null);
 	}
 
-	public void testSetAndGetAsTextWithNull() throws Exception {
+	@Test
+	public void setAndGetAsTextWithNull() throws Exception {
 		PropertyEditor editor = new ResourceEditor();
 		editor.setAsText(null);
 		assertEquals("", editor.getAsText());
 	}
 
-	public void testSetAndGetAsTextWithWhitespaceResource() throws Exception {
+	@Test
+	public void setAndGetAsTextWithWhitespaceResource() throws Exception {
 		PropertyEditor editor = new ResourceEditor();
 		editor.setAsText("  ");
 		assertEquals("", editor.getAsText());