diff --git a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java index aacf19fa5..bc206583e 100644 --- a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java +++ b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java @@ -8,6 +8,7 @@ import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.owasp.webwolf.WebWolf; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -47,7 +48,7 @@ public abstract class IntegrationTest { private static boolean started = false; - @BeforeEach + @BeforeAll public static void beforeAll() { if (WG_SSL) { WEBGOAT_URL = WEBGOAT_URL.replace("http:", "https:"); diff --git a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/ProgressRaceConditionTest.java b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/ProgressRaceConditionTest.java index e5b1a8cd1..518db8f3e 100644 --- a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/ProgressRaceConditionTest.java +++ b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/ProgressRaceConditionTest.java @@ -48,7 +48,7 @@ public class ProgressRaceConditionTest extends IntegrationTest { throw new IllegalStateException(e); } }).count(); - System.out.println("counted status 500: "+countStatusCode500); + System.err.println("counted status 500: "+countStatusCode500); Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS))); } } diff --git a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SeleniumTest.java b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SeleniumTest.java index 032d9676c..b6a5c7ec9 100644 --- a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SeleniumTest.java +++ b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SeleniumTest.java @@ -50,8 +50,8 @@ public class SeleniumTest extends IntegrationTest { driver.findElement(By.name("agree")).click(); driver.findElement(By.className("btn-primary")).click(); } - } catch (IllegalStateException e) { - System.err.println("Web driver not found here: "+System.getProperty("webdriver.gecko.driver")); + } catch (Exception e) { + System.err.println("Selenium test failed "+System.getProperty("webdriver.gecko.driver")+", message: "+e.getMessage()); } } diff --git a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SqlInjectionLessonTest.java b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SqlInjectionLessonTest.java index f5e3b6101..3aa3cac8b 100644 --- a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SqlInjectionLessonTest.java +++ b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/SqlInjectionLessonTest.java @@ -43,10 +43,6 @@ public class SqlInjectionLessonTest extends IntegrationTest { params.put("query", sql_4_add); checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, true); - params.clear(); - params.put("query", sql_4_drop); - checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, false); - params.clear(); params.put("query", sql_5); checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true); diff --git a/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java b/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java index bb43ed978..30930c97d 100644 --- a/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java +++ b/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java @@ -74,7 +74,7 @@ public class SimpleXXE extends AssignmentEndpoint { secure = true; } Comment comment = comments.parseXml(commentStr, secure); - System.err.println("Comment " + comment); + //System.err.println("Comment " + comment); comments.addComment(comment, false); if (checkSolution(comment)) { return success(this).build();