Run unit tests again and rewrite all to JUnit 5

Due to the migration to Spring Boot 2.4 the Vintage dependency was no longer included by default, resulting in skipping all unit tests.

webgoat-container/pom.xml

@@ -75,12 +75,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>HikariCP</artifactId>
-                    <groupId>com.zaxxer</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -103,8 +97,6 @@
             <artifactId>hsqldb</artifactId>
         </dependency>
 
-        <!-- ************* END spring MVC and related dependencies ************** -->
-        <!-- ************* START: Dependencies for Unit and Integration Testing ************** -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -113,19 +105,8 @@
         <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>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- ************* END: Dependencies for Unit and Integration Testing ************** -->
-        <!-- ************* END: <dependencies> ************** -->
     </dependencies>
-
 </project>
 

webgoat-container/src/test/java/org/owasp/webgoat/assignments/AssignmentEndpointTest.java

@@ -38,6 +38,7 @@ import org.springframework.web.servlet.i18n.FixedLocaleResolver;
 
 import java.util.Locale;
 
+//Do not remove is the base class for all assignments tests
 public class AssignmentEndpointTest {
 
     @Mock

webgoat-container/src/test/java/org/owasp/webgoat/plugins/LessonTest.java

@@ -1,6 +1,6 @@
 package org.owasp.webgoat.plugins;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.owasp.webgoat.i18n.Language;
 import org.owasp.webgoat.i18n.PluginMessages;
 import org.owasp.webgoat.session.WebSession;
@@ -37,8 +37,8 @@ public abstract class LessonTest {
     @MockBean
     private Language language;
 
-    @Before
+    @BeforeEach
-    public void init() {
+    void init() {
         when(webSession.getUserName()).thenReturn("unit-test");
         when(language.getLocale()).thenReturn(Locale.getDefault());
     }

webgoat-container/src/test/java/org/owasp/webgoat/plugins/PluginTest.java

@@ -1,32 +0,0 @@
-package org.owasp.webgoat.plugins;
-
-public class PluginTest {
-
-//    @Test
-//    public void pathShouldBeRewrittenInHtmlFile() throws Exception {
-//        Path tmpDir = PluginTestHelper.createTmpDir();
-//        Path pluginSourcePath = PluginTestHelper.pathForLoading();
-//        Plugin plugin = PluginTestHelper.createPluginFor(TestPlugin.class);
-//        Path htmlFile = Paths.get(pluginSourcePath.toString(), "lessonSolutions", "rewrite_test.html");
-//        plugin.loadFiles(Arrays.asList(htmlFile), true);
-//        plugin.rewritePaths(tmpDir);
-//        List<String> allLines = Files.readAllLines(htmlFile, StandardCharsets.UTF_8);
-//
-//        assertThat(allLines,
-//            hasItem(containsString("plugin/TestPlugin/lessonSolutions/en/TestPlugin_files/image001.png")));
-//    }
-//
-//    @Test
-//    public void shouldNotRewriteOtherLinks() throws Exception {
-//        Path tmpDir = PluginTestHelper.createTmpDir();
-//        Path pluginSourcePath = PluginTestHelper.pathForLoading();
-//        Plugin plugin = PluginTestHelper.createPluginFor(TestPlugin.class);
-//        Path htmlFile = Paths.get(pluginSourcePath.toString(), "lessonSolutions", "rewrite_test.html");
-//        plugin.loadFiles(Arrays.asList(htmlFile), true);
-//        plugin.rewritePaths(tmpDir);
-//        List<String> allLines = Files.readAllLines(htmlFile, StandardCharsets.UTF_8);
-//
-//        assertThat(allLines,
-//            hasItem(containsString("Unknown_files/image001.png")));
-//    }
-}

webgoat-container/src/test/java/org/owasp/webgoat/service/HintServiceTest.java

@@ -2,28 +2,25 @@ package org.owasp.webgoat.service;
 
 import com.beust.jcommander.internal.Lists;
 import org.hamcrest.CoreMatchers;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.lessons.Assignment;
+import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.session.WebSession;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import java.util.List;
-
 import static org.mockito.Mockito.when;
 import static org.owasp.webgoat.service.HintService.URL_HINTS_MVC;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class HintServiceTest {
 
     private MockMvc mockMvc;
@@ -34,13 +31,13 @@ public class HintServiceTest {
     @Mock
     private Assignment assignment;
 
-    @Before
+    @BeforeEach
-    public void setup() {
+    void setup() {
         this.mockMvc = standaloneSetup(new HintService(websession)).build();
     }
 
     @Test
-    public void hintsPerAssignment() throws Exception {
+    void hintsPerAssignment() throws Exception {
         Assignment assignment = Mockito.mock(Assignment.class);
         when(assignment.getPath()).thenReturn("/HttpBasics/attack1");
         when(assignment.getHints()).thenReturn(Lists.newArrayList("hint 1", "hint 2"));

webgoat-container/src/test/java/org/owasp/webgoat/service/LabelServiceTest.java

@@ -1,16 +1,15 @@
 package org.owasp.webgoat.service;
 
 import org.hamcrest.CoreMatchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.owasp.webgoat.assignments.LessonTrackerInterceptor;
-import org.owasp.webgoat.session.Course;
 import org.owasp.webgoat.users.UserService;
+import org.owasp.webgoat.users.UserTrackerRepository;
 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.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -48,15 +47,21 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * @since November 29, 2016
  */
 @WebMvcTest(value = {LabelService.class})
-@RunWith(SpringRunner.class)
+@ActiveProfiles({"test", "webgoat"})
-public class LabelServiceTest {
+class LabelServiceTest {
 
     @Autowired
     public MockMvc mockMvc;
+    @MockBean
+    private UserService userService;
+    @MockBean
+    private UserTrackerRepository userTrackerRepository;
+    @MockBean
+    private LessonTrackerInterceptor lessonTrackerInterceptor;
 
     @Test
     @WithMockUser(username = "guest", password = "guest")
-    public void withoutLocale() throws Exception {
+    void withoutLocale() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("password", CoreMatchers.is("Password")));
@@ -64,7 +69,7 @@ public class LabelServiceTest {
 
     @Test
     @WithMockUser(username = "guest", password = "guest")
-    public void withLocale() throws Exception {
+    void withLocale() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.get(URL_LABELS_MVC).param("lang", "nl"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("password", CoreMatchers.is("Wachtwoord")));

webgoat-container/src/test/java/org/owasp/webgoat/service/LessonMenuServiceTest.java

@@ -23,12 +23,12 @@ package org.owasp.webgoat.service;
 
 import com.beust.jcommander.internal.Lists;
 import org.hamcrest.CoreMatchers;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.owasp.webgoat.lessons.Category;
 import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.session.Course;
@@ -39,6 +39,8 @@ import org.owasp.webgoat.users.UserTrackerRepository;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
+import java.util.Arrays;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.owasp.webgoat.service.LessonMenuService.URL_LESSONMENU_MVC;
@@ -47,9 +49,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
-import java.util.Arrays;
+@ExtendWith(MockitoExtension.class)
-
-@RunWith(MockitoJUnitRunner.class)
 public class LessonMenuServiceTest {
 
     @Mock(lenient=true)
@@ -64,13 +64,13 @@ public class LessonMenuServiceTest {
     private WebSession webSession;
     private MockMvc mockMvc;
 
-    @Before
+    @BeforeEach
-    public void setup() {
+    void setup() {
         this.mockMvc = standaloneSetup(new LessonMenuService(course, webSession, userTrackerRepository, Arrays.asList("none"), Arrays.asList("none"))).build();
     }
 
     @Test
-    public void lessonsShouldBeOrdered() throws Exception {
+    void lessonsShouldBeOrdered() throws Exception {
         Lesson l1 = Mockito.mock(Lesson.class);
         Lesson l2 = Mockito.mock(Lesson.class);
         when(l1.getTitle()).thenReturn("ZA");
@@ -88,7 +88,7 @@ public class LessonMenuServiceTest {
     }
 
     @Test
-    public void lessonCompleted() throws Exception {
+    void lessonCompleted() throws Exception {
         Lesson l1 = Mockito.mock(Lesson.class);
         when(l1.getTitle()).thenReturn("ZA");
         when(lessonTracker.isLessonSolved()).thenReturn(true);

webgoat-container/src/test/java/org/owasp/webgoat/service/LessonProgressServiceTest.java

@@ -1,11 +1,11 @@
 package org.owasp.webgoat.service;
 
 import org.assertj.core.util.Maps;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.lessons.Assignment;
 import org.owasp.webgoat.session.WebSession;
@@ -54,8 +54,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * @version $Id: $Id
  * @since November 25, 2016
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
-public class LessonProgressServiceTest {
+class LessonProgressServiceTest {
 
     private MockMvc mockMvc;
 
@@ -70,8 +70,8 @@ public class LessonProgressServiceTest {
     @Mock
     private WebSession websession;
 
-    @Before
+    @BeforeEach
-    public void setup() {
+    void setup() {
         Assignment assignment = new Assignment("test", "test", List.of());
         when(userTrackerRepository.findByUser(any())).thenReturn(userTracker);
         when(userTracker.getLessonTracker(any(Lesson.class))).thenReturn(lessonTracker);
@@ -82,7 +82,7 @@ public class LessonProgressServiceTest {
     }
 
     @Test
-    public void jsonLessonOverview() throws Exception {
+    void jsonLessonOverview() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.get("/service/lessonoverview.mvc").accept(MediaType.APPLICATION_JSON_VALUE))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$[0].assignment.name", is("test")))

webgoat-container/src/test/java/org/owasp/webgoat/service/ReportCardServiceTest.java

@@ -1,10 +1,10 @@
 package org.owasp.webgoat.service;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.owasp.webgoat.i18n.PluginMessages;
 import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.session.Course;
@@ -26,7 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReportCardServiceTest {
 
     private MockMvc mockMvc;
@@ -45,15 +45,15 @@ public class ReportCardServiceTest {
     @Mock
     private PluginMessages pluginMessages;
 
-    @Before
+    @BeforeEach
-    public void setup() {
+    void setup() {
         this.mockMvc = standaloneSetup(new ReportCardService(websession, userTrackerRepository, course, pluginMessages)).build();
         when(pluginMessages.getMessage(anyString())).thenReturn("Test");
     }
 
     @Test
     @WithMockUser(username = "guest", password = "guest")
-    public void withLessons() throws Exception {
+    void withLessons() throws Exception {
         when(lesson.getTitle()).thenReturn("Test");
         when(course.getTotalOfLessons()).thenReturn(1);
         when(course.getTotalOfAssignments()).thenReturn(10);

webgoat-container/src/test/java/org/owasp/webgoat/session/CourseTest.java

@@ -1,38 +0,0 @@
-package org.owasp.webgoat.session;
-
-/**
- * ************************************************************************************************
- * 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 - 2014 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 26, 2016
- */
-public class CourseTest {
-
-    public void number() {
-
-    }
-
-}

webgoat-container/src/test/java/org/owasp/webgoat/session/LabelDebuggerTest.java

@@ -1,45 +1,43 @@
 package org.owasp.webgoat.session;
 
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
+class LabelDebuggerTest {
-import static org.junit.Assert.assertTrue;
-
-public class LabelDebuggerTest {
 
     @Test
-    public void testSetEnabledTrue() throws Exception {
+    void testSetEnabledTrue() {
         LabelDebugger ld = new LabelDebugger();
         ld.setEnabled(true);
-        assertTrue(ld.isEnabled());
+        Assertions.assertThat(ld.isEnabled()).isTrue();
     }
 
     @Test
-    public void testSetEnabledFalse() throws Exception {
+    void testSetEnabledFalse() {
         LabelDebugger ld = new LabelDebugger();
         ld.setEnabled(false);
-        assertFalse(ld.isEnabled());
+        Assertions.assertThat((ld.isEnabled())).isFalse();
     }
 
     @Test
-    public void testSetEnabledNullThrowsException() {
+    void testSetEnabledNullThrowsException() {
         LabelDebugger ld = new LabelDebugger();
         ld.setEnabled(true);
-        assertTrue(ld.isEnabled());
+        Assertions.assertThat((ld.isEnabled())).isTrue();
     }
 
     @Test
-    public void testEnableIsTrue() {
+    void testEnableIsTrue() {
         LabelDebugger ld = new LabelDebugger();
         ld.enable();
-        assertTrue(ld.isEnabled());
+        Assertions.assertThat((ld.isEnabled())).isTrue();
     }
 
     @Test
-    public void testDisableIsFalse() {
+    void testDisableIsFalse() {
         LabelDebugger ld = new LabelDebugger();
         ld.disable();
-        assertFalse(ld.isEnabled());
+        Assertions.assertThat((ld.isEnabled())).isFalse();
     }
 
 

webgoat-container/src/test/java/org/owasp/webgoat/session/LessonTrackerTest.java

@@ -1,6 +1,7 @@
 package org.owasp.webgoat.session;
 
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.lessons.Assignment;
 import org.owasp.webgoat.lessons.Lesson;
 import org.owasp.webgoat.users.LessonTracker;
@@ -9,7 +10,6 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -42,20 +42,20 @@ import static org.mockito.Mockito.when;
  * @version $Id: $Id
  * @since November 25, 2016
  */
-public class LessonTrackerTest {
+class LessonTrackerTest {
 
     @Test
-    public void allAssignmentsSolvedShouldMarkLessonAsComplete() {
+    void allAssignmentsSolvedShouldMarkLessonAsComplete() {
         Lesson lesson = mock(Lesson.class);
         when(lesson.getAssignments()).thenReturn(List.of(new Assignment("assignment", "assignment", List.of(""))));
         LessonTracker lessonTracker = new LessonTracker(lesson);
         lessonTracker.assignmentSolved("assignment");
 
-        assertTrue(lessonTracker.isLessonSolved());
+        Assertions.assertThat(lessonTracker.isLessonSolved()).isTrue();
     }
 
     @Test
-    public void noAssignmentsSolvedShouldMarkLessonAsInComplete() {
+    void noAssignmentsSolvedShouldMarkLessonAsInComplete() {
         Lesson lesson = mock(Lesson.class);
         Assignment a1 = new Assignment("a1");
         Assignment a2 = new Assignment("a2");
@@ -70,7 +70,7 @@ public class LessonTrackerTest {
     }
 
     @Test
-    public void solvingSameAssignmentShouldNotAddItTwice() {
+    void solvingSameAssignmentShouldNotAddItTwice() {
         Lesson lesson = mock(Lesson.class);
         Assignment a1 = new Assignment("a1");
         List<Assignment> assignments = List.of(a1);

webgoat-container/src/test/java/org/owasp/webgoat/users/UserRepositoryTest.java

@@ -1,23 +1,20 @@
 package org.owasp.webgoat.users;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 
 @DataJpaTest
-@RunWith(SpringRunner.class)
 @ActiveProfiles({"test", "webgoat"})
-public class UserRepositoryTest {
+class UserRepositoryTest {
 
     @Autowired
     private UserRepository userRepository;
 
     @Test
-    public void userShouldBeSaved() {
+    void userShouldBeSaved() {
         WebGoatUser user = new WebGoatUser("test", "password");
         userRepository.saveAndFlush(user);
 

webgoat-container/src/test/java/org/owasp/webgoat/users/UserServiceTest.java

@@ -1,27 +1,27 @@
 package org.owasp.webgoat.users;
 
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
-public class UserServiceTest {
+class UserServiceTest {
 
     @Mock
     private UserRepository userRepository;
     @Mock
     private UserTrackerRepository userTrackerRepository;
 
-
+    @Test
-    @Test(expected = UsernameNotFoundException.class)
+    void shouldThrowExceptionWhenUserIsNotFound() {
-    public void shouldThrowExceptionWhenUserIsNotFound() {
         when(userRepository.findByUsername(any())).thenReturn(null);
         UserService userService = new UserService(userRepository, userTrackerRepository);
-        userService.loadUserByUsername("unknown");
+        Assertions.assertThatThrownBy(() -> userService.loadUserByUsername("unknown")).isInstanceOf(UsernameNotFoundException.class);
     }
 }

webgoat-container/src/test/java/org/owasp/webgoat/users/UserTrackerRepositoryTest.java

@@ -2,22 +2,19 @@ package org.owasp.webgoat.users;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.owasp.webgoat.lessons.Assignment;
 import org.owasp.webgoat.lessons.Category;
 import org.owasp.webgoat.lessons.Lesson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 
 @DataJpaTest
-@RunWith(SpringRunner.class)
 @ActiveProfiles({"test", "webgoat"})
-public class UserTrackerRepositoryTest {
+class UserTrackerRepositoryTest {
 
     private class TestLesson extends Lesson {
 
@@ -42,9 +39,8 @@ public class UserTrackerRepositoryTest {
     private UserTrackerRepository userTrackerRepository;
 
     @Test
-    public void saveUserTracker() {
+    void saveUserTracker() {
         UserTracker userTracker = new UserTracker("test");
-        LessonTracker lessonTracker = userTracker.getLessonTracker(new TestLesson());
 
         userTrackerRepository.save(userTracker);
 
@@ -53,7 +49,7 @@ public class UserTrackerRepositoryTest {
     }
 
     @Test
-    public void solvedAssignmentsShouldBeSaved() {
+    void solvedAssignmentsShouldBeSaved() {
         UserTracker userTracker = new UserTracker("test");
         TestLesson lesson = new TestLesson();
         userTracker.getLessonTracker(lesson);
@@ -68,7 +64,7 @@ public class UserTrackerRepositoryTest {
     }
 
     @Test
-    public void saveAndLoadShouldHaveCorrectNumberOfAttemtps() {
+    void saveAndLoadShouldHaveCorrectNumberOfAttempts() {
         UserTracker userTracker = new UserTracker("test");
         TestLesson lesson = new TestLesson();
         userTracker.getLessonTracker(lesson);

webgoat-container/src/test/java/org/owasp/webgoat/users/UserValidatorTest.java

@@ -1,26 +1,25 @@
 package org.owasp.webgoat.users;
 
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.Errors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
-public class UserValidatorTest {
+class UserValidatorTest {
 
     @Mock
     private UserRepository userRepository;
 
     @Test
-    public void passwordsShouldMatch() {
+    void passwordsShouldMatch() {
         UserForm userForm = new UserForm();
         userForm.setAgree("true");
         userForm.setUsername("test1234");
@@ -28,11 +27,11 @@ public class UserValidatorTest {
         userForm.setMatchingPassword("test1234");
         Errors errors = new BeanPropertyBindingResult(userForm, "userForm");
         new UserValidator(userRepository).validate(userForm, errors);
-        assertFalse(errors.hasErrors());
+        Assertions.assertThat(errors.hasErrors()).isFalse();
     }
 
     @Test
-    public void shouldGiveErrorWhenPasswordsDoNotMatch() {
+    void shouldGiveErrorWhenPasswordsDoNotMatch() {
         UserForm userForm = new UserForm();
         userForm.setAgree("true");
         userForm.setUsername("test1234");
@@ -40,12 +39,12 @@ public class UserValidatorTest {
         userForm.setMatchingPassword("test1234");
         Errors errors = new BeanPropertyBindingResult(userForm, "userForm");
         new UserValidator(userRepository).validate(userForm, errors);
-        assertTrue(errors.hasErrors());
+        Assertions.assertThat(errors.hasErrors()).isTrue();
         assertThat(errors.getFieldError("matchingPassword").getCode()).isEqualTo("password.diff");
     }
 
     @Test
-    public void shouldGiveErrorWhenUserAlreadyExists() {
+    void shouldGiveErrorWhenUserAlreadyExists() {
         UserForm userForm = new UserForm();
         userForm.setAgree("true");
         userForm.setUsername("test12345");
@@ -54,7 +53,7 @@ public class UserValidatorTest {
         when(userRepository.findByUsername(anyString())).thenReturn(new WebGoatUser("test1245", "password"));
         Errors errors = new BeanPropertyBindingResult(userForm, "userForm");
         new UserValidator(userRepository).validate(userForm, errors);
-        assertTrue(errors.hasErrors());
+        Assertions.assertThat(errors.hasErrors()).isTrue();
         assertThat(errors.getFieldError("username").getCode()).isEqualTo("username.duplicate");
     }
 

webgoat-container/src/test/java/org/owasp/webgoat/util/LabelManagerImplTest.java

@@ -1,20 +0,0 @@
-package org.owasp.webgoat.util;
-
-public class LabelManagerImplTest {
-
-//    @Test
-//    public void shouldSerialize() throws IOException {
-//        LabelManagerImpl labelManager = new LabelManagerImpl(null, new LabelDebugger());
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-//        ObjectOutputStream out = new ObjectOutputStream(bos);
-//        out.writeObject(labelManager);
-//    }
-//
-//    @Test
-//    public void shouldSerializeWithLabelProvider() throws IOException {
-//        LabelManagerImpl labelManager = new LabelManagerImpl(new LabelProvider(), new LabelDebugger());
-//        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-//        ObjectOutputStream out = new ObjectOutputStream(bos);
-//        out.writeObject(labelManager);
-//    }
-}

webgoat-container/src/test/resources/application-test.properties

@@ -3,3 +3,4 @@ webgoat.user.directory=${java.io.tmpdir}
 spring.datasource.url=jdbc:hsqldb:mem:test
 webgoat.start.hsqldb=false
 spring.flyway.locations=classpath:/db/container
+spring.main.banner-mode=off