iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7304 from amit2103/BAEL-11603 

[BAEL-11603] - Fixed tests in spring-mvc-java module
This commit is contained in:
Loredana Crusoveanu 2019-07-19 11:49:17 +03:00 committed by GitHub
parent 4eaf15ed51 da86b78fa5
commit 952c78e207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-mvc-java/pom.xml
View File

@ -144,6 +144,11 @@
<artifactId>spring-messaging</artifactId> <artifactId>spring-messaging</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${javax.el.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -290,7 +295,7 @@
<!-- excel --> <!-- excel -->
<poi.version>3.16-beta1</poi.version> <poi.version>3.16-beta1</poi.version>
<javax.el.version>3.0.1-b06</javax.el.version> <javax.el.version>3.0.1-b09</javax.el.version>
</properties> </properties>

2
spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java → spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
View File

@ -1,4 +1,4 @@
package com.baeldung.web.controller; package com.baeldung.web.controller.message;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;

3
spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
View File

@ -15,7 +15,7 @@ import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
@Configuration @Configuration
@EnableWebMvc @EnableWebMvc
@ComponentScan(basePackages = { "com.baeldung.web.controller" }) @ComponentScan(basePackages = { "com.baeldung.web.controller.message" })
public class TestConfig implements WebMvcConfigurer { public class TestConfig implements WebMvcConfigurer {
@Autowired @Autowired
@ -44,5 +44,4 @@ public class TestConfig implements WebMvcConfigurer {
templateEngine.setTemplateResolver(templateResolver()); templateEngine.setTemplateResolver(templateResolver());
return templateEngine; return templateEngine;
} }
} }