Author: cbrisson
Date: Wed Jun 20 00:43:23 2018
New Revision: 1833881
URL: http://svn.apache.org/viewvc?rev=1833881&view=rev
Log:
[tools] Fix BrowserTool tests
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/tools.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/tools.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/tools.xml?rev=1833881&r1=1833880&r2=1833881&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/tools.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/tools.xml
Wed Jun 20 00:43:23 2018
@@ -30,7 +30,7 @@
</toolbox>
<toolbox scope="session" locale="en_US">
- <tool class="org.apache.velocity.tools.view.BrowserTool"
languagesFilter="en"/>
+ <tool class="org.apache.velocity.tools.view.BrowserTool"
languagesFilter="en,fr"/>
</toolbox>
<toolbox scope="application">
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java?rev=1833881&r1=1833880&r2=1833881&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
Wed Jun 20 00:43:23 2018
@@ -178,12 +178,17 @@ public class ViewToolsIT {
checkText(resp,"httpunit","true");
/* check language */
+ conv = new WebConversation();
+ req = new GetMethodWebRequest(ROOT_URL+"browser.vm");
req.setHeaderField("Accept-Language","en");
resp = conv.getResponse(req);
checkText(resp,"preferredLanguage","en");
- req.setHeaderField("Accept-Language","en-US,en;q=0.8");
+
+ conv = new WebConversation();
+ req = new GetMethodWebRequest(ROOT_URL+"browser.vm");
+
req.setHeaderField("Accept-Language","fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7");
resp = conv.getResponse(req);
- checkText(resp,"preferredLanguage","en");
+ checkText(resp,"preferredLanguage","fr");
}
public @Test void testContextTool() throws Exception {
