Fixing failing unit test

2016-12-08 21:49:43 +01:00 · 2016-12-08 21:49:43 +01:00 · b8b632905d
commit b8b632905d
parent f8c4d2232b
5 changed files with 95 additions and 188 deletions
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@ -111,9 +111,7 @@
                <artifactId>maven-surefire-plugin</artifactId>
                <version>${maven-surefire-plugin.version}</version>
                <configuration>
-                    <excludes>
-                        <exclude>**/*IT.java</exclude>
-                    </excludes>
+                    <forkMode>never</forkMode>
                </configuration>
            </plugin>
            <plugin>
@ -184,17 +182,16 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
-
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.asciidoctor</groupId>
            <artifactId>asciidoctorj</artifactId>
            <version>1.5.4</version>
        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>jstl</artifactId>
@ -222,36 +219,11 @@
            <artifactId>h2</artifactId>
            <version>${h2.version}</version>
        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>${axis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>${axis-saaj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>${axis-jaxrpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-ant</artifactId>
-            <version>${axis-ant.version}</version>
-        </dependency>
        <dependency>
            <groupId>hsqldb</groupId>
            <artifactId>hsqldb</artifactId>
            <version>${hsqldb.version}</version>
        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4j.version}</version>
-        </dependency>
        <dependency>
            <groupId>javax.transaction</groupId>
            <artifactId>javax.transaction-api</artifactId>
@ -283,29 +255,18 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.security</groupId>-->
-            <!--<artifactId>spring-security-test</artifactId>-->
-            <!--<version>4.1.3.RELEASE</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <version>4.1.3.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>${junit.version}</version>
            <type>jar</type>
        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>${selenium-java.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.saucelabs</groupId>
-            <artifactId>sauce_junit</artifactId>
-            <version>${sauce_junit.version}</version>
-            <scope>test</scope>
-        </dependency>
        <!-- ************* END: Dependencies for Unit and Integration Testing ************** -->
        <!-- ************* END: <dependencies> ************** -->
    </dependencies>
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
@ -63,8 +63,6 @@ public class PluginsLoader {
            log.error("No lessons found if you downloaded an official release of WebGoat please take the time to");
            log.error("create a new issue at https://github.com/WebGoat/WebGoat/issues/new");
            log.error("For developers run 'mvn package' first from the root directory.");
-            log.error("Stopping WebGoat...");
-            System.exit(1); //we always run standalone
        }
        return new Course(lessons);
    }
--- a/webgoat-container/src/test/java/org/owasp/webgoat/plugins/TestUtils.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/plugins/TestUtils.java
@ -1,57 +0,0 @@
-package org.owasp.webgoat.plugins;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.StaleElementReferenceException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.FluentWait;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-/**
- * ************************************************************************************************
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- * <p>
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- * <p>
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- * <p>
- * Getting Source ==============
- * <p>
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * projects.
- * <p>
- *
- * @author WebGoat
- * @version $Id: $Id
- * @since September 22, 2016
- */
-public class TestUtils {
-
-    public static void assertTitlePresent(WebDriver webDriver, String title) {
-        FluentWait<WebDriver> wait = new WebDriverWait(webDriver, 15); // wait for a maximum of 15 seconds
-        wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), title));
-    }
-
-    public static  FluentWait createDefaultWait(WebDriver webDriver) {
-        return new FluentWait(webDriver)
-                .withTimeout(10, SECONDS)
-                .pollingEvery(2, SECONDS)
-                .ignoring(NoSuchElementException.class)
-                .ignoring(StaleElementReferenceException.class);
-
-    }
-}
--- a/webgoat-container/src/test/java/org/owasp/webgoat/service/LabelServiceTest.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/service/LabelServiceTest.java
@ -1,78 +1,78 @@
-//package org.owasp.webgoat.service;
-//
-//import org.assertj.core.util.Maps;
-//import org.hamcrest.CoreMatchers;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.owasp.webgoat.i18n.LabelProvider;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-//import org.springframework.boot.test.mock.mockito.MockBean;
-//import org.springframework.security.test.context.support.WithMockUser;
-//import org.springframework.test.context.junit4.SpringRunner;
-//import org.springframework.test.web.servlet.MockMvc;
-//import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-//
-//import java.util.Locale;
-//
-//import static org.mockito.Mockito.when;
-//import static org.owasp.webgoat.service.LabelService.URL_LABELS_MVC;
-//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-//
-///**
-// * ************************************************************************************************
-// * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
-// * please see http://www.owasp.org/
-// * <p>
-// * Copyright (c) 2002 - 20014 Bruce Mayhew
-// * <p>
-// * This program is free software; you can redistribute it and/or modify it under the terms of the
-// * GNU General Public License as published by the Free Software Foundation; either version 2 of the
-// * License, or (at your option) any later version.
-// * <p>
-// * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-// * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// * General Public License for more details.
-// * <p>
-// * You should have received a copy of the GNU General Public License along with this program; if
-// * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// * 02111-1307, USA.
-// * <p>
-// * Getting Source ==============
-// * <p>
-// * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
-// * projects.
-// * <p>
-// *
-// * @author nbaars
-// * @version $Id: $Id
-// * @since November 29, 2016
-// */
-//@WebMvcTest(value = {LabelService.class, LabelProvider.class})
-//@RunWith(SpringRunner.class)
-//public class LabelServiceTest {
-//
-//    @Autowired
-//    public MockMvc mockMvc;
-//    @MockBean
-//    private LabelProvider labelProvider;
-//
-//    @Test
-//    @WithMockUser(username = "guest", password = "guest")
-//    public void withoutLocale() throws Exception {
-//        when(labelProvider.getLabels(Locale.ENGLISH)).thenReturn(Maps.newHashMap("key", "value"));
-//        mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC))
-//                .andExpect(status().isOk())
-//                .andExpect(jsonPath("key", CoreMatchers.is("value")));
-//    }
-//
-//    @Test
-//    @WithMockUser(username = "guest", password = "guest")
-//    public void withLocale() throws Exception {
-//        when(labelProvider.getLabels(Locale.GERMAN)).thenReturn(Maps.newHashMap("key", "value"));
-//        mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC).param("lang", "de"))
-//                .andExpect(status().isOk())
-//                .andExpect(jsonPath("key", CoreMatchers.is("value")));
-//    }
-//}
+package org.owasp.webgoat.service;
+
+import org.assertj.core.util.Maps;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.owasp.webgoat.i18n.LabelProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+import java.util.Locale;
+
+import static org.mockito.Mockito.when;
+import static org.owasp.webgoat.service.LabelService.URL_LABELS_MVC;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * ************************************************************************************************
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 20014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ *
+ * @author nbaars
+ * @version $Id: $Id
+ * @since November 29, 2016
+ */
+@WebMvcTest(value = {LabelService.class, LabelProvider.class})
+@RunWith(SpringRunner.class)
+public class LabelServiceTest {
+
+    @Autowired
+    public MockMvc mockMvc;
+    @MockBean
+    private LabelProvider labelProvider;
+
+    @Test
+    @WithMockUser(username = "guest", password = "guest")
+    public void withoutLocale() throws Exception {
+        when(labelProvider.getLabels(Locale.ENGLISH)).thenReturn(Maps.newHashMap("key", "value"));
+        mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("key", CoreMatchers.is("value")));
+    }
+
+    @Test
+    @WithMockUser(username = "guest", password = "guest")
+    public void withLocale() throws Exception {
+        when(labelProvider.getLabels(Locale.GERMAN)).thenReturn(Maps.newHashMap("key", "value"));
+        mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC).param("lang", "de"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("key", CoreMatchers.is("value")));
+    }
+}
--- a/webgoat-lessons/pom.xml
+++ b/webgoat-lessons/pom.xml
@ -29,6 +29,11 @@
            <scope>provided</scope>
            <type>jar</type>
        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+        </dependency>
    </dependencies>
    <dependencyManagement>
        <dependencies>