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 2011/02/02 16:33:36 UTC
svn commit: r1066499 - in
/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src:
main/java/org/apache/tiles/request/servlet/
main/java/org/apache/tiles/request/servlet/extractor/
test/java/org/apache/tiles/request/servlet/ test/java/org/apache/t...
Author: apetrelli
Date: Wed Feb 2 15:33:34 2011
New Revision: 1066499
URL: http://svn.apache.org/viewvc?rev=1066499&view=rev
Log:
TILESSB-38
Fixed tiles-request-servlet code style.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/package-info.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/package-info.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/NotAServletEnvironmentExceptionTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletApplicationContextTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/HeaderExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ParameterExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java Wed Feb 2 15:33:34 2011
@@ -50,6 +50,9 @@ import org.apache.tiles.request.servlet.
*/
public class ServletRequest extends AbstractClientRequest {
+ /**
+ * The native available scopes: request, session and application.
+ */
private static final String[] SCOPES = {"request", "session", "application"};
/**
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java Wed Feb 2 15:33:34 2011
@@ -40,6 +40,12 @@ import org.apache.tiles.request.util.Req
public final class ServletUtil {
/**
+ * Constructor.
+ */
+ private ServletUtil() {
+ }
+
+ /**
* Wraps a ServletException to create an IOException with the root cause if present.
*
* @param ex The exception to wrap.
@@ -62,6 +68,14 @@ public final class ServletUtil {
return retValue;
}
+ /**
+ * Returns the application context getting it from the servlet context. It must be
+ * first saved creating a {@link ServletApplicationContext} and using
+ * {@link ApplicationAccess#register(ApplicationContext)}.
+ *
+ * @param servletContext The servlet context.
+ * @return The application context, if found, <code>null</code> otherwise.
+ */
public static ApplicationContext getApplicationContext(ServletContext servletContext) {
return (ApplicationContext) servletContext
.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE);
@@ -82,7 +96,7 @@ public final class ServletUtil {
if (currentRequest == null) {
throw new NotAServletEnvironmentException("Last Tiles request context is null");
}
-
+
if (currentRequest instanceof ServletRequest) {
return (ServletRequest) currentRequest;
}
@@ -106,7 +120,7 @@ public final class ServletUtil {
if (applicationContext instanceof ServletApplicationContext) {
return (ServletContext) ((ServletApplicationContext) applicationContext).getContext();
}
-
+
throw new NotAServletEnvironmentException("Not a Servlet-based environment");
}
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -6,10 +26,23 @@ import javax.servlet.ServletContext;
import org.apache.tiles.request.attribute.AttributeExtractor;
+/**
+ * Extract attributes from application scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class ApplicationScopeExtractor implements AttributeExtractor {
+ /**
+ * The servlet context.
+ */
private ServletContext context;
+ /**
+ * Constructor.
+ *
+ * @param context The servlet context.
+ */
public ApplicationScopeExtractor(ServletContext context) {
this.context = context;
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -7,12 +27,29 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.attribute.EnumeratedValuesExtractor;
+/**
+ * Extract header values from an HTTP request.
+ *
+ * @version $Rev$ $Date$
+ */
public class HeaderExtractor implements EnumeratedValuesExtractor {
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The response.
+ */
private HttpServletResponse response;
+ /**
+ * Constructor.
+ *
+ * @param request The request.
+ * @param response The response.
+ */
public HeaderExtractor(HttpServletRequest request,
HttpServletResponse response) {
this.request = request;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -6,10 +26,23 @@ import javax.servlet.ServletContext;
import org.apache.tiles.request.attribute.HasKeys;
+/**
+ * Extract initialization parameters from the servlet context.
+ *
+ * @version $Rev$ $Date$
+ */
public class InitParameterExtractor implements HasKeys<String> {
+ /**
+ * The servlet context.
+ */
private ServletContext context;
+ /**
+ * Constructor.
+ *
+ * @param context The servlet context.
+ */
public InitParameterExtractor(ServletContext context) {
this.context = context;
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -6,10 +26,23 @@ import javax.servlet.http.HttpServletReq
import org.apache.tiles.request.attribute.HasKeys;
+/**
+ * Extract parameters from the request.
+ *
+ * @version $Rev$ $Date$
+ */
public class ParameterExtractor implements HasKeys<String> {
+ /**
+ * The servlet request.
+ */
private HttpServletRequest request;
+ /**
+ * Constructor.
+ *
+ * @param request The servlet request.
+ */
public ParameterExtractor(HttpServletRequest request) {
this.request = request;
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -6,10 +26,23 @@ import javax.servlet.http.HttpServletReq
import org.apache.tiles.request.attribute.AttributeExtractor;
+/**
+ * Extracts attributes from request scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class RequestScopeExtractor implements AttributeExtractor {
+ /**
+ * The servlet request.
+ */
private HttpServletRequest request;
+ /**
+ * Constructor.
+ *
+ * @param request The servlet request.
+ */
public RequestScopeExtractor(HttpServletRequest request) {
this.request = request;
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet.extractor;
import java.util.Enumeration;
@@ -7,10 +27,23 @@ import javax.servlet.http.HttpSession;
import org.apache.tiles.request.attribute.AttributeExtractor;
+/**
+ * Extract attributes from session scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class SessionScopeExtractor implements AttributeExtractor {
+ /**
+ * The servlet request.
+ */
private HttpServletRequest request;
+ /**
+ * Constructor.
+ *
+ * @param request The servlet request.
+ */
public SessionScopeExtractor(HttpServletRequest request) {
this.request = request;
}
Added: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/package-info.java?rev=1066499&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/extractor/package-info.java Wed Feb 2 15:33:34 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Extractors to get attributes and other info from servlet requests and contexts.
+ */
+package org.apache.tiles.request.servlet.extractor;
Added: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/package-info.java?rev=1066499&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/main/java/org/apache/tiles/request/servlet/package-info.java Wed Feb 2 15:33:34 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Tiles request support for Servlet technology.
+ */
+package org.apache.tiles.request.servlet;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponseTest.java Wed Feb 2 15:33:34 2011
@@ -21,17 +21,15 @@
package org.apache.tiles.request.servlet;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
-import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
import org.junit.Test;
/**
@@ -41,7 +39,6 @@ public class ExternalWriterHttpServletRe
/**
* Test method for {@link org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse#getWriter()}.
- * @throws IOException If something goes wrong.
*/
@Test
public void testGetWriter() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/NotAServletEnvironmentExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/NotAServletEnvironmentExceptionTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/NotAServletEnvironmentExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/NotAServletEnvironmentExceptionTest.java Wed Feb 2 15:33:34 2011
@@ -64,7 +64,7 @@ public class NotAServletEnvironmentExcep
}
/**
- * Test method for {@link NotAServletEnvironmentException#NotAServletEnvironmentException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link NotAServletEnvironmentException#NotAServletEnvironmentException(String, Throwable)}.
*/
@Test
public void testNotAServletEnvironmentExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletApplicationContextTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletApplicationContextTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletApplicationContextTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletApplicationContextTest.java Wed Feb 2 15:33:34 2011
@@ -1,3 +1,23 @@
+/*
+ * $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.request.servlet;
import static org.easymock.EasyMock.*;
@@ -22,8 +42,14 @@ import org.junit.Test;
*/
public class ServletApplicationContextTest {
+ /**
+ * The servlet context.
+ */
private ServletContext servletContext;
+ /**
+ * The application context to test.
+ */
private ServletApplicationContext context;
/**
@@ -58,7 +84,6 @@ public class ServletApplicationContextTe
/**
* Test method for {@link org.apache.tiles.request.servlet.ServletApplicationContext#getInitParams()}.
*/
- @SuppressWarnings("unchecked")
@Test
public void testGetInitParams() {
replay(servletContext);
@@ -81,7 +106,7 @@ public class ServletApplicationContextTe
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletApplicationContext#getResources(java.lang.String)}.
+ * Test method for {@link ServletApplicationContext#getResources(String)}.
* @throws IOException If something goes wrong.
*/
@Test
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletRequestTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet;
@@ -33,12 +50,24 @@ import org.junit.Test;
*/
public class ServletRequestTest {
+ /**
+ * The application context.
+ */
private ApplicationContext applicationContext;
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The response.
+ */
private HttpServletResponse response;
+ /**
+ * The request to test.
+ */
private ServletRequest req;
/**
@@ -73,9 +102,8 @@ public class ServletRequestTest {
/**
* Test method for {@link org.apache.tiles.request.servlet.ServletRequest#doForward(java.lang.String)}.
* @throws IOException If something goes wrong.
- * @throws ServletException If something goes wrong.
*/
- @Test(expected=IOException.class)
+ @Test(expected = IOException.class)
public void testDoForwardNoDispatcher() throws IOException {
expect(response.isCommitted()).andReturn(false);
expect(request.getRequestDispatcher("/my/path")).andReturn(null);
@@ -93,7 +121,7 @@ public class ServletRequestTest {
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
- @Test(expected=IOException.class)
+ @Test(expected = IOException.class)
public void testDoForwardServletException() throws ServletException, IOException {
RequestDispatcher rd = createMock(RequestDispatcher.class);
@@ -149,7 +177,7 @@ public class ServletRequestTest {
* Test method for {@link org.apache.tiles.request.servlet.ServletRequest#doInclude(java.lang.String)}.
* @throws IOException If something goes wrong.
*/
- @Test(expected=IOException.class)
+ @Test(expected = IOException.class)
public void testDoIncludeNoDispatcher() throws IOException {
expect(request.getRequestDispatcher("/my/path")).andReturn(null);
@@ -166,7 +194,7 @@ public class ServletRequestTest {
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
- @Test(expected=IOException.class)
+ @Test(expected = IOException.class)
public void testDoIncludeServletException() throws IOException, ServletException {
RequestDispatcher rd = createMock(RequestDispatcher.class);
@@ -201,7 +229,6 @@ public class ServletRequestTest {
/**
* Test method for {@link org.apache.tiles.request.servlet.ServletRequest#getParam()}.
*/
- @SuppressWarnings("unchecked")
@Test
public void testGetParam() {
assertTrue(req.getParam() instanceof ReadOnlyEnumerationMap);
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/ServletUtilTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet;
@@ -23,7 +40,7 @@ import org.junit.Test;
public class ServletUtilTest {
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletUtil#wrapServletException(javax.servlet.ServletException, java.lang.String)}.
+ * Test method for {@link ServletUtil#wrapServletException(ServletException, String)}.
*/
@Test
public void testWrapServletException() {
@@ -34,7 +51,6 @@ public class ServletUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletUtil#wrapServletException(javax.servlet.ServletException, java.lang.String)}.
*/
@Test
public void testWrapServletExceptionWithCause() {
@@ -49,7 +65,7 @@ public class ServletUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.ServletUtil#getApplicationContext(javax.servlet.ServletContext)}.
+ * Test method for {@link ServletUtil#getApplicationContext(ServletContext)}.
*/
@Test
public void testGetApplicationContext() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -20,8 +37,14 @@ import org.junit.Test;
*/
public class ApplicationScopeExtractorTest {
+ /**
+ * The servlet context.
+ */
private ServletContext context;
+ /**
+ * The extractor to test.
+ */
private ApplicationScopeExtractor extractor;
/**
@@ -34,7 +57,7 @@ public class ApplicationScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.ApplicationScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
+ * Test method for {@link ApplicationScopeExtractor#setValue(String, Object)}.
*/
@Test
public void testSetValue() {
@@ -46,7 +69,7 @@ public class ApplicationScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.ApplicationScopeExtractor#removeValue(java.lang.String)}.
+ * Test method for {@link ApplicationScopeExtractor#removeValue(String)}.
*/
@Test
public void testRemoveValue() {
@@ -72,7 +95,7 @@ public class ApplicationScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.ApplicationScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link ApplicationScopeExtractor#getValue(String)}.
*/
@Test
public void testGetValue() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/HeaderExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/HeaderExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/HeaderExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/HeaderExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -21,10 +38,19 @@ import org.junit.Test;
*/
public class HeaderExtractorTest {
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The response.
+ */
private HttpServletResponse response;
+ /**
+ * The extractor to test.
+ */
private HeaderExtractor extractor;
/**
@@ -80,7 +106,7 @@ public class HeaderExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.HeaderExtractor#setValue(java.lang.String, java.lang.String)}.
+ * Test method for {@link HeaderExtractor#setValue(String, String)}.
*/
@Test
public void testSetValue() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -21,8 +38,14 @@ import org.junit.Test;
*/
public class InitParameterExtractorTest {
+ /**
+ * The servlet context.
+ */
private ServletContext context;
+ /**
+ * The extractor to test.
+ */
private InitParameterExtractor extractor;
/**
@@ -50,7 +73,7 @@ public class InitParameterExtractorTest
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.InitParameterExtractor#getValue(java.lang.String)}.
+ * Test method for {@link InitParameterExtractor#getValue(String)}.
*/
@Test
public void testGetValue() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ParameterExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ParameterExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ParameterExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/ParameterExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -21,8 +38,14 @@ import org.junit.Test;
*/
public class ParameterExtractorTest {
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The extractor to test.
+ */
private ParameterExtractor extractor;
/**
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -21,8 +38,14 @@ import org.junit.Test;
*/
public class RequestScopeExtractorTest {
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The extractor to test.
+ */
private RequestScopeExtractor extractor;
/**
@@ -35,7 +58,7 @@ public class RequestScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.RequestScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
+ * Test method for {@link RequestScopeExtractor#setValue(String, Object)}.
*/
@Test
public void testSetValue() {
@@ -47,7 +70,7 @@ public class RequestScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.RequestScopeExtractor#removeValue(java.lang.String)}.
+ * Test method for {@link RequestScopeExtractor#removeValue(String)}.
*/
@Test
public void testRemoveValue() {
@@ -74,7 +97,7 @@ public class RequestScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.RequestScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link RequestScopeExtractor#getValue(String)}.
*/
@Test
public void testGetValue() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java?rev=1066499&r1=1066498&r2=1066499&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-servlet/src/test/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractorTest.java Wed Feb 2 15:33:34 2011
@@ -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.request.servlet.extractor;
@@ -22,10 +39,19 @@ import org.junit.Test;
*/
public class SessionScopeExtractorTest {
+ /**
+ * The request.
+ */
private HttpServletRequest request;
+ /**
+ * The session.
+ */
private HttpSession session;
+ /**
+ * The extractot to test.
+ */
private SessionScopeExtractor extractor;
/**
@@ -39,7 +65,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
+ * Test method for {@link SessionScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
*/
@Test
public void testSetValue() {
@@ -52,7 +78,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#removeValue(java.lang.String)}.
+ * Test method for {@link SessionScopeExtractor#removeValue(java.lang.String)}.
*/
@Test
public void testRemoveValue() {
@@ -65,7 +91,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#getKeys()}.
+ * Test method for {@link SessionScopeExtractor#getKeys()}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -81,7 +107,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#getKeys()}.
+ * Test method for {@link SessionScopeExtractor#getKeys()}.
*/
@Test
public void testGetKeysNoSession() {
@@ -93,7 +119,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link SessionScopeExtractor#getValue(java.lang.String)}.
*/
@Test
public void testGetValue() {
@@ -106,7 +132,7 @@ public class SessionScopeExtractorTest {
}
/**
- * Test method for {@link org.apache.tiles.request.servlet.extractor.SessionScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link SessionScopeExtractor#getValue(java.lang.String)}.
*/
@Test
public void testGetValueNoSession() {