Merge branch 'master' into bael-16656

spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java

@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.baeldung.security.SecurityJavaConfig;
+import org.baeldung.spring.ClientWebConfig;
+import org.baeldung.spring.WebConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java

@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.baeldung.security.SecurityJavaConfig;
+import org.baeldung.spring.ClientWebConfig;
+import org.baeldung.spring.WebConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-security-rest/src/test/java/org/baeldung/errorhandling/FooLiveTest.java

@@ -0,0 +1,88 @@
+package org.baeldung.errorhandling;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.baeldung.errorhandling.ApiError;
+import org.baeldung.web.TestConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.http.HttpStatus;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.response.Response;
+import com.jayway.restassured.specification.RequestSpecification;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class FooLiveTest {
+    private static final String URL_PREFIX = "http://localhost:8080/spring-security-rest";
+    // private FormAuthConfig formConfig = new FormAuthConfig(URL_PREFIX + "/login", "temporary", "temporary");
+
+    private String cookie;
+
+    private RequestSpecification givenAuth() {
+        // return RestAssured.given().auth().form("user", "userPass", formConfig);
+        // if (cookie == null) {
+        // cookie = RestAssured.given().contentType("application/x-www-form-urlencoded").formParam("password", "userPass").formParam("username", "user").post(URL_PREFIX + "/login").getCookie("JSESSIONID");
+        // }
+        // return RestAssured.given().cookie("JSESSIONID", cookie);
+        return RestAssured.given()
+            .auth().preemptive()
+            .basic("user", "userPass");
+    }
+
+    @Test
+    public void whenTry_thenOK() {
+        final Response response = givenAuth().get(URL_PREFIX + "/api/foos");
+        assertEquals(200, response.statusCode());
+        System.out.println(response.asString());
+
+    }
+
+    @Test
+    public void whenMethodArgumentMismatch_thenBadRequest() {
+        final Response response = givenAuth().get(URL_PREFIX + "/api/foos/ccc");
+        final ApiError error = response.as(ApiError.class);
+        assertEquals(HttpStatus.BAD_REQUEST, error.getStatus());
+        assertEquals(1, error.getErrors().size());
+        assertTrue(error.getErrors().get(0).contains("should be of type"));
+    }
+
+    @Test
+    public void whenNoHandlerForHttpRequest_thenNotFound() {
+        final Response response = givenAuth().delete(URL_PREFIX + "/api/xx");
+        final ApiError error = response.as(ApiError.class);
+        assertEquals(HttpStatus.NOT_FOUND, error.getStatus());
+        assertEquals(1, error.getErrors().size());
+        assertTrue(error.getErrors().get(0).contains("No handler found"));
+        System.out.println(response.asString());
+
+    }
+
+    @Test
+    public void whenHttpRequestMethodNotSupported_thenMethodNotAllowed() {
+        final Response response = givenAuth().delete(URL_PREFIX + "/api/foos/1");
+        final ApiError error = response.as(ApiError.class);
+        assertEquals(HttpStatus.METHOD_NOT_ALLOWED, error.getStatus());
+        assertEquals(1, error.getErrors().size());
+        assertTrue(error.getErrors().get(0).contains("Supported methods are"));
+        System.out.println(response.asString());
+
+    }
+
+    @Test
+    public void whenSendInvalidHttpMediaType_thenUnsupportedMediaType() {
+        final Response response = givenAuth().body("").post(URL_PREFIX + "/api/foos");
+        final ApiError error = response.as(ApiError.class);
+        assertEquals(HttpStatus.UNSUPPORTED_MEDIA_TYPE, error.getStatus());
+        assertEquals(1, error.getErrors().size());
+        assertTrue(error.getErrors().get(0).contains("media type is not supported"));
+        System.out.println(response.asString());
+
+    }
+
+}

spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerIntegrationTest.java

@@ -0,0 +1,48 @@
+package org.baeldung.web;
+
+import org.baeldung.security.SecurityJavaConfig;
+import org.baeldung.spring.ClientWebConfig;
+import org.baeldung.spring.WebConfig;
+import org.baeldung.web.controller.AsyncController;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
+public class AsyncControllerIntegrationTest {
+
+    @Autowired
+    WebApplicationContext wac;
+    @Autowired
+    MockHttpSession session;
+
+    @Mock
+    AsyncController controller;
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
+    }
+
+    @Test
+    public void testAsync() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/async")).andExpect(status().is5xxServerError());
+    }
+
+}

spring-security-rest/src/test/java/org/baeldung/web/SwaggerLiveTest.java

@@ -0,0 +1,20 @@
+package org.baeldung.web;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.response.Response;
+
+public class SwaggerLiveTest {
+    private static final String URL_PREFIX = "http://localhost:8080/spring-security-rest/api";
+
+    @Test
+    public void whenVerifySpringFoxIsWorking_thenOK() {
+        final Response response = RestAssured.get(URL_PREFIX + "/v2/api-docs");
+        assertEquals(200, response.statusCode());
+        System.out.println(response.asString());
+
+    }
+}

spring-security-rest/src/test/java/org/baeldung/web/TestConfig.java

@@ -0,0 +1,19 @@
+package org.baeldung.web;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+@Configuration
+@ComponentScan({ "org.baeldung.web" })
+public class TestConfig {
+
+    @Bean
+    public MultipartResolver multipartResolver() {
+        CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
+        return multipartResolver;
+    }
+
+}

spring-security-rest/src/test/resources/.gitignore

@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear