Author: markt
Date: Wed Oct 29 10:20:09 2014
New Revision: 1635091
URL: http://svn.apache.org/r1635091
Log:
Fix the Java 8 Javadoc warnings in the tests by removing pointless Javadoc and
changing comments with problems to non-Javadoc format
Modified:
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/trunk/test/org/apache/catalina/realm/TestRealmBase.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java
tomcat/trunk/test/org/apache/catalina/session/Threading.java
tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/catalina/tribes/TesterUtil.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Wed Oct
29 10:20:09 2014
@@ -141,7 +141,7 @@ public class TestRegistration extends To
};
}
- /**
+ /*
* Test verifying that Tomcat correctly de-registers the MBeans it has
* registered.
* @author Marc Guillemot
@@ -252,7 +252,7 @@ public class TestRegistration extends To
assertEquals("Remaining: " + onames, 0, onames.size());
}
- /**
+ /*
* Confirm that, as far as ObjectName is concerned, the order of the key
* properties is not significant.
*/
Modified: tomcat/trunk/test/org/apache/catalina/realm/TestRealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/realm/TestRealmBase.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/realm/TestRealmBase.java (original)
+++ tomcat/trunk/test/org/apache/catalina/realm/TestRealmBase.java Wed Oct 29
10:20:09 2014
@@ -637,7 +637,7 @@ public class TestRealmBase {
}
- /**
+ /*
* This test case covers the special case in section 13.4.1 of the Servlet
* 3.1 specification for {@link javax.servlet.annotation.HttpConstraint}.
*/
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Wed
Oct 29 10:20:09 2014
@@ -49,7 +49,7 @@ import org.apache.tomcat.websocket.serve
public class TestDefaultServlet extends TomcatBaseTest {
- /**
+ /*
* Test attempting to access special paths (WEB-INF/META-INF) using
* DefaultServlet.
*/
@@ -89,7 +89,7 @@ public class TestDefaultServlet extends
}
- /**
+ /*
* Verify serving of gzipped resources from context root.
*/
@Test
@@ -144,7 +144,7 @@ public class TestDefaultServlet extends
assertTrue(responseHeaders.contains("Content-Length: " + indexSize));
}
- /**
+ /*
* Test https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
* Verify serving of resources from context root with subpath mapping.
*/
@@ -215,7 +215,7 @@ public class TestDefaultServlet extends
}
- /**
+ /*
* Test https://issues.apache.org/bugzilla/show_bug.cgi?id=50413 Serving a
* custom error page
*/
@@ -297,7 +297,7 @@ public class TestDefaultServlet extends
assertEquals("It is 404.html", client.getResponseBody());
}
- /**
+ /*
* Test what happens if a custom 404 page is configured,
* but its file is actually missing.
*/
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Wed
Oct 29 10:20:09 2014
@@ -34,7 +34,7 @@ import org.apache.tomcat.websocket.serve
public class TestWebdavServlet extends TomcatBaseTest {
- /**
+ /*
* Test attempting to access special paths (WEB-INF/META-INF) using
WebdavServlet
*/
@Test
@@ -77,7 +77,7 @@ public class TestWebdavServlet extends T
}
- /**
+ /*
* Test https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
* Verify protection of special paths with re-mount of web app resource
root.
*/
Modified: tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java Wed
Oct 29 10:20:09 2014
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.buf.ByteCh
public class TestStandardSession extends TomcatBaseTest {
- /**
+ /*
* Test session.invalidate() in a clustered environment.
*/
@Test
Modified: tomcat/trunk/test/org/apache/catalina/session/Threading.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/Threading.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/Threading.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/Threading.java Wed Oct 29
10:20:09 2014
@@ -35,7 +35,7 @@ import org.junit.Test;
*/
public class Threading {
- /**
+ /*
* {@link FileInputStream#read(byte[])} and related methods are all native
* methods so it isn't immediately obvious if they are thread-safe or not.
*
Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Wed Oct
29 10:20:09 2014
@@ -57,7 +57,7 @@ public abstract class LoggingBaseTest {
@Rule
public final TestName testName = new TestName();
- /**
+ /*
* Helper method that returns the directory where Tomcat build resides. It
* is used to access resources that are part of default Tomcat deployment.
* E.g. the examples webapp.
@@ -67,7 +67,7 @@ public abstract class LoggingBaseTest {
"output/build"));
}
- /**
+ /*
* Helper method that returns the path of the temporary directory used by
* the test runs. The directory is configured during {@link #setUp()}.
*
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Wed Oct 29
10:20:09 2014
@@ -33,7 +33,7 @@ import org.apache.catalina.Context;
public class TestListener extends TomcatBaseTest {
- /**
+ /*
* Check that a ServletContainerInitializer can install a
* {@link ServletContextListener} and that it gets initialized.
* @throws Exception
@@ -50,7 +50,7 @@ public class TestListener extends Tomcat
assertTrue(SCL.initialized);
}
- /**
+ /*
* Check that a {@link ServletContextListener} cannot install a
* {@link ServletContainerInitializer}.
* @throws Exception
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Wed Oct 29
10:20:09 2014
@@ -170,7 +170,7 @@ public class TestTomcat extends TomcatBa
}
- /**
+ /*
* Start tomcat with a single context and one
* servlet - all programmatic, no server.xml or
* web.xml used.
@@ -259,7 +259,7 @@ public class TestTomcat extends TomcatBa
}
- /**
+ /*
* Test for enabling JNDI.
*/
@Test
@@ -290,7 +290,7 @@ public class TestTomcat extends TomcatBa
assertEquals("Hello, Tomcat User", res.toString());
}
- /**
+ /*
* Test for enabling JNDI and using global resources.
*/
@Test
@@ -327,7 +327,7 @@ public class TestTomcat extends TomcatBa
}
- /**
+ /*
* Test for https://issues.apache.org/bugzilla/show_bug.cgi?id=47866
*/
@Test
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed Oct
29 10:20:09 2014
@@ -64,21 +64,21 @@ public abstract class TomcatBaseTest ext
public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
- /**
+ /*
* Make Tomcat instance accessible to sub-classes.
*/
public Tomcat getTomcatInstance() {
return tomcat;
}
- /**
+ /*
* Sub-classes need to know port so they can connect
*/
public int getPort() {
return tomcat.getConnector().getLocalPort();
}
- /**
+ /*
* Sub-classes may want to check, whether an AccessLogValve is active
*/
public boolean isAccessLogEnabled() {
@@ -196,7 +196,7 @@ public abstract class TomcatBaseTest ext
}
- /**
+ /*
* Wrapper for getting the response.
*/
public static ByteChunk getUrl(String path) throws IOException {
Modified: tomcat/trunk/test/org/apache/catalina/tribes/TesterUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/TesterUtil.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/TesterUtil.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/TesterUtil.java Wed Oct 29
10:20:09 2014
@@ -29,7 +29,7 @@ public class TesterUtil {
}
- /**
+ /*
* Configures a set of channels to use a random domain. Use to ensure that
* multiple instance of the test suite do not interfere when running on the
* same machine. This may happen in a CI system or when a developer is
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Wed Oct 29 10:20:09 2014
@@ -32,7 +32,7 @@ public final class IntrospectionUtils {
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class );
- /**
+ /*
* Find a method with the right name If found, call the method ( if param
is
* int or boolean we'll convert value to the right type before) - that
means
* you can have setDebug(1).
@@ -178,7 +178,7 @@ public final class IntrospectionUtils {
return false;
}
- /**
+ /*
* Reverse of Introspector.decapitalize
*/
public static String capitalize(String name) {
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Wed Oct 29
10:20:09 2014
@@ -131,11 +131,6 @@ public class MapDemo implements ChannelL
ChannelCreator.usage());
}
- /**
- * Main method
- * @param args
- * @throws Exception
- */
@SuppressWarnings("unused")
public static void main(String[] args) throws Exception {
long start = System.currentTimeMillis();
@@ -494,7 +489,7 @@ public class MapDemo implements ChannelL
System.out.println("--------------------------");
}
- /**
+ /*
* Create the GUI and show it. For thread safety,
* this method should be invoked from the
* event-dispatching thread.
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java Wed
Oct 29 10:20:09 2014
@@ -134,7 +134,7 @@ public class TestErrorReportValve extend
}
- /**
+ /*
* Custom error/status codes should not result in a blank response.
*/
@Test
Modified: tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java (original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Wed Oct 29
10:20:09 2014
@@ -63,7 +63,7 @@ public class SimpleAjpClient {
socket = null;
}
- /**
+ /*
* Create a message to request the given URL.
*/
public TesterAjpMessage createForwardMessage(String url) {
@@ -126,7 +126,7 @@ public class SimpleAjpClient {
}
- /**
+ /*
* Sends an TesterAjpMessage to the server and returns the response
message.
*/
public TesterAjpMessage sendMessage(TesterAjpMessage headers)
@@ -148,7 +148,7 @@ public class SimpleAjpClient {
return readMessage();
}
- /**
+ /*
* Tests the connection to the server and returns the CPONG response.
*/
public TesterAjpMessage cping() throws IOException {
@@ -158,7 +158,7 @@ public class SimpleAjpClient {
return readMessage();
}
- /**
+ /*
* Reads a message from the server.
*/
public TesterAjpMessage readMessage() throws IOException {
Modified: tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java Wed
Oct 29 10:20:09 2014
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.buf.ByteCh
*/
public class TestGzipOutputFilter {
- /**
+ /*
* Test the interaction betwen gzip and flushing. The idea is to: 1. create
* a internal output buffer, response, and attach an active
gzipoutputfilter
* to the output buffer 2. set the output stream of the internal buffer to
Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Wed Oct 29
10:20:09 2014
@@ -198,7 +198,7 @@ public class TestValueExpressionImpl {
}
- /**
+ /*
* Test returning an empty list as a bean property.
*/
@Test
@@ -221,7 +221,7 @@ public class TestValueExpressionImpl {
}
- /**
+ /*
* Test using list directly as variable.
*/
@Test
Modified: tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java Wed
Oct 29 10:20:09 2014
@@ -45,7 +45,7 @@ public class TestWarDirContext extends T
new JreMemoryLeakPreventionListener());
}
- /**
+ /*
* Check https://jira.springsource.org/browse/SPR-7350 isn't really an
issue
*/
@Test
@@ -65,7 +65,7 @@ public class TestWarDirContext extends T
}
- /**
+ /*
* Additional test following on from SPR-7350 above to check files that
* contain JNDI reserved characters can be served when caching is enabled.
*/
@@ -97,7 +97,7 @@ public class TestWarDirContext extends T
}
- /**
+ /*
* Additional test following on from SPR-7350 above to check files that
* contain JNDI reserved characters can be served when caching is disabled.
*/
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Wed Oct 29
10:20:09 2014
@@ -38,7 +38,7 @@ public class TestByteChunk {
assertTrue(Arrays.equals(bytes, expected));
}
- /**
+ /*
* Test for {@code findByte} vs. {@code indexOf} methods difference.
*
* <p>
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java?rev=1635091&r1=1635090&r2=1635091&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java
Wed Oct 29 10:20:09 2014
@@ -36,7 +36,7 @@ import org.apache.tomcat.websocket.Teste
public class TesterConnectionLimit extends TomcatBaseTest{
- /**
+ /*
* Simple test to see how many outgoing connections can be created on a
* single machine.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
