Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16478 from dreis2211

Browse Source 
* pr/16478:
  Fix Thymeleaf deprecations
This commit is contained in:
Stephane Nicoll 2019-04-06 21:32:37 +02:00
commit 424d98ce3e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View File

@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Locale;
import nz.net.ultraq.thymeleaf.LayoutDialect;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy;
import org.junit.Rule;
import org.junit.Test;
import org.thymeleaf.TemplateEngine;
@ -262,7 +262,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(ReflectionTestUtils.getField(
context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingStrategy.class));
.isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
}
@Configuration(proxyBeanMethods = false)
@ -270,7 +270,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
@Bean
public LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingStrategy());
return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
}
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
import javax.servlet.DispatcherType;
import nz.net.ultraq.thymeleaf.LayoutDialect;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy;
import org.junit.Rule;
import org.junit.Test;
import org.thymeleaf.TemplateEngine;
@ -349,7 +349,7 @@ public class ThymeleafServletAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(ReflectionTestUtils.getField(
context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingStrategy.class));
.isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
}
@Test
@ -369,7 +369,7 @@ public class ThymeleafServletAutoConfigurationTests {
@Bean
public LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingStrategy());
return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
}
}