From 22688622fdfedff393510385547306f33f6b3ffc Mon Sep 17 00:00:00 2001 From: Ruben van Vreeland Date: Wed, 14 Sep 2016 21:35:52 +0200 Subject: [PATCH 1/3] Code cleanup using @Test(expected = Exception) Code edited in the browser, please run tests ;) --- .../org/owasp/webgoat/session/LabelDebuggerTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java index 41a257892..263009b9e 100644 --- a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java +++ b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java @@ -3,7 +3,6 @@ package org.owasp.webgoat.session; import org.junit.Assert; import org.junit.Test; - public class LabelDebuggerTest { @Test @@ -20,16 +19,10 @@ public class LabelDebuggerTest { Assert.assertFalse(ld.isEnabled()); } - @Test + @Test(expected = Exception) public void testSetEnabledNullThrowsException() { LabelDebugger ld = new LabelDebugger(); - try { - ld.setEnabled(null); - } catch (Exception e) { - // We want to end up here - return; - } - Assert.fail(); + ld.setEnabled(null); } @Test From fd010782eb01499440012feca55e42844600b9af Mon Sep 17 00:00:00 2001 From: Ruben van Vreeland Date: Wed, 14 Sep 2016 21:42:36 +0200 Subject: [PATCH 2/3] Fix missing .class --- .../test/java/org/owasp/webgoat/session/LabelDebuggerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java index 263009b9e..eab6e0ad3 100644 --- a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java +++ b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java @@ -19,7 +19,7 @@ public class LabelDebuggerTest { Assert.assertFalse(ld.isEnabled()); } - @Test(expected = Exception) + @Test(expected = Exception.class) public void testSetEnabledNullThrowsException() { LabelDebugger ld = new LabelDebugger(); ld.setEnabled(null); From db5e418cbfbc753c9cba835bd76f7bae339e0390 Mon Sep 17 00:00:00 2001 From: Ruben van Vreeland Date: Wed, 14 Sep 2016 22:00:35 +0200 Subject: [PATCH 3/3] Indicate exception thrown --- .../test/java/org/owasp/webgoat/session/LabelDebuggerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java index eab6e0ad3..090969097 100644 --- a/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java +++ b/webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java @@ -20,7 +20,7 @@ public class LabelDebuggerTest { } @Test(expected = Exception.class) - public void testSetEnabledNullThrowsException() { + public void testSetEnabledNullThrowsException() throws Exception { LabelDebugger ld = new LabelDebugger(); ld.setEnabled(null); }