You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/11/04 21:16:23 UTC
svn commit: r832867 - in /tiles/sandbox/trunk/tiles3/tiles-api/src:
main/java/org/apache/tiles/ test/java/org/apache/tiles/
Author: apetrelli
Date: Wed Nov 4 20:16:23 2009
New Revision: 832867
URL: http://svn.apache.org/viewvc?rev=832867&view=rev
Log:
TILESSB-11
Added tests for ListAttribute, TilesException.
TILESSB-10
Modified ListAttribute copy constructor to deep copy attribute list.
Removed useless call to super() in TilesException.
Added:
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java (with props)
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java (with props)
Modified:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesException.java
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java?rev=832867&r1=832866&r2=832867&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java Wed Nov 4 20:16:23 2009
@@ -71,6 +71,18 @@
*/
public ListAttribute(ListAttribute toCopy) {
super(toCopy);
+ List<Attribute> attributesToCopy = toCopy.getValue();
+ if (attributesToCopy != null) {
+ List<Attribute> attributes = new ArrayList<Attribute>(attributesToCopy.size());
+ for (Attribute attribute : attributesToCopy) {
+ if (attribute != null) {
+ attributes.add(attribute.clone());
+ } else {
+ attributes.add(null);
+ }
+ }
+ setValue(attributes);
+ }
this.inherit = toCopy.inherit;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesException.java?rev=832867&r1=832866&r2=832867&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesException.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/TilesException.java Wed Nov 4 20:16:23 2009
@@ -32,7 +32,6 @@
* Constructor.
*/
public TilesException() {
- super();
}
/**
Added: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java?rev=832867&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java Wed Nov 4 20:16:23 2009
@@ -0,0 +1,187 @@
+/*
+ * $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.tiles;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Tests {@link ListAttribute}.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ListAttributeTest {
+
+ /**
+ * The list size.
+ */
+ private static final int LIST_SIZE = 3;
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#hashCode()}.
+ */
+ @Test
+ public void testHashCode() {
+ ListAttribute attribute = new ListAttribute();
+ List<Attribute> list = new ArrayList<Attribute>();
+ list.add(new Attribute("value1"));
+ list.add(new Attribute("value2"));
+ attribute.setValue(list);
+ attribute.setInherit(true);
+ assertEquals(list.hashCode() + Boolean.TRUE.hashCode(), attribute.hashCode());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#equals(java.lang.Object)}.
+ */
+ @Test
+ public void testEqualsObject() {
+ ListAttribute attribute = new ListAttribute();
+ List<Attribute> list = new ArrayList<Attribute>();
+ list.add(new Attribute("value1"));
+ list.add(new Attribute("value2"));
+ attribute.setValue(list);
+ attribute.setInherit(true);
+ ListAttribute toCheck = new ListAttribute(attribute);
+ assertTrue(attribute.equals(toCheck));
+ toCheck = new ListAttribute(attribute);
+ toCheck.setInherit(false);
+ assertFalse(attribute.equals(toCheck));
+ toCheck = new ListAttribute(attribute);
+ toCheck.add(new Attribute("value3"));
+ assertFalse(attribute.equals(toCheck));
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#ListAttribute(java.util.List)}.
+ */
+ @Test
+ public void testListAttributeListOfAttribute() {
+ List<Attribute> attributes = new ArrayList<Attribute>();
+ attributes.add(new Attribute("value1"));
+ attributes.add(new Attribute("value2"));
+ ListAttribute attribute = new ListAttribute(attributes);
+ assertEquals(attributes, attribute.getValue());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#ListAttribute(org.apache.tiles.ListAttribute)}.
+ */
+ @Test
+ public void testListAttributeListAttribute() {
+ ListAttribute attribute = new ListAttribute();
+ List<Attribute> list = new ArrayList<Attribute>();
+ list.add(new Attribute("value1"));
+ list.add(new Attribute("value2"));
+ list.add(null);
+ attribute.setValue(list);
+ attribute.setInherit(true);
+ ListAttribute toCheck = new ListAttribute(attribute);
+ assertEquals(attribute, toCheck);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#setValue(java.util.List)}.
+ */
+ @Test
+ public void testSetValue() {
+ ListAttribute attribute = new ListAttribute();
+ List<Attribute> list = new ArrayList<Attribute>();
+ list.add(new Attribute("value1"));
+ list.add(new Attribute("value2"));
+ attribute.setValue(list);
+ assertEquals(list, attribute.getValue());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#add(org.apache.tiles.Attribute)}.
+ */
+ @Test
+ public void testAdd() {
+ List<Attribute> list = new ArrayList<Attribute>();
+ Attribute attribute1 = new Attribute("value1");
+ list.add(attribute1);
+ Attribute attribute2 = new Attribute("value2");
+ list.add(attribute2);
+ ListAttribute attribute = new ListAttribute(list);
+ Attribute attribute3 = new Attribute("value3");
+ attribute.add(attribute3);
+ list = attribute.getValue();
+ assertEquals(LIST_SIZE, list.size());
+ assertEquals(attribute1, list.get(0));
+ assertEquals(attribute2, list.get(1));
+ assertEquals(attribute3, list.get(2));
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#setInherit(boolean)}.
+ */
+ @Test
+ public void testSetInherit() {
+ ListAttribute attribute = new ListAttribute();
+ attribute.setInherit(true);
+ assertTrue(attribute.isInherit());
+ attribute.setInherit(false);
+ assertFalse(attribute.isInherit());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#inherit(org.apache.tiles.ListAttribute)}.
+ */
+ @Test
+ public void testInherit() {
+ List<Attribute> list = new ArrayList<Attribute>();
+ Attribute attribute1 = new Attribute("value1");
+ list.add(attribute1);
+ Attribute attribute2 = new Attribute("value2");
+ list.add(attribute2);
+ ListAttribute parent = new ListAttribute(list);
+ Attribute attribute3 = new Attribute("value3");
+ ListAttribute child = new ListAttribute();
+ child.add(attribute3);
+ child.inherit(parent);
+ list = child.getValue();
+ assertEquals(LIST_SIZE, list.size());
+ assertEquals(attribute1, list.get(0));
+ assertEquals(attribute2, list.get(1));
+ assertEquals(attribute3, list.get(2));
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.ListAttribute#clone()}.
+ */
+ @Test
+ public void testClone() {
+ ListAttribute attribute = new ListAttribute();
+ List<Attribute> list = new ArrayList<Attribute>();
+ list.add(new Attribute("value1"));
+ list.add(new Attribute("value2"));
+ attribute.setValue(list);
+ attribute.setInherit(true);
+ ListAttribute toCheck = attribute.clone();
+ assertEquals(attribute, toCheck);
+ }
+}
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java?rev=832867&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java Wed Nov 4 20:16:23 2009
@@ -0,0 +1,77 @@
+/*
+ * $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.tiles;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Tests {@link TilesException}.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TilesExceptionTest {
+
+ /**
+ * Test method for {@link org.apache.tiles.TilesException#TilesException()}.
+ */
+ @Test
+ public void testTilesException() {
+ TilesException exception = new TilesException();
+ assertNull(exception.getMessage());
+ assertNull(exception.getCause());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.TilesException#TilesException(java.lang.String)}.
+ */
+ @Test
+ public void testTilesExceptionString() {
+ TilesException exception = new TilesException("my message");
+ assertEquals("my message", exception.getMessage());
+ assertNull(exception.getCause());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.TilesException#TilesException(java.lang.Throwable)}.
+ */
+ @Test
+ public void testTilesExceptionThrowable() {
+ Throwable cause = new Throwable();
+ TilesException exception = new TilesException(cause);
+ assertEquals(cause.toString(), exception.getMessage());
+ assertEquals(cause, exception.getCause());
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.TilesException#TilesException(java.lang.String, java.lang.Throwable)}.
+ */
+ @Test
+ public void testTilesExceptionStringThrowable() {
+ Throwable cause = new Throwable();
+ TilesException exception = new TilesException("my message", cause);
+ assertEquals("my message", exception.getMessage());
+ assertEquals(cause, exception.getCause());
+ }
+
+}
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL