This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 2d9cceb2ceb5d2414788cd2cc053516a7a5d5959 Author: ddekany <[email protected]> AuthorDate: Thu Dec 28 11:44:13 2023 +0100 Spring: Updated tests to run on Spring 6. (There were many URL-s with an extra character at the end, that apparently worked on some much older Spring version.) --- .../spring/ConfigurationFactoryBeanTest.java | 22 ++++++++-------------- .../spring/SpringResourceTemplateLoaderTest.java | 12 ++++++------ .../freemarker/spring/VersionPropertyTest.java | 5 ++--- .../freemarker/spring/model/BindDirectiveTest.java | 10 +++++----- .../spring/model/MessageFunctionTest.java | 12 ++++++------ .../spring/model/NestedPathDirectiveTest.java | 10 +++++----- .../freemarker/spring/model/ThemeFunctionTest.java | 10 +++++----- .../form/ButtonTemplateDirectiveModelTest.java | 10 +++++----- .../form/CheckboxTemplateDirectiveModelTest.java | 16 ++++++++-------- .../form/CheckboxesTemplateDirectiveModelTest.java | 14 +++++++------- .../model/form/FormTemplateDirectiveModelTest.java | 12 ++++++------ .../HiddenInputTemplateDirectiveModelTest.java | 10 +++++----- .../form/InputTemplateDirectiveModelTest.java | 12 ++++++------ .../form/LabelTemplateDirectiveModelTest.java | 10 +++++----- .../PasswordInputTemplateDirectiveModelTest.java | 10 +++++----- .../RadioButtonTemplateDirectiveModelTest.java | 12 ++++++------ .../RadioButtonsTemplateDirectiveModelTest.java | 14 +++++++------- .../form/SelectTemplateDirectiveModelTest.java | 10 +++++----- .../form/TextareaTemplateDirectiveModelTest.java | 10 +++++----- 19 files changed, 107 insertions(+), 114 deletions(-) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java index d293b9a3..53d5ba35 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/ConfigurationFactoryBeanTest.java @@ -18,20 +18,8 @@ */ package org.apache.freemarker.spring; -import static org.junit.Assert.*; - -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import org.apache.freemarker.core.AutoEscapingPolicy; -import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.*; import org.apache.freemarker.core.Configuration.ExtendableBuilder; -import org.apache.freemarker.core.DefaultTemplateLanguage; -import org.apache.freemarker.core.MutableParsingAndProcessingConfiguration; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.Version; import org.apache.freemarker.core.model.impl.RestrictedObjectWrapper; import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; import org.apache.freemarker.core.templateresolver.CacheStorage; @@ -44,6 +32,13 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.GenericApplicationContext; +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static org.junit.Assert.*; + public class ConfigurationFactoryBeanTest { private GenericApplicationContext appContext; @@ -57,7 +52,6 @@ public class ConfigurationFactoryBeanTest { public void tearDown() throws Exception { if (appContext.isActive()) { appContext.stop(); - appContext.destroy(); appContext.close(); } } diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java index 7f7a9e5a..ebdf8c29 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java @@ -18,11 +18,6 @@ */ package org.apache.freemarker.spring; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -import java.io.IOException; - import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.TemplateNotFoundException; import org.apache.freemarker.test.TestConfigurationBuilder; @@ -31,6 +26,12 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; +import java.io.IOException; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.junit.Assert.*; + public class SpringResourceTemplateLoaderTest { private static final String TEMPLATE_BASE_PATH = "classpath:META-INF/templates/"; @@ -52,7 +53,6 @@ public class SpringResourceTemplateLoaderTest { public void tearDown() throws Exception { if (appContext.isActive()) { appContext.stop(); - appContext.destroy(); appContext.close(); } } diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/VersionPropertyTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/VersionPropertyTest.java index 90c6c949..4e0080e5 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/VersionPropertyTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/VersionPropertyTest.java @@ -18,8 +18,6 @@ */ package org.apache.freemarker.spring; -import static org.junit.Assert.*; - import org.apache.freemarker.core.Version; import org.junit.After; import org.junit.Before; @@ -28,6 +26,8 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.GenericApplicationContext; +import static org.junit.Assert.assertEquals; + public class VersionPropertyTest { private GenericApplicationContext appContext; @@ -41,7 +41,6 @@ public class VersionPropertyTest { public void tearDown() throws Exception { if (appContext.isActive()) { appContext.stop(); - appContext.destroy(); appContext.close(); } } diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/BindDirectiveTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/BindDirectiveTest.java index d93534a3..0585f0dc 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/BindDirectiveTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/BindDirectiveTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class BindDirectiveTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}.", userId).param("viewName", "test/model/bind-directive-basic-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/bind-directive-basic-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//input[@name='email']/@value").string(user.getEmail())) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/MessageFunctionTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/MessageFunctionTest.java index 01b10c99..9b1f430e 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/MessageFunctionTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/MessageFunctionTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class MessageFunctionTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/message-function-basic-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/message-function-basic-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//div[@id='userId']/text()").string(wac.getMessage("user.id", null, null))) @@ -72,7 +72,7 @@ public class MessageFunctionTest { public void testWithMessageSourceResolvable() throws Exception { final Long nonExistingUserId = 0L; mockMvc.perform( - get("/users/{userId}/", nonExistingUserId).param("viewName", "test/model/message-function-basic-usages") + get("/users/{userId}", nonExistingUserId).param("viewName", "test/model/message-function-basic-usages") .accept(MediaType.parseMediaType("text/html"))) .andExpect(status().isOk()).andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//div[@id='errorMessage']/text()") diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/NestedPathDirectiveTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/NestedPathDirectiveTest.java index 31c80aa1..47e3b085 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/NestedPathDirectiveTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/NestedPathDirectiveTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class NestedPathDirectiveTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}.", userId).param("viewName", "test/model/nestedpath-directive-basic-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/nestedpath-directive-basic-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//input[@name='email']/@value").string(user.getEmail())) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/ThemeFunctionTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/ThemeFunctionTest.java index 04a41246..6c0a9ac9 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/ThemeFunctionTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/ThemeFunctionTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; import org.junit.Test; @@ -38,6 +34,10 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.ui.context.ThemeSource; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -64,7 +64,7 @@ public class ThemeFunctionTest { final MessageSource defaultThemeMessageSource = themeSource.getTheme("default").getMessageSource(); final Long userId = userRepository.getUserIds().iterator().next(); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/theme-function-basic-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/theme-function-basic-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//link[@rel='stylesheet']/@href") diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModelTest.java index 22f7a96a..1427c382 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/ButtonTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.hamcrest.Matchers; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -58,7 +58,7 @@ public class ButtonTemplateDirectiveModelTest { @Test public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/button-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/button-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//button[@name='button1']/@value").string("Submit")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxTemplateDirectiveModelTest.java index 7d03f254..72de2469 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -58,7 +58,7 @@ public class CheckboxTemplateDirectiveModelTest { @Test public void testSingleCheckboxWithNotChecked() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='checkbox' and @id='receiveNewsletter1' and @name='receiveNewsletter']/@value").string("true")) @@ -69,7 +69,7 @@ public class CheckboxTemplateDirectiveModelTest { @Test public void testSingleCheckboxWithChecked() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='checkbox' and @id='receiveNewsletter1' and @name='receiveNewsletter']/@value").string("true")) @@ -80,7 +80,7 @@ public class CheckboxTemplateDirectiveModelTest { @Test public void testMultipleCheckboxes101() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='checkbox' and @id='favoriteFood1' and @name='favoriteFood' and @value='Sandwich' and @checked='checked']").exists()) @@ -93,7 +93,7 @@ public class CheckboxTemplateDirectiveModelTest { @Test public void testMultipleCheckboxes102() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkbox-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='checkbox' and @id='favoriteFood1' and @name='favoriteFood' and @value='Sandwich' and @checked='checked']").exists()) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxesTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxesTemplateDirectiveModelTest.java index a085dc63..c3d63450 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxesTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/CheckboxesTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -58,7 +58,7 @@ public class CheckboxesTemplateDirectiveModelTest { @Test public void testCheckboxesWithSequence() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//span/input[@type='checkbox' and @id='favoriteFoodInForm11' and @name='favoriteFood' and @checked='checked']/@value").string("Sandwich")) @@ -73,7 +73,7 @@ public class CheckboxesTemplateDirectiveModelTest { @Test public void testCheckboxesWithHash() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form2']//span/input[@type='checkbox' and @id='favoriteFoodInForm21' and @name='favoriteFood' and @checked='checked']/@value").string("Sandwich")) @@ -88,7 +88,7 @@ public class CheckboxesTemplateDirectiveModelTest { @Test public void testCheckboxesWithEnclosingElementNameAndDelimiter() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/checkboxes-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form3']//div/input[@type='checkbox' and @id='favoriteFoodInForm31' and @name='favoriteFood' and @checked='checked']/@value").string("Sandwich")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModelTest.java index a22825cf..20576c8d 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/FormTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class FormTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/form-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/form-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']/@method").string("post")) @@ -71,7 +71,7 @@ public class FormTemplateDirectiveModelTest { public void testDefaultAttributes() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/form-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/form-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form2']/@class").string("my_cssClass")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/HiddenInputTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/HiddenInputTemplateDirectiveModelTest.java index 12af35db..5346c5af 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/HiddenInputTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/HiddenInputTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class HiddenInputTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/hidden-input-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/hidden-input-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='hidden' and @name='email']/@value").string(user.getEmail())) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModelTest.java index 74b83eb4..bee0752e 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/InputTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class InputTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/input-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/input-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@id='customEmailId' and @name='email']/@value").string(user.getEmail())) @@ -70,7 +70,7 @@ public class InputTemplateDirectiveModelTest { @Test public void testDefaultAttributes() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/input-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/input-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form2']//input/@name").string("firstName")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/LabelTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/LabelTemplateDirectiveModelTest.java index ae87c13f..db67dd2d 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/LabelTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/LabelTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class LabelTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/label-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/label-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//label[@for='email']/text()").string("E-Mail:")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/PasswordInputTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/PasswordInputTemplateDirectiveModelTest.java index cc872f79..4a0dea5f 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/PasswordInputTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/PasswordInputTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -59,7 +59,7 @@ public class PasswordInputTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/password-input-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/password-input-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='password' and @name='password']/@value").string("")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonTemplateDirectiveModelTest.java index b6908c90..9d30b176 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -58,7 +58,7 @@ public class RadioButtonTemplateDirectiveModelTest { @Test public void testSingleCheckboxWithFemaleUser() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/radiobutton-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/radiobutton-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='radio' and @id='gender1' and @name='gender' and @value='F']").exists()) @@ -72,7 +72,7 @@ public class RadioButtonTemplateDirectiveModelTest { @Test public void testSingleCheckboxWithMaleUser() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/radiobutton-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/radiobutton-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//input[@type='radio' and @id='gender1' and @name='gender' and @value='F']").exists()) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonsTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonsTemplateDirectiveModelTest.java index 155fe829..139815c3 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonsTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/RadioButtonsTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.junit.Before; @@ -37,6 +33,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -58,7 +58,7 @@ public class RadioButtonsTemplateDirectiveModelTest { @Test public void testRadioButtonsWithSequence() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//span/input[@type='radio' and @id='genderInForm11' and @name='gender']/@value").string("F")) @@ -75,7 +75,7 @@ public class RadioButtonsTemplateDirectiveModelTest { @Test public void testRadioButtonsWithHash() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form2']//span/input[@type='radio' and @id='genderInForm21' and @name='gender']/@value").string("F")) @@ -92,7 +92,7 @@ public class RadioButtonsTemplateDirectiveModelTest { @Test public void testRadioButtonsWithEnclosingElementNameAndDelimiter() throws Exception { final User user = userRepository.getUserByEmail("[email protected]"); - mockMvc.perform(get("/users/{userId}/", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") + mockMvc.perform(get("/users/{userId}", user.getId()).param("viewName", "test/model/form/radiobuttons-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form3']//div/input[@type='radio' and @id='genderInForm31' and @name='gender']/@value").string("F")) diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/SelectTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/SelectTemplateDirectiveModelTest.java index 89a6fe4d..0c866580 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/SelectTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/SelectTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.apache.freemarker.spring.model.ElementAttributeMatcher; @@ -41,6 +37,10 @@ import org.springframework.test.web.servlet.result.XpathResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -66,7 +66,7 @@ public class SelectTemplateDirectiveModelTest { final String favoriteSport = user.getFavoriteSport(); final ResultActions resultAcctions = - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/select-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/select-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()); diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/TextareaTemplateDirectiveModelTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/TextareaTemplateDirectiveModelTest.java index 130b4138..a7fa7636 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/TextareaTemplateDirectiveModelTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/model/form/TextareaTemplateDirectiveModelTest.java @@ -19,10 +19,6 @@ package org.apache.freemarker.spring.model.form; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; - import org.apache.freemarker.spring.example.mvc.users.User; import org.apache.freemarker.spring.example.mvc.users.UserRepository; import org.hamcrest.Matchers; @@ -38,6 +34,10 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration("classpath:META-INF/web-resources") @ContextConfiguration(locations = { "classpath:org/apache/freemarker/spring/example/mvc/users/users-mvc-context.xml" }) @@ -60,7 +60,7 @@ public class TextareaTemplateDirectiveModelTest { public void testBasicUsages() throws Exception { final Long userId = userRepository.getUserIds().iterator().next(); final User user = userRepository.getUser(userId); - mockMvc.perform(get("/users/{userId}/", userId).param("viewName", "test/model/form/textarea-directive-usages") + mockMvc.perform(get("/users/{userId}", userId).param("viewName", "test/model/form/textarea-directive-usages") .accept(MediaType.parseMediaType("text/html"))).andExpect(status().isOk()) .andExpect(content().contentTypeCompatibleWith("text/html")).andDo(print()) .andExpect(xpath("//form[@id='form1']//textarea[@name='description']/@rows").string("10"))
