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 2010/12/13 21:46:48 UTC
svn commit: r1045365 [2/2] - in /tiles/sandbox/trunk/tiles3/tiles-core/src:
main/java/org/apache/tiles/awareness/ main/java/org/apache/tiles/context/
main/java/org/apache/tiles/definition/
main/java/org/apache/tiles/definition/dao/ main/java/org/apache...
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java Mon Dec 13 20:46:46 2010
@@ -1,5 +1,22 @@
-/**
+/*
+ * $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.impl.mgmt;
@@ -27,10 +44,17 @@ public class CachingTilesContainerTest {
/**
* The default name of the attribute in which storing custom definitions.
*/
- private static final String DEFAULT_DEFINITIONS_ATTRIBUTE_NAME = "org.apache.tiles.impl.mgmt.DefinitionManager.DEFINITIONS";
+ private static final String DEFAULT_DEFINITIONS_ATTRIBUTE_NAME =
+ "org.apache.tiles.impl.mgmt.DefinitionManager.DEFINITIONS";
+ /**
+ * The wrapped Tiles container.
+ */
private TilesContainer wrapped;
+ /**
+ * The Tiles container to test.
+ */
private CachingTilesContainer container;
/**
@@ -44,7 +68,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#CachingTilesContainer(org.apache.tiles.TilesContainer, java.lang.String)}
+ * {@link CachingTilesContainer#CachingTilesContainer(TilesContainer, String)}
* .
*/
@SuppressWarnings("unchecked")
@@ -95,7 +119,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#getDefinition(java.lang.String, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#getDefinition(String, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -118,7 +142,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#getDefinition(java.lang.String, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#getDefinition(String, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -187,7 +211,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#register(org.apache.tiles.Definition, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#register(Definition, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -219,7 +243,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#register(org.apache.tiles.Definition, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#register(Definition, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -264,7 +288,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#register(org.apache.tiles.Definition, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#register(Definition, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -300,7 +324,7 @@ public class CachingTilesContainerTest {
/**
* Test method for
- * {@link org.apache.tiles.impl.mgmt.CachingTilesContainer#register(org.apache.tiles.Definition, org.apache.tiles.request.Request)}
+ * {@link CachingTilesContainer#register(Definition, Request)}
* .
*/
@SuppressWarnings("unchecked")
@@ -356,7 +380,7 @@ public class CachingTilesContainerTest {
* .
*/
@SuppressWarnings("unchecked")
- @Test(expected=NoSuchDefinitionException.class)
+ @Test(expected = NoSuchDefinitionException.class)
public void testRenderFail() {
Request request = createMock(Request.class);
Map<String, Definition> definitions = createMock(Map.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java Mon Dec 13 20:46:46 2010
@@ -1,5 +1,22 @@
-/**
+/*
+ * $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.locale.impl;
@@ -20,7 +37,7 @@ import org.junit.Test;
public class DefaultLocaleResolverTest {
/**
- * Test method for {@link org.apache.tiles.locale.impl.DefaultLocaleResolver#resolveLocale(org.apache.tiles.request.Request)}.
+ * Test method for {@link DefaultLocaleResolver#resolveLocale(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java Mon Dec 13 20:46:46 2010
@@ -26,7 +26,6 @@ import static org.junit.Assert.*;
import java.io.IOException;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.renderer.DefinitionRenderer;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.render.CannotRenderException;
import org.junit.Before;
@@ -45,7 +44,7 @@ public class DefinitionRendererTest {
private DefinitionRenderer renderer;
/**
- * The container
+ * The container.
*/
private TilesContainer container;
@@ -77,7 +76,7 @@ public class DefinitionRendererTest {
*
* @throws IOException If something goes wrong during rendition.
*/
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderException() throws IOException {
Request requestContext = createMock(Request.class);
replay(requestContext, container);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java Mon Dec 13 20:46:46 2010
@@ -25,12 +25,24 @@ import org.junit.Test;
*/
public class CombinedBeanInfoTest {
+ /**
+ * The bean info to test.
+ */
private CombinedBeanInfo beanInfo;
+ /**
+ * The property descriptors.
+ */
private List<FeatureDescriptor> descriptors;
+ /**
+ * The map of property descriptors for request.
+ */
private Map<String, PropertyDescriptor> requestMap;
+ /**
+ * The map of property descriptors for application.
+ */
private Map<String, PropertyDescriptor> applicationMap;
/**