From fc52f1c7f8f7f25db0ef6b79bfd70006c76ab2ef Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <britter@apache.org>
Date: Thu, 23 Jan 2014 17:15:48 +0000
Subject: [PATCH] Use annotation based testing for failure case

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1560762 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/commons/lang3/StringUtilsTest.java | 84 ++++++++-----------
 1 file changed, 35 insertions(+), 49 deletions(-)

diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
index 9c0a1d642..36260cb5d 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java
@@ -1901,20 +1901,18 @@ public void testGetLevenshteinDistance_StringString() {
         assertEquals(8, StringUtils.getLevenshteinDistance("hippo", "zzzzzzzz") );
         assertEquals(8, StringUtils.getLevenshteinDistance("zzzzzzzz", "hippo") );
         assertEquals(1, StringUtils.getLevenshteinDistance("hello", "hallo") );
-        try {
-            StringUtils.getLevenshteinDistance("a", null);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
-        try {
-            StringUtils.getLevenshteinDistance(null, "a");
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
     }
-    
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetLevenshteinDistance_NullString() throws Exception {
+        StringUtils.getLevenshteinDistance("a", null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetLevenshteinDistance_StringNull() throws Exception {
+        StringUtils.getLevenshteinDistance(null, "a");
+    }
+
     @Test
     public void testGetLevenshteinDistance_StringStringInt() {
         // empty strings
@@ -1976,33 +1974,26 @@ public void testGetLevenshteinDistance_StringStringInt() {
         assertEquals(7, StringUtils.getLevenshteinDistance("hippo", "elephant", Integer.MAX_VALUE) );
         assertEquals(8, StringUtils.getLevenshteinDistance("hippo", "zzzzzzzz", Integer.MAX_VALUE) );
         assertEquals(8, StringUtils.getLevenshteinDistance("zzzzzzzz", "hippo", Integer.MAX_VALUE) );
-        assertEquals(1, StringUtils.getLevenshteinDistance("hello", "hallo", Integer.MAX_VALUE) );
+        assertEquals(1, StringUtils.getLevenshteinDistance("hello", "hallo", Integer.MAX_VALUE));
+    }
 
-        // exceptions
-        try {
-            StringUtils.getLevenshteinDistance("a", null, 0);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
-        try {
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetLevenshteinDistance_NullStringInt() throws Exception {
             StringUtils.getLevenshteinDistance(null, "a", 0);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
+    }
 
-        try {
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetLevenshteinDistance_StringNullInt() throws Exception {
+            StringUtils.getLevenshteinDistance("a", null, 0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetLevenshteinDistance_StringStringNegativeInt() throws Exception {
             StringUtils.getLevenshteinDistance("a", "a", -1);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
     }
 
     @Test
     public void testGetJaroWinklerDistance_StringString() {
-
         assertEquals(0.93d, StringUtils.getJaroWinklerDistance("frog", "fog"), 0.0d);
         assertEquals(0.0d, StringUtils.getJaroWinklerDistance("fly", "ant"), 0.0d);
         assertEquals(0.44d, StringUtils.getJaroWinklerDistance("elephant", "hippo"), 0.0d);
@@ -2010,26 +2001,21 @@ public void testGetJaroWinklerDistance_StringString() {
         assertEquals(0.93d, StringUtils.getJaroWinklerDistance("D N H Enterprises Inc", "D & H Enterprises, Inc."), 0.0d);
         assertEquals(0.94d, StringUtils.getJaroWinklerDistance("My Gym Children's Fitness Center", "My Gym. Childrens Fitness"), 0.0d);
         assertEquals(0.9d, StringUtils.getJaroWinklerDistance("PENNSYLVANIA", "PENNCISYLVNIA"), 0.0d);
-        // exceptions
-        try {
-            StringUtils.getJaroWinklerDistance(null, null);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
+    }
 
-        try {
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetJaroWinklerDistance_NullNull() throws Exception {
+            StringUtils.getJaroWinklerDistance(null, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetJaroWinklerDistance_StringNull() throws Exception {
             StringUtils.getJaroWinklerDistance(" ", null);
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
-        try {
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetJaroWinklerDistance_NullString() throws Exception {
             StringUtils.getJaroWinklerDistance(null, "clear");
-            fail("expecting IllegalArgumentException");
-        } catch (final IllegalArgumentException ex) {
-            // empty
-        }
     }
 
     /**