From cdf3c5cbf120d984049bb6d292193d8620d52639 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 13 Mar 2014 20:17:01 +0100 Subject: [PATCH 1/3] Extends Hidden to support xhtml theme properly --- .../org/apache/struts2/components/Hidden.java | 7 ++++++ .../main/resources/template/xhtml/hidden.ftl | 25 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 core/src/main/resources/template/xhtml/hidden.ftl diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java index 62efc44c0..36b03d1e1 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -65,4 +65,11 @@ public class Hidden extends UIBean { protected String getDefaultTemplate() { return TEMPLATE; } + + @Override + public void evaluateParams() { + super.evaluateParams(); + label = null; + addParameter("label", null); + } } diff --git a/core/src/main/resources/template/xhtml/hidden.ftl b/core/src/main/resources/template/xhtml/hidden.ftl new file mode 100644 index 000000000..3ff0f055c --- /dev/null +++ b/core/src/main/resources/template/xhtml/hidden.ftl @@ -0,0 +1,25 @@ +<#-- +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /> +<#include "/${parameters.templateDir}/simple/hidden.ftl" /> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /> From 43e86d76d5dc6bc7b6261e91eaddcee2cc009a6b Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 13 Mar 2014 20:19:59 +0100 Subject: [PATCH 2/3] Extends Hidden tests results to match new xhtml theme --- .../org/apache/struts2/views/jsp/ui/Hidden-1.txt | 8 +++++++- .../org/apache/struts2/views/jsp/ui/Hidden-2.txt | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt index 4d6c9274c..fafc7ba83 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt @@ -1 +1,7 @@ - + + + + + + + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt index 2cc5ab6c7..df7e11bae 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-2.txt @@ -1 +1,7 @@ - + + + + + + + From 924531c54400882d1781ba3067d7af63825850c3 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 13 Mar 2014 20:20:25 +0100 Subject: [PATCH 3/3] Improves tests to reuse the same ServletContext --- .../java/org/apache/struts2/StrutsInternalTestCase.java | 9 ++++----- .../org/apache/struts2/views/jsp/AbstractTagTest.java | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java b/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java index 0b9d1c49b..68164812b 100644 --- a/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java +++ b/core/src/test/java/org/apache/struts2/StrutsInternalTestCase.java @@ -21,15 +21,12 @@ package org.apache.struts2; -import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.XWorkTestCase; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.util.XWorkTestCaseHelper; import com.opensymphony.xwork2.util.logging.LoggerFactory; import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.util.StrutsTestCaseHelper; -import org.springframework.mock.web.MockServletContext; +import org.apache.struts2.views.jsp.StrutsMockServletContext; import java.text.SimpleDateFormat; import java.util.Date; @@ -75,6 +72,7 @@ public abstract class StrutsInternalTestCase extends XWorkTestCase { LoggerFactory.setLoggerFactory(new JdkLoggerFactory()); } + protected StrutsMockServletContext servletContext; protected Dispatcher dispatcher; /** @@ -87,7 +85,8 @@ public abstract class StrutsInternalTestCase extends XWorkTestCase { } protected Dispatcher initDispatcher(Map params) { - dispatcher = StrutsTestCaseHelper.initDispatcher(new MockServletContext(), params); + servletContext = new StrutsMockServletContext(); + dispatcher = StrutsTestCaseHelper.initDispatcher(servletContext, params); configurationManager = dispatcher.getConfigurationManager(); configuration = configurationManager.getConfiguration(); container = configuration.getContainer(); diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java index 36b04fa28..60eb1700f 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java @@ -61,7 +61,6 @@ public abstract class AbstractTagTest extends StrutsInternalTestCase { protected StrutsMockHttpServletRequest request; protected StrutsMockPageContext pageContext; protected HttpServletResponse response; - protected StrutsMockServletContext servletContext; protected Mock mockContainer; @@ -83,7 +82,7 @@ public abstract class AbstractTagTest extends StrutsInternalTestCase { createMocks(); } - protected void createMocks() { + protected void createMocks() throws Exception { action = this.getAction(); stack = ActionContext.getContext().getValueStack(); context = stack.getContext(); @@ -99,7 +98,6 @@ public abstract class AbstractTagTest extends StrutsInternalTestCase { JspWriter jspWriter = new StrutsMockJspWriter(writer); - servletContext = new StrutsMockServletContext(); servletContext.setRealPath(new File("nosuchfile.properties").getAbsolutePath()); servletContext.setServletInfo("Resin");