+ *
* This file is part of WebGoat, an Open Web Application Security Project * utility. For details, please see http://www.owasp.org/ - * + *
* Copyright (c) 2002 - 20014 Bruce Mayhew - * + *
* 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. - * + *
* 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. - * + *
* 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. - * + *
* Getting Source ============== - * + *
* Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
* for free software projects.
- *
*/
package org.owasp.webgoat.service;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.owasp.webgoat.i18n.LabelProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.Locale;
@@ -53,15 +51,13 @@ import java.util.Map;
* @author zupzup
*/
-@Controller
+@RestController
+@Slf4j
+@AllArgsConstructor
public class LabelService {
- private static final String URL_LABELS_MVC = "/service/labels.mvc";
-
- private static final Logger logger = LoggerFactory.getLogger(LabelService.class);
-
- @Autowired
- private LabelProvider labelProvider;
+ public static final String URL_LABELS_MVC = "/service/labels.mvc";
+ private final LabelProvider labelProvider;
/**
* Fetches labels for given language
@@ -72,19 +68,19 @@ public class LabelService {
* @return a map of labels
* @throws Exception
*/
- @RequestMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
- public @ResponseBody
- ResponseEntity
+ * Copyright (c) 2002 - 20014 Bruce Mayhew
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ *
+ * @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")));
+ }
+}
\ No newline at end of file