From df9414eab2dbe0778ea64d7e7349a93aced5930e Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 20 Nov 2014 09:52:33 -0700
Subject: [PATCH] Making test failure message more meaningful (including full
 stacktrace)

---
 .../eclipse/jetty/start/TestBadUseCases.java   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
index 458ce4d0838..bddb9cbba8c 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
@@ -19,20 +19,24 @@
 package org.eclipse.jetty.start;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * Test bad configuration scenarios.
  */
 public class TestBadUseCases
 {
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+    
     private void assertBadConfig(String homeName, String baseName, String expectedErrorMessage, String... cmdLineArgs) throws Exception
     {
         File homeDir = MavenTestingUtils.getTestResourceDir("usecases/" + homeName);
@@ -48,15 +52,9 @@ public class TestBadUseCases
             cmdLine.add(arg);
         }
 
-        try
-        {
-            main.processCommandLine(cmdLine);
-            fail("Expected " + UsageException.class.getName());
-        }
-        catch (UsageException e)
-        {
-            assertThat("Usage error",e.getMessage(),containsString(expectedErrorMessage));
-        }
+        expectedException.expect(UsageException.class);
+        expectedException.expectMessage(containsString(expectedErrorMessage));
+        main.processCommandLine(cmdLine);
     }
 
     @Test