diff --git a/checkstyle/checkstyle-suppressions.xml b/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 0000000..f447385 --- /dev/null +++ b/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/checkstyle/google-checks.xml b/checkstyle/google-checks.xml index dbe7615..cd84737 100644 --- a/checkstyle/google-checks.xml +++ b/checkstyle/google-checks.xml @@ -20,6 +20,10 @@ + + + + diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/runtime/jetty9/SessionManagerTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java similarity index 99% rename from jetty9-compat-base/src/it/java/com/google/apphosting/runtime/jetty9/SessionManagerTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java index 0f9aed7..5c92f7d 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/runtime/jetty9/SessionManagerTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java @@ -73,7 +73,7 @@ * * @author fabbott@google.com (Freeland Abbott) */ -public class SessionManagerTest extends TestCase { +public class SessionManagerIT extends TestCase { private static final int SESSION_EXPIRATION_SECONDS = 60; @@ -147,7 +147,7 @@ public String testNamespace() { return ""; } - public static class NamespacedStartTest extends SessionManagerTest { + public static class NamespacedStartTest extends SessionManagerIT { @Override public String startNamespace() { return "start-namespace"; @@ -159,7 +159,7 @@ public String testNamespace() { } } - public static class NamespacedTest extends SessionManagerTest { + public static class NamespacedTest extends SessionManagerIT { @Override public String startNamespace() { return ""; @@ -171,7 +171,7 @@ public String testNamespace() { } } - public static class NamespacedTestTest extends SessionManagerTest { + public static class NamespacedTestTest extends SessionManagerIT { @Override public String startNamespace() { return "start-namespace"; @@ -511,7 +511,7 @@ public void testMemcacheOnlyLifecycle() { * new SessionManager(Collections.<SessionStore>singletonList(new DatastoreSessionStore())); * HttpServletRequest request = makeMockRequest(true); * replay(request); - * + *

* AppEngineSession session = manager.newSession(request); * session.setAttribute("foo", "bar"); * session.save(); diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java similarity index 89% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java index 9bb5614..c094590 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java @@ -27,6 +27,14 @@ public class ApiRequest { public final String methodName; public final byte[] requestData; + /** + * Simple API request. + * + * @param environment the environment + * @param packageName the package name + * @param methodName the method name + * @param requestData the request data + */ public ApiRequest( VmApiProxyEnvironment environment, String packageName, diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java similarity index 98% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java index e8be523..1456a31 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java @@ -52,7 +52,7 @@ /** * Tests for AppEngineAuthentication. * - * Test plan: Create and configure a ConstraintSecurityHandler to use our AppEngineAuthentication + *

Test plan: Create and configure a ConstraintSecurityHandler to use our AppEngineAuthentication * classes, then configure some paths to require users to be logged in. We then fire requests at the * security handler by calling its handle() method and verify that unauthenticated requests are * redirected to a login url, while authenticated requests are allowed through. @@ -125,8 +125,8 @@ public void tearDown() throws Exception { /** * Fire one request at the security handler (and by extension to the AuthServlet behind it). * - * @param path The path to hit. - * @param request The request object to use. + * @param path The path to hit. + * @param request The request object to use. * @param response The response object to use. Must be created by Mockito.mock() * @return Any data written to response.getWriter() */ diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AsyncServletTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java similarity index 98% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AsyncServletTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java index 47e308f..b0a4341 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AsyncServletTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.List; -public class AsyncServletTest extends VmRuntimeTestBase { +public class AsyncServletIT extends VmRuntimeTestBase { /** * Test that blob upload requests are intercepted by the blob upload filter. diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AuthServlet.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AuthServlet.java similarity index 100% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/AuthServlet.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AuthServlet.java diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/FakeableVmApiProxyDelegate.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/FakeableVmApiProxyDelegate.java similarity index 100% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/FakeableVmApiProxyDelegate.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/FakeableVmApiProxyDelegate.java diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java similarity index 100% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/LoggingTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java similarity index 98% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/LoggingTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java index fa2c077..be97a82 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/LoggingTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java @@ -30,7 +30,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -public class LoggingTest extends VmRuntimeTestBase { +public class LoggingIT extends VmRuntimeTestBase { public void testGet() throws Exception { diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java similarity index 94% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java index 11f7681..9e46b98 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java @@ -20,9 +20,8 @@ /** * Testing that appengine-web.xml can be optional. - * */ -public class NoAppWebXmlTest extends VmRuntimeTestBase { +public class NoAppWebXmlIT extends VmRuntimeTestBase { @Override protected void setUp() throws Exception { diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/TestAsyncContext.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/TestAsyncContext.java similarity index 100% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/TestAsyncContext.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/TestAsyncContext.java diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java similarity index 99% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java index 2546c37..afe156b 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java @@ -26,9 +26,8 @@ /** * Testing Jetty9 auth handling. - * */ -public class VmRuntimeJettyAuthTest extends VmRuntimeTestBase { +public class VmRuntimeJettyAuthIT extends VmRuntimeTestBase { public void testAuth_UserNotRequired() throws Exception { String[] lines = fetchUrl(createUrl("/test-auth")); diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2Test.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java similarity index 99% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2Test.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java index 7e9250b..9ffcf40 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2Test.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java @@ -25,7 +25,6 @@ import com.google.appengine.api.taskqueue.TaskQueuePb.TaskQueueServiceError.ErrorCode; import com.google.apphosting.api.ApiBasePb.VoidProto; import com.google.apphosting.api.ApiProxy; -//import com.google.apphosting.datastore.DatastoreV3Pb.Transaction; import com.google.apphosting.api.DatastorePb.Transaction; import org.apache.commons.httpclient.Header; @@ -36,11 +35,12 @@ import java.net.HttpURLConnection; +//import com.google.apphosting.datastore.DatastoreV3Pb.Transaction; + /** * Misc individual Jetty9 vmengines tests. - * */ -public class VmRuntimeJettyKitchenSink2Test extends VmRuntimeTestBase { +public class VmRuntimeJettyKitchenSink2IT extends VmRuntimeTestBase { /** * Test that the count servlet was loaded, and that local state is preserved diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java similarity index 98% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java index 759c02e..8d3b80c 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java @@ -34,9 +34,8 @@ /** * Misc individual Jetty9 vmengines tests. - * */ -public class VmRuntimeJettyKitchenSinkTest extends VmRuntimeTestBase { +public class VmRuntimeJettyKitchenSinkIT extends VmRuntimeTestBase { @Override protected void setUp() throws Exception { diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java similarity index 99% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java index d1a1b8a..b4d204c 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java @@ -44,7 +44,7 @@ * * @author isdal@google.com (Tomas Isdal) */ -public class VmRuntimeJettySessionTest extends VmRuntimeTestBase { +public class VmRuntimeJettySessionIT extends VmRuntimeTestBase { @Override protected void setUp() throws Exception { @@ -123,6 +123,7 @@ public void testWelcomeServlet() throws Exception { // code = fetchResponseCode(createUrl("/_ah/health")); // assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, code); // } + /** * Create a datastore put response with the minimal fields required to make * the put succeed. diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java similarity index 98% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java index 6e924c8..bcafcc7 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java @@ -39,7 +39,7 @@ /** * Base test class for the Java VmRuntime. - * + *

* Test methods that are Jetty version independent should be implemented in this class. */ @Ignore @@ -106,6 +106,7 @@ protected String[] fetchUrl(URL url) throws IOException { /** * Convenience method for fetching from a HttpURLConnection. This allows headers to be set. + * * @param connection the connection to use * @return A string array of the lines in the response. */ @@ -161,7 +162,10 @@ protected HttpURLConnection openConnection(String path) throws IOException { conn.setRequestProperty("Metadata-Flavor", "Google"); return conn; } - /** Timeout in milliseconds to retrieve data from the server. */ + + /** + * Timeout in milliseconds to retrieve data from the server. + */ private static final int TIMEOUT_MILLIS = 120 * 1000; protected String getMetadataFromServer(String path) throws IOException { diff --git a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java similarity index 99% rename from jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java rename to jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java index af3e8ec..6055a3c 100644 --- a/jetty9-compat-base/src/it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java @@ -42,7 +42,6 @@ /** * Test VmRuntimeWebAppContext directly, without using VmRuntimeTestBase - * */ public class VmRuntimeWebAppContextTest { diff --git a/jetty9-compat-base/src/it/resources/jetty-logging.properties b/jetty9-compat-base/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty9-compat-base/src/it/resources/jetty-logging.properties rename to jetty9-compat-base/src/test/resources/jetty-logging.properties diff --git a/jetty9-compat-base/src/it/resources/webapp/WEB-INF/appengine-web.xml b/jetty9-compat-base/src/test/resources/webapp/WEB-INF/appengine-web.xml similarity index 100% rename from jetty9-compat-base/src/it/resources/webapp/WEB-INF/appengine-web.xml rename to jetty9-compat-base/src/test/resources/webapp/WEB-INF/appengine-web.xml diff --git a/jetty9-compat-base/src/it/resources/webapp/WEB-INF/logging.properties b/jetty9-compat-base/src/test/resources/webapp/WEB-INF/logging.properties similarity index 100% rename from jetty9-compat-base/src/it/resources/webapp/WEB-INF/logging.properties rename to jetty9-compat-base/src/test/resources/webapp/WEB-INF/logging.properties diff --git a/jetty9-compat-base/src/it/resources/webapp/WEB-INF/web.xml b/jetty9-compat-base/src/test/resources/webapp/WEB-INF/web.xml similarity index 100% rename from jetty9-compat-base/src/it/resources/webapp/WEB-INF/web.xml rename to jetty9-compat-base/src/test/resources/webapp/WEB-INF/web.xml diff --git a/pom.xml b/pom.xml index bf8b69d..02ae6a9 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,11 @@ UTF-8 + UTF-8 yyyyMMddHHmm 9.3.8.v20160314 1.9.38 async- - checkstyle/google-checks.xml @@ -152,13 +152,14 @@ docker-maven-plugin 0.3.2 + org.apache.maven.plugins maven-surefire-plugin 2.18 - + org.apache.maven.plugins maven-source-plugin 2.4 @@ -198,6 +199,7 @@ maven-deploy-plugin 2.8.2 + org.apache.maven.plugins maven-release-plugin @@ -226,6 +228,8 @@ check + checkstyle/google-checks.xml + checkstyle/checkstyle-suppressions.xml true true error @@ -235,6 +239,26 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-test + verify + + + + + + org.apache.maven.surefire + surefire-junit47 + 2.19.1 + + +