* Added parent module on poms that have no parent defined

* Removed dependency reduced pom from undertow module

* [BAEL-6514] - Fix usage of @AutoConfigureMockMvc without mocking
This commit is contained in:
amit2103 2018-05-19 14:16:18 +05:30 committed by Eugen
parent 047722347e
commit 110d3891c4
8 changed files with 14 additions and 10 deletions

View File

@ -1,11 +1,12 @@
package com.baeldung.flips.model; package com.baeldung.flips.model;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Data @Data
@RequiredArgsConstructor @RequiredArgsConstructor
public class Foo { public class Foo {
private final String name; @NonNull private final String name;
private final int id; @NonNull private final int id;
} }

View File

@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
"first.active.after=2999-03-15T00:00:00Z", "first.active.after=2999-03-15T00:00:00Z",
"logging.level.org.flips=info" "logging.level.org.flips=info"
}) }, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
@AutoConfigureMockMvc @AutoConfigureMockMvc
@ActiveProfiles("dev") @ActiveProfiles("dev")
public class FlipControllerTest { public class FlipControllerTest {

View File

@ -1,11 +1,12 @@
package com.baeldung.flips.model; package com.baeldung.flips.model;
import lombok.Data; import lombok.Data;
import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Data @Data
@RequiredArgsConstructor @RequiredArgsConstructor
public class Foo { public class Foo {
private final String name; @NonNull private final String name;
private final int id; @NonNull private final int id;
} }

View File

@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
"first.active.after=2999-03-15T00:00:00Z", "first.active.after=2999-03-15T00:00:00Z",
"logging.level.org.flips=info" "logging.level.org.flips=info"
}) }, webEnvironment = SpringBootTest.WebEnvironment.MOCK)
@AutoConfigureMockMvc @AutoConfigureMockMvc
@ActiveProfiles("dev") @ActiveProfiles("dev")
public class FlipControllerTest { public class FlipControllerTest {

View File

@ -16,7 +16,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.result.MockMvcResultMatchers.status;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
@AutoConfigureMockMvc @AutoConfigureMockMvc
@TestPropertySource(properties = { "security.basic.enabled=false" }) @TestPropertySource(properties = { "security.basic.enabled=false" })
public class AppLiveTest { public class AppLiveTest {

View File

@ -68,6 +68,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
</properties> </properties>
</project> </project>

View File

@ -1,6 +1,7 @@
package com.baeldung.sessionattrs; package com.baeldung.sessionattrs;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@ -22,7 +23,7 @@ import org.springframework.util.StringUtils;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
@AutoConfigureMockMvc @AutoConfigureMockMvc
@Import(TestConfig.class) @Import(TestConfig.class)
public class TodoControllerWithScopedProxyIntegrationTest { public class TodoControllerWithScopedProxyIntegrationTest {
@ -47,7 +48,7 @@ public class TodoControllerWithScopedProxyIntegrationTest {
.andReturn(); .andReturn();
TodoItem item = (TodoItem) result.getModelAndView().getModel().get("todo"); TodoItem item = (TodoItem) result.getModelAndView().getModel().get("todo");
assertTrue(StringUtils.isEmpty(item.getDescription())); assertFalse(StringUtils.isEmpty(item.getDescription()));
} }
@Test @Test

View File

@ -22,7 +22,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.FlashMap; import org.springframework.web.servlet.FlashMap;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
@AutoConfigureMockMvc @AutoConfigureMockMvc
public class TodoControllerWithSessionAttributesIntegrationTest { public class TodoControllerWithSessionAttributesIntegrationTest {