You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/05/22 12:58:31 UTC
[04/50] struts git commit: Moves deprecated plugins to struts-archive
repo
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
deleted file mode 100644
index 305513c..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.jsp.ui.AbstractUITag;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-/**
- */
-public abstract class AbstractUITagTest extends AbstractTagTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(AbstractUITagTest.class);
-
- static final String FREEMARKER_ERROR_EXPECTATION = "Java backtrace for programmers:";
-
- /**
- * Simple helper class for generic tag property testing mechanism. Basically it holds a property name, a property
- * value and an output to be expected in tag output when property was accordingly set.
- *
- * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
- */
- public class PropertyHolder {
- String name, value, expectation;
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
- public String getExpectation() {
- return expectation;
- }
-
- /**
- * Construct simple holder with default expectation.
- *
- * @param name The property name to use.
- * @param value The property value to set.
- * @see #PropertyHolder(String, String, String)
- */
- public PropertyHolder(String name, String value) {
- this(name, value, null);
- }
-
- /**
- * Construct property holder.
- *
- * @param name The property name to use.
- * @param value The property value to set.
- * @param expectation The expected String to occur in tag output caused by setting given tag property. If
- * <tt>null</tt>, will be set to <pre>name + "=\"" + value + "\"</pre>.
- */
- public PropertyHolder(String name, String value, String expectation) {
- this.name = name;
- this.value = value;
- if (expectation != null) {
- this.expectation = expectation;
- } else {
- this.expectation = name + "=\"" + value + "\"";
- }
- }
-
- /**
- * Convenience method for easily adding anonymous constructed instance to a given map, with {@link #getName()}
- * as key.
- *
- * @param map The map to place this instance in.
- */
- public void addToMap(Map map) {
- if (map != null) {
- map.put(this.name, this);
- }
- }
- }
-
- /**
- * Simple Helper for setting bean properties. Although BeanUtils from oscore should provide bean property setting
- * functionality, it does not work (at least with my JDK 1.5.0_05), failing in jdk's PropertyDescriptor constructor.
- * This implementation works safely in any case, and does not add dependency on commons-beanutils for building.
- * TODO: Check how we can remove this crap again.
- *
- * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
- */
- public class BeanHelper {
- Map propDescriptors;
- Object bean;
-
- public BeanHelper(Object bean) {
- this.bean = bean;
-
- try {
- PropertyDescriptor[] pds;
- pds = Introspector.getBeanInfo(bean.getClass()).getPropertyDescriptors();
- propDescriptors = new HashMap(pds.length + 1, 1f);
- for (int i = 0; i < pds.length; i ++) {
- propDescriptors.put(pds[i].getName(), pds[i]);
- }
- } catch (IntrospectionException e) {
- e.printStackTrace();
- }
- }
-
- public void set(String name, Object value) throws IllegalAccessException, InvocationTargetException {
- PropertyDescriptor pd = (PropertyDescriptor) propDescriptors.get(name);
-
- if (pd != null) {
- pd.getWriteMethod().invoke(bean, new Object[]{value});
- }
- }
-
- }
-
- /**
- * Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link
- * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])} as properties to
- * verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in
- * subclasses.
- */
- protected Map initializedGenericTagTestProperties() {
- Map result = new HashMap();
- new PropertyHolder("name", "someName").addToMap(result);
- new PropertyHolder("id", "someId").addToMap(result);
- new PropertyHolder("cssClass", "cssClass1", "class=\"cssClass1\"").addToMap(result);
- new PropertyHolder("cssStyle", "cssStyle1", "style=\"cssStyle1\"").addToMap(result);
- new PropertyHolder("title", "someTitle").addToMap(result);
- new PropertyHolder("disabled", "true", "disabled=\"disabled\"").addToMap(result);
- //new PropertyHolder("label", "label", "label=\"label\"").addToMap(result);
- //new PropertyHolder("required", "someTitle").addToMap(result);
- new PropertyHolder("tabindex", "99").addToMap(result);
- new PropertyHolder("value", "someValue").addToMap(result);
- new PropertyHolder("onclick", "onclick1").addToMap(result);
- new PropertyHolder("ondblclick", "ondblclick1").addToMap(result);
- new PropertyHolder("onmousedown", "onmousedown1").addToMap(result);
- new PropertyHolder("onmouseup", "onmouseup1").addToMap(result);
- new PropertyHolder("onmouseover", "onmouseover1").addToMap(result);
- new PropertyHolder("onmousemove", "onmousemove1").addToMap(result);
- new PropertyHolder("onmouseout", "onmouseout1").addToMap(result);
- new PropertyHolder("onfocus", "onfocus1").addToMap(result);
- new PropertyHolder("onblur", "onblur1").addToMap(result);
- new PropertyHolder("onkeypress", "onkeypress1").addToMap(result);
- new PropertyHolder("onkeydown", "onkeydown1").addToMap(result);
- new PropertyHolder("onkeyup", "onkeyup1").addToMap(result);
- new PropertyHolder("onclick", "onclick1").addToMap(result);
- new PropertyHolder("onselect", "onchange").addToMap(result);
- return result;
- }
-
- /**
- * Do a generic verification that setting certain properties on a tag causes expected output regarding this
- * property. In most cases you would not call this directly, instead use {@link
- * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])}.
- *
- * @param tag The fresh created tag instance to test.
- * @param theme The theme to use. If <tt>null</tt>, use configured default theme.
- * @param propertiesToTest Map of {@link PropertyHolder}s, defining properties to test.
- * @param exclude Names of properties to exclude from particular test.
- * @throws Exception
- */
- public void verifyGenericProperties(AbstractUITag tag, String theme, Map propertiesToTest, String[] exclude) throws Exception {
- if (tag != null && propertiesToTest != null) {
- List excludeList;
- if (exclude != null) {
- excludeList = Arrays.asList(exclude);
- } else {
- excludeList = Collections.EMPTY_LIST;
- }
-
- tag.setPageContext(pageContext);
- if (theme != null) {
- tag.setTheme(theme);
- }
-
- BeanHelper beanHelper = new BeanHelper(tag);
- Iterator it = propertiesToTest.values().iterator();
- while (it.hasNext()) {
- PropertyHolder propertyHolder = (PropertyHolder) it.next();
- if (! excludeList.contains(propertyHolder.getName())) {
- beanHelper.set(propertyHolder.getName(), propertyHolder.getValue());
- }
- }
- tag.doStartTag();
- tag.doEndTag();
- String writerString = normalize(writer.toString(), true);
- if (LOG.isInfoEnabled()) {
- LOG.info("AbstractUITagTest - [verifyGenericProperties]: Tag output is " + writerString);
- }
-
- assertTrue("Freemarker error detected in tag output: " + writerString, writerString.indexOf(FREEMARKER_ERROR_EXPECTATION) == -1);
-
- it = propertiesToTest.values().iterator();
- while (it.hasNext()) {
- PropertyHolder propertyHolder = (PropertyHolder) it.next();
- if (! excludeList.contains(propertyHolder.getName())) {
- assertTrue("Expected to find: " + propertyHolder.getExpectation() + " in resulting String: " + writerString, writerString.indexOf(propertyHolder.getExpectation()) > -1);
- }
- }
- }
- }
-
- /**
- * Do a generic verification that setting certain properties on a tag causes expected output regarding this
- * property. Which properties to test with which expectations will be determined by the Map retrieved by {@link #initializedGenericTagTestProperties()}.
- *
- * @param tag The fresh created tag instance to test.
- * @param theme The theme to use. If <tt>null</tt>, use configured default theme.
- * @param exclude Names of properties to exclude from particular test.
- * @throws Exception
- */
- public void verifyGenericProperties(AbstractUITag tag, String theme, String[] exclude) throws Exception {
- verifyGenericProperties(tag, theme, initializedGenericTagTestProperties(), exclude);
- }
-
- /**
- * Attempt to verify the contents of this.writer against the contents of the URL specified. verify() performs a
- * trim on both ends
- *
- * @param url the HTML snippet that we want to validate against
- * @throws Exception if the validation failed
- */
- public void verify(URL url) throws Exception {
- if (url == null) {
- fail("unable to verify a null URL");
- } else if (this.writer == null) {
- fail("AbstractJspWriter.writer not initialized. Unable to verify");
- }
-
- StringBuffer buffer = new StringBuffer(128);
- InputStream in = url.openStream();
- byte[] buf = new byte[4096];
- int nbytes;
-
- while ((nbytes = in.read(buf)) > 0) {
- buffer.append(new String(buf, 0, nbytes));
- }
-
- in.close();
-
- /**
- * compare the trimmed values of each buffer and make sure they're equivalent. however, let's make sure to
- * normalize the strings first to account for line termination differences between platforms.
- */
- String writerString = normalize(writer.toString(), true);
- String bufferString = normalize(buffer.toString(), true);
-
- assertEquals(bufferString, writerString);
- }
-
- /**
- * Attempt to verify the contents of this.writer against the contents of the URL specified. verify() performs a
- * trim on both ends
- *
- * @param url the HTML snippet that we want to validate against
- * @throws Exception if the validation failed
- */
- public void verify(URL url, String[] excluded) throws Exception {
- if (url == null) {
- fail("unable to verify a null URL");
- } else if (this.writer == null) {
- fail("AbstractJspWriter.writer not initialized. Unable to verify");
- }
-
- StringBuffer buffer = new StringBuffer(128);
- InputStream in = url.openStream();
- byte[] buf = new byte[4096];
- int nbytes;
-
- while ((nbytes = in.read(buf)) > 0) {
- buffer.append(new String(buf, 0, nbytes));
- }
-
- in.close();
-
- /**
- * compare the trimmed values of each buffer and make sure they're equivalent. however, let's make sure to
- * normalize the strings first to account for line termination differences between platforms.
- */
- String writerString = normalize(writer.toString(), true);
- String bufferString = normalize(buffer.toString(), true);
-
- assertEquals(bufferString, writerString);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- ServletActionContext.setServletContext(pageContext.getServletContext());
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- ActionContext.setContext(null);
- }
-
- /**
- * normalizes a string so that strings generated on different platforms can be compared. any group of one or more
- * space, tab, \r, and \n characters are converted to a single space character
- *
- * @param obj the object to be normalized. normalize will perform its operation on obj.toString().trim() ;
- * @param appendSpace
- * @return the normalized string
- */
- public static String normalize(Object obj, boolean appendSpace) {
- StringTokenizer st = new StringTokenizer(obj.toString().trim(), " \t\r\n");
- StringBuffer buffer = new StringBuffer(128);
-
- while (st.hasMoreTokens()) {
- buffer.append(st.nextToken());
-
- /*
- if (appendSpace && st.hasMoreTokens()) {
- buffer.append("");
- }
- */
- }
-
- return buffer.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
deleted file mode 100644
index e41ea46..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import org.apache.struts2.dojo.TestAction;
-
-/**
- */
-public class AnchorTest extends AbstractUITagTest {
-
- public void testSimple() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- AnchorTag tag = new AnchorTag();
- tag.setPageContext(pageContext);
-
- tag.setId("mylink");
- tag.setHref("a");
- tag.setErrorText("c");
- tag.setLoadingText("d");
- tag.setBeforeNotifyTopics("e");
- tag.setAfterNotifyTopics("f");
- tag.setListenTopics("g");
- tag.setTargets("h");
- tag.setHandler("i");
- tag.setNotifyTopics("j");
- tag.setIndicator("k");
- tag.setShowErrorTransportText("true");
- tag.setShowLoadingText("true");
- tag.setErrorNotifyTopics("l");
- tag.setHighlightColor("m");
- tag.setHighlightDuration("n");
- tag.setValidate("true");
- tag.setAjaxAfterValidation("true");
- tag.setSeparateScripts("true");
- tag.setTransport("o");
- tag.setParseContent("false");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(AnchorTest.class.getResource("href-1.txt"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
deleted file mode 100644
index 7dd503b..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-/**
- * @see org.apache.struts2.components.Autocompleter
- */
-public class AutocompleterTest extends AbstractUITagTest {
-
- public void testAjax() throws Exception {
- AutocompleterTag tag = new AutocompleterTag();
- tag.setPageContext(pageContext);
- tag.setAutoComplete("true");
- tag.setDisabled("false");
- tag.setForceValidOption("false");
- tag.setHref("a");
- tag.setDropdownWidth("10");
- tag.setDropdownHeight("10");
- tag.setDelay("100");
- tag.setSearchType("b");
- tag.setDisabled("c");
- tag.setName("f");
- tag.setId("f");
- tag.setValue("g");
- tag.setIndicator("h");
- tag.setKeyName("i");
- tag.setLoadOnTextChange("true");
- tag.setLoadMinimumCount("3");
- tag.setShowDownArrow("false");
- tag.setIconPath("i");
- tag.setTemplateCssPath("j");
- tag.setDataFieldName("k");
- tag.setValueNotifyTopics("l");
- tag.setResultsLimit("2");
- tag.setTransport("m");
- tag.setPreload("true");
- tag.setKeyValue("key");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(AutocompleterTest.class.getResource("Autocompleter-1.txt"));
- }
-
- public void testSimple() throws Exception {
- AutocompleterTag tag = new AutocompleterTag();
- tag.setPageContext(pageContext);
- tag.setAutoComplete("true");
- tag.setDisabled("false");
- tag.setForceValidOption("false");
- tag.setList("{'d','e'}");
- tag.setDropdownWidth("10");
- tag.setDropdownHeight("10");
- tag.setDelay("100");
- tag.setSearchType("b");
- tag.setDisabled("c");
- tag.setName("f");
- tag.setId("f");
- tag.setIconPath("i");
- tag.setTemplateCssPath("j");
- tag.setValueNotifyTopics("k");
- tag.setResultsLimit("2");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(AutocompleterTest.class.getResource("Autocompleter-2.txt"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
deleted file mode 100644
index e0358ff..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import org.apache.struts2.dojo.TestAction;
-
-public class BindTest extends AbstractUITagTest {
- public void testAll() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- BindTag tag = new BindTag();
- tag.setPageContext(pageContext);
-
- tag.setId("a");
- tag.setHref("b");
- tag.setLoadingText("c");
- tag.setErrorText("d");
- tag.setListenTopics("e");
- tag.setBeforeNotifyTopics("f");
- tag.setAfterNotifyTopics("g");
- tag.setHandler("h");
- tag.setNotifyTopics("k");
- tag.setIndicator("l");
- tag.setShowLoadingText("true");
- tag.setErrorNotifyTopics("m");
- tag.setSources("n");
- tag.setEvents("o");
- tag.setHighlightColor("p");
- tag.setHighlightDuration("q");
- tag.setValidate("true");
- tag.setSeparateScripts("true");
- tag.setTransport("q");
- tag.setParseContent("false");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(BindTest.class.getResource("Bind-1.txt"));
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
deleted file mode 100644
index 4295b20..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Used by Tree Component Test. Copied from showcase.
- */
-public class Category {
- private static Map<Long, Category> catMap = new HashMap<Long, Category>();
-
- static {
- new Category(1, "Root",
- new Category(2, "Java",
- new Category(3, "Web Frameworks",
- new Category(4, "Struts"),
- new Category(7, "Stripes"),
- new Category(8, "Rife")),
- new Category(9, "Persistence",
- new Category(10, "iBatis"),
- new Category(11, "Hibernate"),
- new Category(12, "JDO"),
- new Category(13, "JDBC"))),
- new Category(14, "JavaScript",
- new Category(15, "Dojo"),
- new Category(16, "Prototype"),
- new Category(17, "Scriptaculous"),
- new Category(18, "OpenRico"),
- new Category(19, "DWR")));
- }
-
- public static Category getById(long id) {
- return catMap.get(id);
- }
-
- private long id;
- private String name;
- private List<Category> children;
- private boolean toggle;
-
- public Category(long id, String name, Category... children) {
- this.id = id;
- this.name = name;
- this.children = new ArrayList<Category>();
- for (Category child : children) {
- this.children.add(child);
- }
-
- catMap.put(id, this);
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List<Category> getChildren() {
- return children;
- }
-
- public void setChildren(List<Category> children) {
- this.children = children;
- }
-
- public void toggle() {
- toggle = !toggle;
- }
-
- public boolean isToggle() {
- return toggle;
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
deleted file mode 100644
index cedd72f..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.struts2.dojo.components.DateTimePicker;
-
-/**
- */
-public class DateTimePickerTagTest extends AbstractUITagTest {
- final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat(
- "yyyy-MM-dd'T'HH:mm:ss");
-
- public void testSimple() throws Exception {
- DateTimePickerTag tag = new DateTimePickerTag();
- tag.setPageContext(pageContext);
-
- tag.setId("id");
-
- tag.setAdjustWeeks("true");
- tag.setDayWidth("b");
- tag.setDisplayWeeks("true");
- tag.setEndDate("%{'2008-01-01'}");
- tag.setStartDate("%{'2008-02-02'}");
- tag.setStaticDisplay("false");
- tag.setWeekStartsOn("g");
- tag.setName("h");
- tag.setLanguage("i");
- tag.setTemplateCssPath("j");
- tag.setValueNotifyTopics("k");
- tag.setValue("%{'2008-03-03'}");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(DateTimePickerTagTest.class
- .getResource("DateTimePickerTagTest-1.txt"));
- }
-
- public void testSimpleDisabled() throws Exception {
- DateTimePickerTag tag = new DateTimePickerTag();
- tag.setPageContext(pageContext);
-
- tag.setId("id");
-
- tag.setAdjustWeeks("true");
- tag.setDayWidth("b");
- tag.setDisplayWeeks("true");
- tag.setEndDate("%{'2008-01-01'}");
- tag.setStartDate("%{'2008-02-02'}");
- tag.setStaticDisplay("false");
- tag.setWeekStartsOn("g");
- tag.setName("h");
- tag.setLanguage("i");
- tag.setTemplateCssPath("j");
- tag.setValueNotifyTopics("k");
- tag.setValue("%{'2008-03-03'}");
- tag.setDisabled("true");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(DateTimePickerTagTest.class
- .getResource("DateTimePickerTagTest-2.txt"));
- }
-
- public void testTodayValue() throws Exception {
- DateTimePickerTag tag = new DateTimePickerTag();
- tag.setPageContext(pageContext);
-
- tag.setValue("%{'today'}");
- assertDateValue("nameValue", tag, new Date(), true, false);
- }
-
- public void testDateParsing() throws Exception {
- DateTimePickerTag tag = new DateTimePickerTag();
- tag.setPageContext(pageContext);
-
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.YEAR, 2007);
- calendar.set(Calendar.MONTH, Calendar.JANUARY);
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- calendar.set(Calendar.HOUR_OF_DAY, 10);
- calendar.set(Calendar.MINUTE, 30);
- calendar.set(Calendar.SECOND, 10);
- calendar.set(Calendar.MILLISECOND, 20);
- calendar.set(Calendar.AM_PM, Calendar.AM);
- Date date = calendar.getTime();
-
- //test 'nameValue'
- stack.set("date", "01-01-2007");
- tag.setValue("%{date}");
- tag.setDisplayFormat("MM-dd-yyyy");
- assertDateValue("nameValue", tag, date, true, false);
- assertDateProperty("nameValue", tag, date);
-
- tag.setDisplayFormat(null);
-
- //test 'startDate'
- tag.setStartDate("%{date}");
- assertDateProperty("startDate", tag, date);
-
- //test 'endDate'
- tag.setEndDate("%{date}");
- assertDateProperty("endDate", tag, date);
-
- }
-
- private void assertDateProperty(String property, DateTimePickerTag tag, final Date date) throws Exception {
- final DateFormat shortTimeFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
- final DateFormat shortFormat = DateFormat.getDateInstance(DateFormat.SHORT);
- final DateFormat mediumFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);
- final DateFormat longFormat = DateFormat.getDateInstance(DateFormat.LONG);
- final DateFormat fullFormat = DateFormat.getDateInstance(DateFormat.FULL);
- //try a Date value
- stack.set("date", date);
- assertDateValue(property, tag, date, true, false);
-
- //try a Calendar value
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- stack.set("date", calendar);
- assertDateValue(property, tag, date, true, false);
-
- //try an object whose to string returns a parseable date
- stack.set("date", new Object() {
-
- @Override
- public String toString() {
- return fullFormat.format(date);
- }
-
- });
- assertDateValue(property, tag, date, true, false);
-
- // try short format
- stack.set("date", shortFormat.format(date));
- assertDateValue(property, tag, date, true, false);
-
- //try medium format
- stack.set("date", mediumFormat.format(date));
- assertDateValue(property, tag, date, true, false);
-
- //try long format
- stack.set("date", longFormat.format(date));
- assertDateValue(property, tag, date, true, false);
-
- //try full format
- stack.set("date", fullFormat.format(date));
- assertDateValue(property, tag, date, true, false);
-
- //try RFC 3339 format
- stack.set("date", RFC3339_FORMAT.format(date));
- assertDateValue(property, tag, date, true, false);
-
- //try short time format
- stack.set("date", shortTimeFormat.format(date));
- assertDateValue(property, tag, date, false, true);
- }
-
- private void assertDateValue(String property, DateTimePickerTag tag, Date toCompareDate,
- boolean compareDate, boolean compareTime) throws Exception {
- tag.doStartTag();
- DateTimePicker picker = (DateTimePicker) tag.getComponent();
- picker.evaluateParams();
-
- String dateStr = (String) tag.getComponent().getParameters()
- .get(property);
- Date date = RFC3339_FORMAT.parse(dateStr);
- assertNotNull(date);
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
-
- Calendar toCompareCalendar = Calendar.getInstance();
- toCompareCalendar.setTime(toCompareDate);
-
- if (compareDate) {
- assertEquals(toCompareCalendar.get(Calendar.YEAR), calendar
- .get(Calendar.YEAR));
- assertEquals(toCompareCalendar.get(Calendar.MONTH), calendar
- .get(Calendar.MONTH));
- assertEquals(toCompareCalendar.get(Calendar.DAY_OF_MONTH), calendar
- .get(Calendar.DAY_OF_MONTH));
- }
- if (compareTime) {
- assertEquals(toCompareCalendar.get(Calendar.HOUR_OF_DAY), calendar
- .get(Calendar.HOUR_OF_DAY));
- assertEquals(toCompareCalendar.get(Calendar.MINUTE), calendar
- .get(Calendar.MINUTE));
- assertEquals(toCompareCalendar.get(Calendar.AM_PM), calendar
- .get(Calendar.AM_PM));
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
deleted file mode 100644
index 58a9230..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import org.apache.struts2.dojo.TestAction;
-import org.apache.struts2.dojo.components.Head;
-
-
-/**
- */
-public class DivTest extends AbstractUITagTest {
-
- public void testSimple() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- DivTag tag = new DivTag();
- tag.setPageContext(pageContext);
-
- tag.setId("mylabel");
- tag.setHref("a");
- tag.setLoadingText("b");
- tag.setErrorText("c");
- tag.setAutoStart("true");
- tag.setDelay("4000");
- tag.setUpdateFreq("1000");
- tag.setListenTopics("g");
- tag.setStartTimerListenTopics("h");
- tag.setStopTimerListenTopics("i");
- tag.setBeforeNotifyTopics("j");
- tag.setAfterNotifyTopics("k");
- tag.setRefreshOnShow("true");
- tag.setHandler("l");
- tag.setIndicator("m");
- tag.setShowLoadingText("true");
- tag.setSeparateScripts("false");
- tag.setErrorNotifyTopics("n");
- tag.setClosable("true");
- tag.setHighlightColor("o");
- tag.setHighlightDuration("p");
- tag.setTransport("q");
- tag.setParseContent("false");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(DivTest.class.getResource("div-1.txt"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java
deleted file mode 100644
index f859c45..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-
-/**
- * Unit test for {@link HeadTag}.
- * <p/>
- * Note: If unit test fails with encoding difference check the src/test/struts.properties
- * and adjust the .txt files accordingly
- *
- */
-public class HeadTagTest extends AbstractUITagTest {
-
- public void testHead1() throws Exception {
- HeadTag tag = new HeadTag();
- tag.setPageContext(pageContext);
-
- tag.setDebug("true");
- tag.setCompressed("false");
- tag.setExtraLocales("a,b,c");
- tag.setBaseRelativePath("/path");
- tag.setLocale("es");
- tag.setCache("true");
- tag.setParseContent("true");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-1.txt"));
- }
-
- public void testHead2() throws Exception {
- HeadTag tag = new HeadTag();
- tag.setPageContext(pageContext);
-
- tag.setDebug("false");
- tag.setCompressed("true");
- tag.setExtraLocales("a,b,c");
- tag.setLocale("es");
- tag.setCache("false");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-2.txt"));
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
deleted file mode 100644
index 5c29ee2..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpSession;
-
-import junit.framework.AssertionFailedError;
-
-import com.mockobjects.servlet.MockHttpServletRequest;
-
-
-/**
- * StrutsMockHttpServletRequest
- *
- */
-public class StrutsMockHttpServletRequest extends MockHttpServletRequest {
-
- Locale locale = Locale.US;
- private Map attributes = new HashMap();
- private Map parameterMap = new HashMap();
- private String context = "";
- private String pathInfo = "";
- private String queryString;
- private String requestURI;
- private String scheme;
- private String serverName;
- private int serverPort;
- private String encoding;
- private String requestDispatherString;
-
-
- public void setAttribute(String s, Object o) {
- attributes.put(s, o);
- }
-
- public Object getAttribute(String s) {
- return attributes.get(s);
- }
-
- public Enumeration getAttributeNames() {
- Vector v = new Vector();
- v.addAll(attributes.keySet());
-
- return v.elements();
- }
-
- public String getContextPath() {
- return this.context;
- }
-
- public void setLocale(Locale locale) {
- this.locale = locale;
- }
-
- public Locale getLocale() {
- return locale;
- }
-
- public void setCharacterEncoding(String s) {
- this.encoding = s;
- }
-
- public String getCharacterEncoding() {
- return encoding;
- }
-
- public void setParameterMap(Map parameterMap) {
- this.parameterMap = parameterMap;
- }
-
- public Map getParameterMap() {
- return parameterMap;
- }
-
- public String getParameter(String string) {
- return (String) parameterMap.get(string);
- }
-
- public Enumeration getParameterNames() {
- return Collections.enumeration(parameterMap.keySet());
- }
-
- public String[] getParameterValues(String string) {
- return (String[]) parameterMap.get(string);
- }
-
- public String getPathInfo() {
- return pathInfo;
- }
-
- public void setQueryString(String queryString) {
- this.queryString = queryString;
- }
-
- public String getQueryString() {
- return queryString;
- }
-
- public RequestDispatcher getRequestDispatcher(String string) {
- this.requestDispatherString = string;
- return super.getRequestDispatcher(string);
- }
-
- /**
- * Get's the source string that was used in the last getRequestDispatcher method call.
- */
- public String getRequestDispatherString() {
- return requestDispatherString;
- }
-
- public void setRequestURI(String requestURI) {
- this.requestURI = requestURI;
- }
-
- public String getRequestURI() {
- return requestURI;
- }
-
- public void setScheme(String scheme) {
- this.scheme = scheme;
- }
-
- public String getScheme() {
- return scheme;
- }
-
- public void setServerName(String serverName) {
- this.serverName = serverName;
- }
-
- public String getServerName() {
- return serverName;
- }
-
- public void setServerPort(int serverPort) {
- this.serverPort = serverPort;
- }
-
- public int getServerPort() {
- return serverPort;
- }
-
- public HttpSession getSession() {
- HttpSession session = null;
-
- try {
- session = super.getSession();
- } catch (AssertionFailedError e) {
- //ignore
- }
-
- if (session == null) {
- session = new StrutsMockHttpSession();
- setSession(session);
- }
-
- return session;
- }
-
- public void setupGetContext(String context) {
- this.context = context;
- }
-
- public void setupGetPathInfo(String pathInfo) {
- this.pathInfo = pathInfo;
- }
-
- public int getRemotePort() {
- return 0;
- }
-
- public String getLocalName() {
- return null;
- }
-
- public String getLocalAddr() {
- return null;
- }
-
- public int getLocalPort() {
- return 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
deleted file mode 100644
index 6a1828d..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Locale;
-
-import com.mockobjects.servlet.MockHttpServletResponse;
-
-
-/**
- * StrutsMockHttpServletResponse
- *
- */
-public class StrutsMockHttpServletResponse extends MockHttpServletResponse {
- private Locale locale;
- private PrintWriter writer;
- private int status;
- private String redirectURL;
-
- public Locale getLocale() {
- return locale;
- }
-
- public void setLocale(Locale locale) {
- this.locale = locale;
- }
-
- public String getContentType() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public PrintWriter getWriter() throws IOException {
- if (writer == null)
- return new PrintWriter(new ByteArrayOutputStream());
- else
- return writer;
- }
-
- public void setCharacterEncoding(String string) {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setWriter(PrintWriter writer) {
- this.writer = writer;
- }
-
- public String encodeURL(String s) {
- return s;
- }
-
- public String encodeRedirectURL(String s) {
- return s;
- }
-
- public String encodeUrl(String s) {
- return s;
- }
-
- public void setStatus(int i) {
- this.status = i;
- super.setStatus(i);
- }
-
- public int getStatus() {
- return status;
- }
-
-
- public String getRedirectURL() {
- return redirectURL;
- }
-
- public void sendRedirect(String redirectURL) throws IOException {
- this.redirectURL = redirectURL;
- super.sendRedirect(redirectURL);
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
deleted file mode 100644
index dfb868f..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import com.mockobjects.servlet.MockHttpSession;
-
-
-/**
- * StrutsMockHttpSession
- *
- */
-public class StrutsMockHttpSession extends MockHttpSession {
-
- Hashtable attributes = new Hashtable();
-
-
- public void setAttribute(String s, Object o) {
- attributes.put(s, o);
- }
-
- public Object getAttribute(String s) {
- return attributes.get(s);
- }
-
- public Enumeration getAttributeNames() {
- return attributes.keys();
- }
-
- public void setExpectedAttribute(String s, Object o) {
- throw new UnsupportedOperationException();
- }
-
- public void setExpectedRemoveAttribute(String s) {
- throw new UnsupportedOperationException();
- }
-
- public void removeAttribute(String s) {
- attributes.remove(s);
- }
-
- public void setupGetAttribute(String s, Object o) {
- throw new UnsupportedOperationException();
- }
-
- public void setupGetAttributeNames(Enumeration enumeration) {
- throw new UnsupportedOperationException();
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
deleted file mode 100644
index 75d4226..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import javax.servlet.jsp.JspWriter;
-
-
-/**
- * Unforunately, the MockJspWriter throws a NotImplementedException when any of the Writer methods are invoked and
- * as you might guess, Velocity uses the Writer methods. I'velocityEngine subclassed the MockJspWriter for the time being so
- * that we can do testing on the results until MockJspWriter gets fully implemented.
- * <p/>
- * todo replace this once MockJspWriter implements Writer correctly (i.e. doesn't throw NotImplementException)
- */
-public class StrutsMockJspWriter extends JspWriter {
- StringWriter writer;
-
- public StrutsMockJspWriter(StringWriter writer) {
- super(1024, true);
- this.writer = writer;
- }
-
- public void newLine() throws IOException {
- writer.write("\n");
- }
-
- public void print(boolean b) throws IOException {
- writer.write(String.valueOf(b));
- }
-
- public void print(char c) throws IOException {
- writer.write(String.valueOf(c));
- }
-
- public void print(int i) throws IOException {
- writer.write(i);
- }
-
- public void print(long l) throws IOException {
- writer.write(String.valueOf(l));
- }
-
- public void print(float v) throws IOException {
- writer.write(String.valueOf(v));
- }
-
- public void print(double v) throws IOException {
- writer.write(String.valueOf(v));
- }
-
- public void print(char[] chars) throws IOException {
- writer.write(chars);
- }
-
- public void print(String s) throws IOException {
- writer.write(s);
- }
-
- public void print(Object o) throws IOException {
- writer.write(o.toString());
- }
-
- public void println() throws IOException {
- writer.write("\n");
- }
-
- public void println(boolean b) throws IOException {
- print(b);
- println();
- }
-
- public void println(char c) throws IOException {
- print(c);
- println();
- }
-
- public void println(int i) throws IOException {
- print(i);
- println();
- }
-
- public void println(long l) throws IOException {
- print(l);
- println();
- }
-
- public void println(float v) throws IOException {
- print(v);
- println();
- }
-
- public void println(double v) throws IOException {
- print(v);
- println();
- }
-
- public void println(char[] chars) throws IOException {
- print(chars);
- println();
- }
-
- public void println(String s) throws IOException {
- print(s);
- println();
- }
-
- public void println(Object o) throws IOException {
- print(o);
- println();
- }
-
- public void clear() throws IOException {
- }
-
- public void clearBuffer() throws IOException {
- }
-
- public void close() throws IOException {
- writer.close();
- }
-
- public int getRemaining() {
- return 0;
- }
-
- public void write(char cbuf[], int off, int len) throws IOException {
- writer.write(cbuf, off, len);
- }
-
- public void write(String str) throws IOException {
- writer.write(str);
- }
-
- public void write(int c) throws IOException {
- writer.write(c);
- }
-
- public void write(char[] cbuf) throws IOException {
- writer.write(cbuf);
- }
-
- public void write(String str, int off, int len) throws IOException {
- writer.write(str, off, len);
- }
-
- public void flush() {
- writer.flush();
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
deleted file mode 100644
index c73a3f1..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import com.mockobjects.servlet.MockPageContext;
-
-
-/**
- */
-public class StrutsMockPageContext extends MockPageContext {
-
- private Map attributes = new HashMap();
- private ServletResponse response;
-
-
- public void setAttribute(String s, Object o) {
- if ((s == null) || (o == null)) {
- throw new NullPointerException("PageContext does not accept null attributes");
- }
-
- this.attributes.put(s, o);
- }
-
- public Object getAttribute(String key) {
- return attributes.get(key);
- }
-
- public Object getAttributes(String key) {
- return this.attributes.get(key);
- }
-
- public void setResponse(ServletResponse response) {
- this.response = response;
- }
-
- public ServletResponse getResponse() {
- return response;
- }
-
- public HttpSession getSession() {
- HttpSession session = super.getSession();
-
- if (session == null) {
- session = ((HttpServletRequest) getRequest()).getSession(true);
- }
-
- return session;
- }
-
- public Object findAttribute(String s) {
- return attributes.get(s);
- }
-
- public void removeAttribute(String key) {
- this.attributes.remove(key);
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
deleted file mode 100644
index 981179a..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-
-/**
- * StrutsMockServletContext
- *
- */
-public class StrutsMockServletContext implements ServletContext {
-
- String realPath;
- String servletInfo;
- Map initParams = new HashMap();
- Map attributes = new HashMap();
- InputStream resourceAsStream;
-
- public void setInitParameter(String name, String value) {
- initParams.put(name, value);
- }
-
- public void setRealPath(String value) {
- realPath = value;
- }
-
- public String getRealPath(String string) {
- return realPath;
- }
-
- public ServletContext getContext(String s) {
- return null;
- }
-
- public int getMajorVersion() {
- return 0;
- }
-
- public int getMinorVersion() {
- return 0;
- }
-
- public String getMimeType(String s) {
- return null;
- }
-
- public Set getResourcePaths(String s) {
- return null;
- }
-
- public URL getResource(String s) throws MalformedURLException {
- return null;
- }
-
- public InputStream getResourceAsStream(String s) {
- if (resourceAsStream != null) {
- return resourceAsStream;
- }
- return null;
- }
-
- public void setResourceAsStream(InputStream is) {
- this.resourceAsStream = is;
- }
-
- public RequestDispatcher getRequestDispatcher(String s) {
- return null;
- }
-
- public RequestDispatcher getNamedDispatcher(String s) {
- return null;
- }
-
- public Servlet getServlet(String s) throws ServletException {
- return null;
- }
-
- public Enumeration getServlets() {
- return null;
- }
-
- public Enumeration getServletNames() {
- return null;
- }
-
- public void log(String s) {
- }
-
- public void log(Exception e, String s) {
- }
-
- public void log(String s, Throwable throwable) {
- }
-
- public String getServerInfo() {
- return servletInfo;
- }
-
- public String getInitParameter(String s) {
- return (String) initParams.get(s);
- }
-
- public Enumeration getInitParameterNames() {
- return Collections.enumeration(initParams.keySet());
- }
-
- public Object getAttribute(String s) {
- return attributes.get(s);
- }
-
- public Enumeration getAttributeNames() {
- return Collections.enumeration(attributes.keySet());
- }
-
- public void setAttribute(String s, Object o) {
- attributes.put(s, o);
- }
-
- public void removeAttribute(String s) {
- attributes.remove(s);
- }
-
- public String getServletContextName() {
- return null;
- }
-
- public void setServletInfo(String servletInfo) {
- this.servletInfo = servletInfo;
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
deleted file mode 100644
index c677520..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-import org.apache.struts2.dojo.TestAction;
-
-/**
- * Test Submit component in "ajax" theme.
- */
-public class SubmitAjaxTest extends AbstractUITagTest {
- public void testSubmit() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- SubmitTag tag = new SubmitTag();
- tag.setPageContext(pageContext);
-
- tag.setId("a");
- tag.setHref("b");
- tag.setDisabled("true");
- tag.setLoadingText("c");
- tag.setErrorText("d");
- tag.setListenTopics("e");
- tag.setBeforeNotifyTopics("f");
- tag.setAfterNotifyTopics("g");
- tag.setHandler("h");
- tag.setType("submit");
- tag.setLabel("i");
- tag.setNotifyTopics("k");
- tag.setIndicator("l");
- tag.setShowLoadingText("true");
- tag.setErrorNotifyTopics("m");
- tag.setHighlightColor("n");
- tag.setHighlightDuration("o");
- tag.setValidate("true");
- tag.setAjaxAfterValidation("true");
- tag.setSeparateScripts("true");
- tag.setTabindex("1");
- tag.setTransport("p");
- tag.setParseContent("false");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SubmitAjaxTest.class.getResource("submit-ajax-1.txt"));
- }
-
- public void testButton() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- SubmitTag tag = new SubmitTag();
- tag.setPageContext(pageContext);
-
- tag.setId("a");
- tag.setDisabled("true");
- tag.setTheme("ajax");
- tag.setHref("b");
- tag.setLoadingText("c");
- tag.setErrorText("d");
- tag.setListenTopics("e");
- tag.setBeforeNotifyTopics("f");
- tag.setAfterNotifyTopics("g");
- tag.setHandler("h");
- tag.setType("button");
- tag.setLabel("i");
- tag.setNotifyTopics("k");
- tag.setIndicator("l");
- tag.setErrorNotifyTopics("m");
- tag.setValidate("true");
- tag.setSeparateScripts("true");
- tag.setTabindex("1");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SubmitAjaxTest.class.getResource("submit-ajax-2.txt"));
- }
-
- public void testImage() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setFoo("bar");
-
- SubmitTag tag = new SubmitTag();
- tag.setPageContext(pageContext);
-
- tag.setId("a");
- tag.setDisabled("true");
- tag.setTheme("ajax");
- tag.setHref("b");
- tag.setLoadingText("c");
- tag.setErrorText("d");
- tag.setListenTopics("e");
- tag.setBeforeNotifyTopics("f");
- tag.setAfterNotifyTopics("g");
- tag.setHandler("h");
- tag.setType("image");
- tag.setLabel("i");
- tag.setSrc("j");
- tag.setNotifyTopics("k");
- tag.setIndicator("l");
- tag.setErrorNotifyTopics("m");
- tag.setValidate("true");
- tag.setSeparateScripts("true");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SubmitAjaxTest.class.getResource("submit-ajax-3.txt"));
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java
deleted file mode 100644
index 049f56a..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-/**
- * TabbedPanelTagTest.
- */
-public class TabbedPanelTagTest extends AbstractUITagTest {
-
- public void testSimple() throws Exception {
- TabbedPanelTag tag = new TabbedPanelTag();
- tag.setPageContext(pageContext);
- tag.setId("a");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(TabbedPanelTag.class.getResource("TabbedPanel-1.txt"));
-
- }
-
- public void testCookieCodeAvailable() throws Exception {
- TabbedPanelTag tag = new TabbedPanelTag();
- tag.setPageContext(pageContext);
- tag.setId("foo");
- tag.setUseSelectedTabCookie("true");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(TabbedPanelTag.class.getResource("TabbedPanel-2.txt"));
-
- }
-
- public void testCookieCodeAvailableWithOverriddenSelectedTab() throws Exception {
- TabbedPanelTag tag = new TabbedPanelTag();
- tag.setPageContext(pageContext);
- tag.setId("foo");
- tag.setUseSelectedTabCookie("true");
- tag.setSelectedTab("bar");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(TabbedPanelTag.class.getResource("TabbedPanel-3.txt"));
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
deleted file mode 100644
index bec196f..0000000
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * $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.
- */
-
-package org.apache.struts2.dojo.views.jsp.ui;
-
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * Test case for Tree component.
- */
-public class TreeTest extends AbstractUITagTest{
-
- public void testStaticTree() throws Exception {
- // Root
- TreeTag tag = new TreeTag();
- tag.setShowRootGrid("false");
- tag.setShowGrid("false");
- tag.setTemplateCssPath("/struts/tree.css");
- tag.setPageContext(pageContext);
- tag.setId("rootId");
- tag.setLabel("Root");
- tag.doStartTag();
-
- // Child 1
- TreeNodeTag nodeTag1 = new TreeNodeTag();
- nodeTag1.setTheme("ajax");
- nodeTag1.setPageContext(pageContext);
- nodeTag1.setId("child1");
- nodeTag1.setLabel("Child 1");
- nodeTag1.doStartTag();
- nodeTag1.doEndTag();
-
- // Child 2
- TreeNodeTag nodeTag2 = new TreeNodeTag();
- nodeTag2.setTheme("ajax");
- nodeTag2.setPageContext(pageContext);
- nodeTag2.setId("child2");
- nodeTag2.setLabel("Child 2");
- nodeTag2.doStartTag();
-
- // Grand Child 1
- TreeNodeTag gNodeTag1 = new TreeNodeTag();
- gNodeTag1.setTheme("ajax");
- gNodeTag1.setPageContext(pageContext);
- gNodeTag1.setId("gChild1");
- gNodeTag1.setLabel("Grand Child 1");
- gNodeTag1.doStartTag();
- gNodeTag1.doEndTag();
-
- // Grand Child 2
- TreeNodeTag gNodeTag2 = new TreeNodeTag();
- gNodeTag2.setTheme("ajax");
- gNodeTag2.setPageContext(pageContext);
- gNodeTag2.setId("gChild2");
- gNodeTag2.setLabel("Grand Child 2");
- gNodeTag2.doStartTag();
- gNodeTag2.doEndTag();
-
- // Grand Child 3
- TreeNodeTag gNodeTag3= new TreeNodeTag();
- gNodeTag3.setTheme("ajax");
- gNodeTag3.setPageContext(pageContext);
- gNodeTag3.setId("gChild3");
- gNodeTag3.setLabel("Grand Child 3");
- gNodeTag3.doStartTag();
- gNodeTag3.doEndTag();
-
- nodeTag2.doEndTag();
-
-
- // Child 3
- TreeNodeTag nodeTag3 = new TreeNodeTag();
- nodeTag3.setTheme("ajax");
- nodeTag3.setPageContext(pageContext);
- nodeTag3.setId("child3");
- nodeTag3.setLabel("Child 4");
- nodeTag3.doStartTag();
- nodeTag3.doEndTag();
-
- tag.doEndTag();
-
- //System.out.println(writer.toString());
- verify(TreeTest.class.getResource("tree-1.txt"));
- }
-
-
-
- public void testDynamicTree() throws Exception {
-
- TreeTag tag = new TreeTag();
- tag.setPageContext(pageContext);
- tag.setTheme("ajax");
- tag.setId("myTree");
- tag.setRootNode("%{myTreeRoot}");
- tag.setNodeIdProperty("id");
- tag.setNodeTitleProperty("name");
- tag.setChildCollectionProperty("children");
- tag.doStartTag();
- tag.doEndTag();
-
- //System.out.println(writer.toString());
- verify(TreeTest.class.getResource("tree-2.txt"));
- }
-
-
- public Action getAction() {
- return new InternalActionSupport();
- }
-
- public static class InternalActionSupport extends ActionSupport {
- public Category getMyTreeRoot() {
- return Category.getById(1);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
deleted file mode 100644
index 5b41fa5..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-<input
- dojoType="struts:ComboBox"
- dataUrl="a"
- id="f"
- forceValidOption="false"
- searchType="B"
- autoComplete="true"
- searchDelay="100"
- dropdownWidth="10"
- dropdownHeight="10"
- name="f"
- keyName="i"
- initialValue="g"
- initialKey="key"
- valueNotifyTopics="l"
- indicator="h"
- loadOnType="true"
- loadMinimum="3"
- visibleDownArrow="false"
- buttonSrc="i"
- templateCssPath="j"
- dataFieldName="k"
- searchLimit="2"
- transport="m"
- preload="true"
-/>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("f");</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
deleted file mode 100644
index 0a36e53..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-<select
- dojoType="struts:ComboBox"
- id="f"
- forceValidOption="false"
- searchType="B"
- autoComplete="true"
- searchDelay="100"
- dropdownWidth="10"
- dropdownHeight="10"
- name="f"
- keyName="fKey"
- valueNotifyTopics="k"
- visibleDownArrow="true"
- buttonSrc="i"
- templateCssPath="j"
- searchLimit="2"
- >
- <option value="d">d</option>
- <option value="e">e</option>
-</select>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("f");</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
deleted file mode 100644
index 0d5e706..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-<script language="JavaScript" type="text/javascript">
- dojo.addOnLoad(function() {
- dojo.widget.createWidget("struts:BindEvent", {
- "sources":"n",
- "events":"o",
- "id":"a",
- "href":"b",
- "loadingText":"c",
- "errorText":"d",
- "listenTopics":"e",
- "notifyTopics":"k",
- "beforeNotifyTopics":"f",
- "afterNotifyTopics":"g",
- "errorNotifyTopics":"m",
- "indicator":"l",
- "showError":true,
- "showLoading":true,
- "handler":"h",
- "highlightColor":"p",
- "highlightDuration":q,
- "validate": true,
- "ajaxAfterValidation":false,
- "scriptSeparation": true,
- "transport": "q",
- "parseContent" : false
- });
- });
-</script>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
deleted file mode 100644
index be939ae..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-1.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-<div dojoType="struts:StrutsDatePicker"
- id="id"
- value="2008-03-03"
- lang="i"
- name="h"
- inputName="dojo.h"
- displayWeeks="true"
- adjustWeeks="true"
- startDate="2008-02-02"
- endDate="2008-01-01"
- weekStartsOn="g"
- staticDisplay="false"
- templateCssPath="j"
- valueNotifyTopics="k"
- saveFormat="rfc">
-</div>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("id");</script>
-
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
deleted file mode 100644
index 6a11cd2..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-<div dojoType="struts:StrutsDatePicker"
- id="id"
- value="2008-03-03"
- lang="i"
- name="h"
- inputName="dojo.h"
- displayWeeks="true"
- adjustWeeks="true"
- startDate="2008-02-02"
- endDate="2008-01-01"
- weekStartsOn="g"
- staticDisplay="false"
- templateCssPath="j"
- valueNotifyTopics="k"
- disabled="disabled"
- saveFormat="rfc">
-</div>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("id");</script>
-
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
deleted file mode 100644
index 6c58d31..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<script language="JavaScript" type="text/javascript">
- // Dojo configuration
- djConfig={
- isDebug: true,
- bindEncoding: "ISO-8859-1",
- baseRelativePath: "/path",
- baseScriptUri: "/path",
- locale: "es",
- extraLocale: [
- "a",
- "b",
- "c"
- ],
- parseWidgets: true
- };
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/path/struts_dojo.js.uncompressed.js">
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
-</script>
-
-<script language="JavaScript" type="text/javascript">
- dojo.hostenv.writeIncludes(true);
-</script>
-
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
-
-<script language="JavaScript" src="/struts/utils.js" type="text/javascript">
-</script>
-
-<script language="JavaScript" src="/struts/xhtml/validation.js" type="text/javascript">
-</script>
-
-<script language="JavaScript"src="/struts/css_xhtml/validation.js" type="text/javascript">
-</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
deleted file mode 100644
index b908b29..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-2.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-<script language="JavaScript" type="text/javascript">
- // Dojo configuration
- djConfig={
- isDebug: false,
- bindEncoding: "ISO-8859-1",
- baseRelativePath: "/struts/dojo/",
- baseScriptUri: "/struts/dojo/",
- locale: "es",
- extraLocale: [
- "a",
- "b",
- "c"
- ],
- parseWidgets: false
- };
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/struts/dojo/dojo.js">
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
-</script>
-
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
-
-<script language="JavaScript" src="/struts/utils.js" type="text/javascript">
-</script>
-
-<script language="JavaScript" src="/struts/xhtml/validation.js" type="text/javascript">
-</script>
-
-<script language="JavaScript"src="/struts/css_xhtml/validation.js" type="text/javascript">
-</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt
deleted file mode 100644
index c7f345b..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<linkrel="stylesheet" href="/struts/TabbedPanel.css" type="text/css"/>
-<div
- dojoType="struts:StrutsTabContainer"
- id="a"
- doLayout="false">
-</div>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt
deleted file mode 100644
index e08d392..0000000
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/TabbedPanel-2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-<linkrel="stylesheet" href="/struts/TabbedPanel.css" type="text/css"/>
-<script type="text/javascript">
-dojo.require("dojo.io.cookie");
-dojo.addOnLoad(function(){
- var tabContainer=dojo.widget.byId("foo");
- var selectedTab=dojo.io.cookie.getCookie("Struts2TabbedPanel_selectedTab_foo");
- if( selectedTab ){
- tabContainer.selectChild(selectedTab,tabContainer.correspondingPageButton);
- }
- dojo.event.connect(tabContainer,"selectChild",function(evt){
- dojo.io.cookie.setCookie("Struts2TabbedPanel_selectedTab_foo",evt.widgetId,1,null,null,null);
- }
- )
-});
-</script>
-<div dojoType="struts:StrutsTabContainer" id="foo" doLayout="false">
-</div>
-<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("foo");</script>
\ No newline at end of file