forked from WebGoat/WebGoat
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
95 additions
and
188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 0 additions & 57 deletions
57
webgoat-container/src/test/java/org/owasp/webgoat/plugins/TestUtils.java
This file was deleted.
Oops, something went wrong.
156 changes: 78 additions & 78 deletions
156
webgoat-container/src/test/java/org/owasp/webgoat/service/LabelServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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"))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters