dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for accidentally disabled integration tests (#997)

Browse Source 
* drop column is no longer required due to better db seperation
'

* integration test fix with BeforeAll
This commit is contained in:
René Zubcevic 2021-05-19 18:20:31 +02:00 committed by GitHub
parent a1071e9c00
commit a53ba0af5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java
View File

@ -8,6 +8,7 @@ import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.BeforeAll;
import org.owasp.webwolf.WebWolf; import org.owasp.webwolf.WebWolf;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
@ -47,7 +48,7 @@ public abstract class IntegrationTest {
private static boolean started = false; private static boolean started = false;
@BeforeEach @BeforeAll
public static void beforeAll() { public static void beforeAll() {
if (WG_SSL) { if (WG_SSL) {
WEBGOAT_URL = WEBGOAT_URL.replace("http:", "https:"); WEBGOAT_URL = WEBGOAT_URL.replace("http:", "https:");

2
webgoat-integration-tests/src/test/java/org/owasp/webgoat/ProgressRaceConditionTest.java
View File

@ -48,7 +48,7 @@ public class ProgressRaceConditionTest extends IntegrationTest {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
}).count(); }).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))); Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS)));
} }
} }

4
webgoat-integration-tests/src/test/java/org/owasp/webgoat/SeleniumTest.java
View File

@ -50,8 +50,8 @@ public class SeleniumTest extends IntegrationTest {
driver.findElement(By.name("agree")).click(); driver.findElement(By.name("agree")).click();
driver.findElement(By.className("btn-primary")).click(); driver.findElement(By.className("btn-primary")).click();
} }
} catch (IllegalStateException e) { } catch (Exception e) {
System.err.println("Web driver not found here: "+System.getProperty("webdriver.gecko.driver")); System.err.println("Selenium test failed "+System.getProperty("webdriver.gecko.driver")+", message: "+e.getMessage());
} }
} }

4
webgoat-integration-tests/src/test/java/org/owasp/webgoat/SqlInjectionLessonTest.java
View File

@ -43,10 +43,6 @@ public class SqlInjectionLessonTest extends IntegrationTest {
params.put("query", sql_4_add); params.put("query", sql_4_add);
checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, true); 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.clear();
params.put("query", sql_5); params.put("query", sql_5);
checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true); checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true);

2
webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java
View File

@ -74,7 +74,7 @@ public class SimpleXXE extends AssignmentEndpoint {
secure = true; secure = true;
} }
Comment comment = comments.parseXml(commentStr, secure); Comment comment = comments.parseXml(commentStr, secure);
System.err.println("Comment " + comment); //System.err.println("Comment " + comment);
comments.addComment(comment, false); comments.addComment(comment, false);
if (checkSolution(comment)) { if (checkSolution(comment)) {
return success(this).build(); return success(this).build();