You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 16:02:22 UTC
svn commit: r471756 [29/31] - in /struts/struts2/trunk: apps/blank/
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/mailreader/src/main/java/mailreader2/
apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portl...
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -29,23 +32,23 @@
/**
*/
public class SelectTest extends AbstractUITagTest {
-
-
- public void testHeaderCanBePreselected() throws Exception {
- SelectTag tag = new SelectTag();
- tag.setPageContext(pageContext);
- tag.setLabel("myLabel");
- tag.setList("#{1:'Cat',2:'Dog'}");
- tag.setName("myPet");
- tag.setHeaderKey("-1");
- tag.setHeaderValue("--- Please Select ---");
- tag.setValue("%{'-1'}");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SelectTag.class.getResource("Select-8.txt"));
- }
+
+
+ public void testHeaderCanBePreselected() throws Exception {
+ SelectTag tag = new SelectTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("myLabel");
+ tag.setList("#{1:'Cat',2:'Dog'}");
+ tag.setName("myPet");
+ tag.setHeaderKey("-1");
+ tag.setHeaderValue("--- Please Select ---");
+ tag.setValue("%{'-1'}");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-8.txt"));
+ }
/**
* Tests WW-455: Select tag template does not work properly for Object like BigDecimal.
@@ -106,44 +109,44 @@
return bigDecimal;
}
}
-
+
public void testNullList() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setList2(null);
-
- SelectTag tag = new SelectTag();
- tag.setName("collection");
- tag.setList("list2");
- tag.setLabel("tmjee_name");
-
- tag.setPageContext(pageContext);
- try {
- tag.doStartTag();
- tag.doEndTag();
- fail("exception should have been thrown value of select tag is null");
- }
- catch(Exception e) {
- assertTrue(true);
- }
+ TestAction testAction = (TestAction) action;
+ testAction.setList2(null);
+
+ SelectTag tag = new SelectTag();
+ tag.setName("collection");
+ tag.setList("list2");
+ tag.setLabel("tmjee_name");
+
+ tag.setPageContext(pageContext);
+ try {
+ tag.doStartTag();
+ tag.doEndTag();
+ fail("exception should have been thrown value of select tag is null");
+ }
+ catch(Exception e) {
+ assertTrue(true);
+ }
}
-
+
public void testEmptyList() throws Exception {
- TestAction testAction = (TestAction) action;
- testAction.setList2(new ArrayList());
-
- SelectTag tag = new SelectTag();
- tag.setName("collection");
- tag.setList("list2");
- tag.setLabel("tmjee_name");
-
- tag.setPageContext(pageContext);
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SelectTag.class.getResource("Select-4.txt"));
+ TestAction testAction = (TestAction) action;
+ testAction.setList2(new ArrayList());
+
+ SelectTag tag = new SelectTag();
+ tag.setName("collection");
+ tag.setList("list2");
+ tag.setLabel("tmjee_name");
+
+ tag.setPageContext(pageContext);
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-4.txt"));
}
-
+
public void testMultiple() throws Exception {
TestAction testAction = (TestAction) action;
Collection collection = new ArrayList(2);
@@ -253,37 +256,37 @@
prepareTagGeneric(tag);
verifyGenericProperties(tag, "ajax", new String[]{"value"});
}
-
+
public void testMultipleOn() throws Exception {
- SelectTag tag = new SelectTag();
- tag.setPageContext(pageContext);
- tag.setLabel("media1");
- tag.setId("myId");
- tag.setEmptyOption("true");
- tag.setName("myName");
- tag.setMultiple("true");
- tag.setList("{'aaa','bbb'}");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SelectTag.class.getResource("Select-5.txt"));
+ SelectTag tag = new SelectTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("media1");
+ tag.setId("myId");
+ tag.setEmptyOption("true");
+ tag.setName("myName");
+ tag.setMultiple("true");
+ tag.setList("{'aaa','bbb'}");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-5.txt"));
}
-
+
public void testMultipleOff() throws Exception {
- SelectTag tag = new SelectTag();
- tag.setPageContext(pageContext);
- tag.setLabel("media2");
- tag.setId("myId");
- tag.setEmptyOption("true");
- tag.setName("myName");
- tag.setMultiple("false");
- tag.setList("{'aaa','bbb'}");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(SelectTag.class.getResource("Select-6.txt"));
+ SelectTag tag = new SelectTag();
+ tag.setPageContext(pageContext);
+ tag.setLabel("media2");
+ tag.setId("myId");
+ tag.setEmptyOption("true");
+ tag.setName("myName");
+ tag.setMultiple("false");
+ tag.setList("{'aaa','bbb'}");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(SelectTag.class.getResource("Select-6.txt"));
}
private void prepareTagGeneric(SelectTag tag) {
@@ -297,5 +300,5 @@
tag.setList("collection");
}
-
+
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -23,8 +26,8 @@
* Test Submit component in "ajax" theme.
*/
public class SubmitAjaxTest extends AbstractUITagTest {
-
- public void testSimple() throws Exception {
+
+ public void testSimple() throws Exception {
SubmitTag tag = new SubmitTag();
tag.setPageContext(pageContext);
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -25,5 +28,5 @@
*/
public class TestAction1 extends ActionSupport {
- private static final long serialVersionUID = 2545551979978561327L;
+ private static final long serialVersionUID = 2545551979978561327L;
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -78,7 +81,7 @@
formTag.setAction("testAction");
formTag.setTooltipConfig(
- "#{" +
+ "#{" +
"'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
"'tooltipDelay':'500', " +
"'jsTooltipEnabled':'true' "+
@@ -113,7 +116,7 @@
formTag.setAction("testAction");
formTag.setTooltipConfig(
- "#{" +
+ "#{" +
"'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
"'tooltipDelay':'500', " +
"'jsTooltipEnabled':'true' "+
@@ -128,7 +131,7 @@
tag.setTooltip("myTooltip");
tag.setTooltipConfig(
- "#{" +
+ "#{" +
"'tooltipIcon':'/struts/tooltip/myTooltip2.gif', " +
"'tooltipDelay':'5000' " +
"}"
@@ -158,7 +161,7 @@
formParamTag.setPageContext(pageContext);
formParamTag.setName("tooltipConfig");
formParamTag.setValue(
- "#{" +
+ "#{" +
"'tooltipIcon':'/struts/tooltip/myTooltip.gif', " +
"'tooltipDelay':'500', " +
"'jsTooltipEnabled':'true' "+
@@ -176,7 +179,7 @@
textFieldParamTag.setPageContext(pageContext);
textFieldParamTag.setName("tooltipConfig");
textFieldParamTag.setValue(
- "#{" +
+ "#{" +
"'tooltipIcon':'/struts/tooltip/myTooltip2.gif', " +
"'tooltipDelay':'5000' "+
"}"
@@ -242,7 +245,7 @@
textFieldParamTag.doEndTag();
tag.doEndTag();
formTag.doEndTag();
-
+
System.out.println(writer.toString());
verify(TooltipTest.class.getResource("tooltip-3.txt"));
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -26,108 +29,108 @@
* 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.setTheme("ajax");
- 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);
- }
- }
+
+ public void testStaticTree() throws Exception {
+ // Root
+ TreeTag tag = new TreeTag();
+ tag.setShowRootGrid("false");
+ tag.setShowGrid("false");
+ tag.setTemplateCssPath("/struts/tree.css");
+ tag.setTheme("ajax");
+ 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);
+ }
+ }
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
@@ -28,193 +31,193 @@
import com.opensymphony.xwork2.ActionSupport;
/**
- * Test case for UpDownSelectTag
- *
+ * Test case for UpDownSelectTag
+ *
*/
public class UpDownSelectTagTest extends AbstractUITagTest {
- public void testWithAllSelected() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("myAllSelectedMapIds");
- tag.setEmptyOption("true");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-1.txt"));
- }
-
- public void testWithPartialSelected() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("false");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-2.txt"));
- }
-
- public void testWithHeaderAndEmptyOption() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setHeaderKey("-1");
- tag.setHeaderValue("--- Please Order ---");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-3.txt"));
- }
-
- public void testWithHeaderOnly() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("false");
- tag.setHeaderKey("-1");
- tag.setHeaderValue("--- Please Order ---");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-4.txt"));
- }
-
- public void testWithEmptyOptionOnly() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-5.txt"));
- }
-
-
- public void testDisableSomeSelectAllButton() throws Exception {
-
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setAllowSelectAll("false");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-6.txt"));
- }
-
- public void testDisableMoveUpButton() throws Exception {
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setAllowMoveUp("false");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-7.txt"));
- }
-
- public void testDisableMoveDownButton() throws Exception {
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setAllowMoveDown("false");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-8.txt"));
- }
-
- public void testChangeSelectAllButtonText() throws Exception {
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setSelectAllLabel("Select All");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-9.txt"));
- }
-
- public void testChangeMoveUpButtonText() throws Exception {
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setMoveUpLabel("Move Up");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-10.txt"));
- }
-
- public void testChangeMoveDownButtonText() throws Exception {
- UpDownSelectTag tag = new UpDownSelectTag();
- tag.setPageContext(pageContext);
- tag.setId("myId");
- tag.setName("myName");
- tag.setList("myMap");
- tag.setValue("mySelectedMapIds");
- tag.setEmptyOption("true");
- tag.setMoveDownLabel("Move Down");
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(UpDownSelectTagTest.class.getResource("updownselecttag-11.txt"));
- }
-
+ public void testWithAllSelected() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("myAllSelectedMapIds");
+ tag.setEmptyOption("true");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-1.txt"));
+ }
+
+ public void testWithPartialSelected() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("false");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-2.txt"));
+ }
+
+ public void testWithHeaderAndEmptyOption() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setHeaderKey("-1");
+ tag.setHeaderValue("--- Please Order ---");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-3.txt"));
+ }
+
+ public void testWithHeaderOnly() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("false");
+ tag.setHeaderKey("-1");
+ tag.setHeaderValue("--- Please Order ---");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-4.txt"));
+ }
+
+ public void testWithEmptyOptionOnly() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-5.txt"));
+ }
+
+
+ public void testDisableSomeSelectAllButton() throws Exception {
+
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setAllowSelectAll("false");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-6.txt"));
+ }
+
+ public void testDisableMoveUpButton() throws Exception {
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setAllowMoveUp("false");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-7.txt"));
+ }
+
+ public void testDisableMoveDownButton() throws Exception {
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setAllowMoveDown("false");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-8.txt"));
+ }
+
+ public void testChangeSelectAllButtonText() throws Exception {
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setSelectAllLabel("Select All");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-9.txt"));
+ }
+
+ public void testChangeMoveUpButtonText() throws Exception {
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setMoveUpLabel("Move Up");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-10.txt"));
+ }
+
+ public void testChangeMoveDownButtonText() throws Exception {
+ UpDownSelectTag tag = new UpDownSelectTag();
+ tag.setPageContext(pageContext);
+ tag.setId("myId");
+ tag.setName("myName");
+ tag.setList("myMap");
+ tag.setValue("mySelectedMapIds");
+ tag.setEmptyOption("true");
+ tag.setMoveDownLabel("Move Down");
+
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(UpDownSelectTagTest.class.getResource("updownselecttag-11.txt"));
+ }
+
public void testGenericSimple() throws Exception {
UpDownSelectTag tag = new UpDownSelectTag();
prepareTagGeneric(tag);
@@ -238,35 +241,35 @@
}
-
- // ===============================
- public Action getAction() {
- return new ActionSupport() {
-
- public Map getMyMap() {
- Map _myMap = new LinkedHashMap();
- _myMap.put("england", "England");
- _myMap.put("america", "America");
- _myMap.put("australia", "Australia");
- _myMap.put("germany", "Germany");
- return _myMap;
- }
-
- public List getMySelectedMapIds() {
- List _mySelectedMapIds = new ArrayList();
- _mySelectedMapIds.add("america");
- _mySelectedMapIds.add("germany");
- return _mySelectedMapIds;
- }
-
- public List getMyAllSelectedMapIds() {
- List _mySelectedMapIds = new ArrayList();
- _mySelectedMapIds.add("england");
- _mySelectedMapIds.add("america");
- _mySelectedMapIds.add("australia");
- _mySelectedMapIds.add("germany");
- return _mySelectedMapIds;
- }
- };
- }
+
+ // ===============================
+ public Action getAction() {
+ return new ActionSupport() {
+
+ public Map getMyMap() {
+ Map _myMap = new LinkedHashMap();
+ _myMap.put("england", "England");
+ _myMap.put("america", "America");
+ _myMap.put("australia", "Australia");
+ _myMap.put("germany", "Germany");
+ return _myMap;
+ }
+
+ public List getMySelectedMapIds() {
+ List _mySelectedMapIds = new ArrayList();
+ _mySelectedMapIds.add("america");
+ _mySelectedMapIds.add("germany");
+ return _mySelectedMapIds;
+ }
+
+ public List getMyAllSelectedMapIds() {
+ List _mySelectedMapIds = new ArrayList();
+ _mySelectedMapIds.add("england");
+ _mySelectedMapIds.add("america");
+ _mySelectedMapIds.add("australia");
+ _mySelectedMapIds.add("germany");
+ return _mySelectedMapIds;
+ }
+ };
+ }
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jsp.ui;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.util;
@@ -27,105 +30,105 @@
/**
* Test case for ContextUtil
- *
+ *
*/
public class ContextUtilTest extends TestCase {
public void testAltSyntaxMethod1() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", "true");
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
-
+
public void testAltSyntaxMethod2() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", "false");
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
-
+
public void testAltSyntaxMethod3() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", "true");
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
-
+
public void testAltSyntaxMethod4() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", "false");
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
-
+
//========================================================
-
+
public void testAltSyntaxMethod5() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", Boolean.TRUE);
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod6() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", Boolean.FALSE);
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod7() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", Boolean.TRUE);
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
public void testAltSyntaxMethod8() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", Boolean.FALSE);
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "false");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "false");
assertFalse(ContextUtil.isUseAltSyntax(stack.getContext()));
}
-
+
// ==========================================
public void testAltSyntaxMethod9() throws Exception {
ValueStack stack = ValueStackFactory.getFactory().createValueStack();
stack.getContext().put("useAltSyntax", null);
-
+
Settings.reset();
Settings.set(StrutsConstants.STRUTS_TAG_ALTSYNTAX, "true");
-
+
assertEquals(Settings.get(StrutsConstants.STRUTS_TAG_ALTSYNTAX), "true");
assertTrue(ContextUtil.isUseAltSyntax(stack.getContext()));
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.util;
/**
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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.
+ * 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.views.util;
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.util;
@@ -34,61 +37,61 @@
/**
* Test case for UrlHelper.
- *
+ *
*/
public class UrlHelperTest extends StrutsTestCase {
-
-
-
- public void testForceAddSchemeHostAndPort() throws Exception {
- String expectedUrl = "http://localhost/contextPath/path1/path2/myAction.action";
-
- Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
- mockHttpServletRequest.expectAndReturn("getScheme", "http");
- mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
+
+
+
+ public void testForceAddSchemeHostAndPort() throws Exception {
+ String expectedUrl = "http://localhost/contextPath/path1/path2/myAction.action";
+
+ Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+ mockHttpServletRequest.expectAndReturn("getScheme", "http");
+ mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
mockHttpServletRequest.expectAndReturn("getContextPath", "/contextPath");
Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
mockHttpServletResponse.expectAndReturn("encodeURL", expectedUrl, expectedUrl);
-
- String result = UrlHelper.buildUrl("/path1/path2/myAction.action", (HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse)mockHttpServletResponse.proxy(), null, "http", true, true, true);
- assertEquals(expectedUrl, result);
- mockHttpServletRequest.verify();
- }
-
- public void testDoNotForceAddSchemeHostAndPort() throws Exception {
- String expectedUrl = "/contextPath/path1/path2/myAction.action";
-
- Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
- mockHttpServletRequest.expectAndReturn("getScheme", "http");
- mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
+
+ String result = UrlHelper.buildUrl("/path1/path2/myAction.action", (HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse)mockHttpServletResponse.proxy(), null, "http", true, true, true);
+ assertEquals(expectedUrl, result);
+ mockHttpServletRequest.verify();
+ }
+
+ public void testDoNotForceAddSchemeHostAndPort() throws Exception {
+ String expectedUrl = "/contextPath/path1/path2/myAction.action";
+
+ Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+ mockHttpServletRequest.expectAndReturn("getScheme", "http");
+ mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
mockHttpServletRequest.expectAndReturn("getContextPath", "/contextPath");
Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
mockHttpServletResponse.expectAndReturn("encodeURL", expectedUrl, expectedUrl);
-
- String result = UrlHelper.buildUrl("/path1/path2/myAction.action", (HttpServletRequest)mockHttpServletRequest.proxy(), (HttpServletResponse)mockHttpServletResponse.proxy(), null, "http", true, true, false);
-
- assertEquals(expectedUrl, result);
- }
-
-
- public void testBuildParametersStringWithUrlHavingSomeExistingParameters() throws Exception {
- String expectedUrl = "http://localhost:8080/myContext/myPage.jsp?initParam=initValue&param1=value1&param2=value2";
-
- Map parameters = new LinkedHashMap();
- parameters.put("param1", "value1");
- parameters.put("param2", "value2");
-
- StringBuffer url = new StringBuffer("http://localhost:8080/myContext/myPage.jsp?initParam=initValue");
-
- UrlHelper.buildParametersString(parameters, url);
-
- assertEquals(
- expectedUrl, url.toString());
- }
-
-
+
+ String result = UrlHelper.buildUrl("/path1/path2/myAction.action", (HttpServletRequest)mockHttpServletRequest.proxy(), (HttpServletResponse)mockHttpServletResponse.proxy(), null, "http", true, true, false);
+
+ assertEquals(expectedUrl, result);
+ }
+
+
+ public void testBuildParametersStringWithUrlHavingSomeExistingParameters() throws Exception {
+ String expectedUrl = "http://localhost:8080/myContext/myPage.jsp?initParam=initValue&param1=value1&param2=value2";
+
+ Map parameters = new LinkedHashMap();
+ parameters.put("param1", "value1");
+ parameters.put("param2", "value2");
+
+ StringBuffer url = new StringBuffer("http://localhost:8080/myContext/myPage.jsp?initParam=initValue");
+
+ UrlHelper.buildParametersString(parameters, url);
+
+ assertEquals(
+ expectedUrl, url.toString());
+ }
+
+
public void testBuildWithRootContext() {
String expectedUrl = "/MyAction.action";
@@ -274,56 +277,56 @@
String urlString = UrlHelper.buildUrl(actionName, (HttpServletRequest) mockHttpServletRequest.proxy(), (HttpServletResponse) mockHttpServletResponse.proxy(), params, "https", true, true);
assertEquals(expectedString, urlString);
}
-
-
+
+
public void testParseQuery() throws Exception {
- Map result = UrlHelper.parseQueryString("aaa=aaaval&bbb=bbbval&ccc=");
-
- assertEquals(result.get("aaa"), "aaaval");
- assertEquals(result.get("bbb"), "bbbval");
- assertEquals(result.get("ccc"), "");
+ Map result = UrlHelper.parseQueryString("aaa=aaaval&bbb=bbbval&ccc=");
+
+ assertEquals(result.get("aaa"), "aaaval");
+ assertEquals(result.get("bbb"), "bbbval");
+ assertEquals(result.get("ccc"), "");
}
-
+
public void testParseEmptyQuery() throws Exception {
- Map result = UrlHelper.parseQueryString("");
-
- assertNotNull(result);
- assertEquals(result.size(), 0);
+ Map result = UrlHelper.parseQueryString("");
+
+ assertNotNull(result);
+ assertEquals(result.size(), 0);
}
-
+
public void testParseNullQuery() throws Exception {
- Map result = UrlHelper.parseQueryString(null);
-
- assertNotNull(result);
- assertEquals(result.size(), 0);
+ Map result = UrlHelper.parseQueryString(null);
+
+ assertNotNull(result);
+ assertEquals(result.size(), 0);
}
-
-
+
+
public void testTranslateAndEncode() throws Exception {
- String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING);
- try {
- Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
- String result = UrlHelper.translateAndEncode("\u65b0\u805e");
- String expectedResult = "%E6%96%B0%E8%81%9E";
-
- assertEquals(result, expectedResult);
- }
- finally {
- Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding);
- }
+ String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING);
+ try {
+ Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
+ String result = UrlHelper.translateAndEncode("\u65b0\u805e");
+ String expectedResult = "%E6%96%B0%E8%81%9E";
+
+ assertEquals(result, expectedResult);
+ }
+ finally {
+ Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding);
+ }
}
-
+
public void testTranslateAndDecode() throws Exception {
- String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING);
- try {
- Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
- String result = UrlHelper.translateAndDecode("%E6%96%B0%E8%81%9E");
- String expectedResult = "\u65b0\u805e";
-
- assertEquals(result, expectedResult);
- }
- finally {
- Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding);
- }
+ String defaultI18nEncoding = Settings.get(StrutsConstants.STRUTS_I18N_ENCODING);
+ try {
+ Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, "UTF-8");
+ String result = UrlHelper.translateAndDecode("%E6%96%B0%E8%81%9E");
+ String expectedResult = "\u65b0\u805e";
+
+ assertEquals(result, expectedResult);
+ }
+ finally {
+ Settings.set(StrutsConstants.STRUTS_I18N_ENCODING, defaultI18nEncoding);
+ }
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.xslt;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.config_browser;
@@ -31,10 +34,10 @@
*
*/
public class ActionNamesAction extends ActionSupport {
-
- private static final long serialVersionUID = -5389385242431387840L;
-
- private Set actionNames;
+
+ private static final long serialVersionUID = -5389385242431387840L;
+
+ private Set actionNames;
private String namespace = "";
private Set namespaces;
private String extension;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.config_browser;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.config_browser;
@@ -31,10 +34,10 @@
*
*/
public class ListValidatorsAction extends ActionSupport {
-
- private static final long serialVersionUID = 1L;
-
- private String clazz;
+
+ private static final long serialVersionUID = 1L;
+
+ private String clazz;
private String context;
List validators = Collections.EMPTY_LIST;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.config_browser;
@@ -33,10 +36,10 @@
* ShowConfigAction
*/
public class ShowConfigAction extends ActionNamesAction {
-
- private static final long serialVersionUID = -1630527489407671652L;
- private static final PropertyDescriptor[] PDSAT = new PropertyDescriptor[0];
+ private static final long serialVersionUID = -1630527489407671652L;
+
+ private static final PropertyDescriptor[] PDSAT = new PropertyDescriptor[0];
private String namespace;
private String actionName;
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.config_browser;
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.views.jasperreports;