Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compatibility with JDK 9 release candidate build (175)

Browse Source 
Includes upgrade to Objenesis 2.6, Gradle 3.5.1, RxJava 2.1.1, JSON Binding API 1.0 final.

Issue: SPR-15686
Issue: SPR-15600
This commit is contained in:
Juergen Hoeller
2017-06-26 18:58:59 +02:00
parent 155a1c6c71
commit 098ff6f0f8
8 changed files with 104 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -30,15 +31,15 @@ import org.springframework.http.MediaType;
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
import org.springframework.mock.http.server.reactive.test.MockServerWebExchange;
import org.springframework.mock.web.test.MockHttpServletResponse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;
/**
* Unit tests for Kotlin script templates running on Kotlin JSR 223 support
* Unit tests for Kotlin script templates running on Kotlin JSR-223 support.
*
* @author Sebastien Deleuze
*/
@Ignore // for JDK 9 compatibility
public class KotlinScriptTemplateTests {
@Test
@@ -74,6 +75,7 @@ public class KotlinScriptTemplateTests {
response.getBodyAsString().block());
}
private MockServerHttpResponse renderViewWithModel(String viewUrl, Map<String, Object> model, Locale locale, Class<?> configuration) throws Exception {
ScriptTemplateView view = createViewWithUrl(viewUrl, configuration);
view.setLocale(locale);
@@ -115,6 +117,7 @@ public class KotlinScriptTemplateTests {
}
}
@Configuration
static class ScriptTemplatingConfigurationWithoutRenderFunction {