[JENKINS-28041] fix failing unittest

jenkinsci · Jun 9, 2015 · b6bff4f · b6bff4f
1 parent 0e846fc
commit b6bff4f
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java b/core/src/test/java/hudson/cli/handlers/ViewOptionHandlerTest.java
@@ -157,10 +157,12 @@ public class ViewOptionHandlerTest {
 
         denyAccessOn(outer);
 
-        parseFailedWith(AccessDeniedException.class, "outer/nested/inner");
+        assertEquals(
+                "Access denied for: outer",
+                parseFailedWith(CmdLineException.class, "outer/nested/inner")
+        );
 
         verify(outer).checkPermission(View.READ);
-        verifyNoMoreInteractions(outer);
 
         verifyZeroInteractions(nested);
         verifyZeroInteractions(inner);
@@ -171,10 +173,12 @@ public class ViewOptionHandlerTest {
 
         denyAccessOn(nested);
 
-        parseFailedWith(AccessDeniedException.class, "outer/nested/inner");
+        assertEquals(
+                "Access denied for: nested",
+                parseFailedWith(CmdLineException.class, "outer/nested/inner")
+        );
 
         verify(nested).checkPermission(View.READ);
-        verifyNoMoreInteractions(nested);
 
         verifyZeroInteractions(inner);
         verifyZeroInteractions(setter);
@@ -184,17 +188,20 @@ public class ViewOptionHandlerTest {
 
         denyAccessOn(inner);
 
-        parseFailedWith(AccessDeniedException.class, "outer/nested/inner");
+        assertEquals(
+                "Access denied for: inner",
+                parseFailedWith(CmdLineException.class, "outer/nested/inner")
+        );
 
         verify(inner).checkPermission(View.READ);
-        verifyNoMoreInteractions(inner);
 
         verifyZeroInteractions(setter);
     }
 
     private void denyAccessOn(View view) {
 
-        doThrow(new AccessDeniedException(null)).when(view).checkPermission(View.READ);
+        final AccessDeniedException ex = new AccessDeniedException("Access denied for: " + view.getViewName());
+        doThrow(ex).when(view).checkPermission(View.READ);
     }
 
     private String parseFailedWith(Class<? extends Exception> type, final String... params) throws Exception {