From 52ffd07499278ac6fb5538669c96bcfe7ae451f7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 8 Jun 2016 17:29:25 -0700 Subject: [PATCH 1/3] Fixes #262 - Integration testing more stable in maven. + Forces maven-failsafe-plugin in parent (with version) + Moves jetty9-compact-base tests back into src/test/java + Renames integration tests from *Test.java to *IT.java to better conform to new recommendations from maven-failsafe-plugin (convention over configuration!) --- .../runtime/jetty9/SessionManagerIT.java} | 15 ++++++----- .../vmruntime/jetty9/ApiRequest.java | 0 .../jetty9/AppEngineAuthenticationTest.java | 0 .../vmruntime/jetty9/AsyncServletIT.java} | 10 ++++---- .../vmruntime/jetty9/AuthServlet.java | 0 .../jetty9/FakeableVmApiProxyDelegate.java | 0 .../vmruntime/jetty9/JettyRunner.java | 14 +++++------ .../vmruntime/jetty9/LoggingIT.java} | 8 +++--- .../vmruntime/jetty9/NoAppWebXmlIT.java} | 2 +- .../vmruntime/jetty9/TestAsyncContext.java | 0 .../jetty9/VmRuntimeJettyAuthIT.java} | 2 +- .../jetty9/VmRuntimeJettyKitchenSink2IT.java} | 7 +++--- .../jetty9/VmRuntimeJettyKitchenSinkIT.java} | 8 +++--- .../jetty9/VmRuntimeJettySessionIT.java} | 8 +++--- .../vmruntime/jetty9/VmRuntimeTestBase.java | 4 +-- .../jetty9/VmRuntimeWebAppContextTest.java | 16 ++++++------ .../resources/jetty-logging.properties | 0 .../webapp/WEB-INF/appengine-web.xml | 0 .../webapp/WEB-INF/logging.properties | 0 .../resources/webapp/WEB-INF/web.xml | 0 pom.xml | 25 ++++++++++++++++++- 21 files changed, 73 insertions(+), 46 deletions(-) rename jetty9-compat-base/src/{it/java/com/google/apphosting/runtime/jetty9/SessionManagerTest.java => test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java} (99%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java (100%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java (100%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/AsyncServletTest.java => test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java} (98%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/AuthServlet.java (100%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/FakeableVmApiProxyDelegate.java (100%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java (100%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/LoggingTest.java => test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java} (98%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlTest.java => test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java} (95%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/TestAsyncContext.java (100%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthTest.java => test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java} (99%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2Test.java => test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java} (99%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkTest.java => test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java} (98%) rename jetty9-compat-base/src/{it/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionTest.java => test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java} (99%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java (100%) rename jetty9-compat-base/src/{it => test}/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java (100%) rename jetty9-compat-base/src/{it => test}/resources/jetty-logging.properties (100%) rename jetty9-compat-base/src/{it => test}/resources/webapp/WEB-INF/appengine-web.xml (100%) rename jetty9-compat-base/src/{it => test}/resources/webapp/WEB-INF/logging.properties (100%) rename jetty9-compat-base/src/{it => test}/resources/webapp/WEB-INF/web.xml (100%) 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..0694271 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 @@ -52,8 +52,6 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.easymock.EasyMock; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; @@ -68,12 +66,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.easymock.EasyMock; + /** * Tests for SessionManager and its inner classes. * * @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,8 @@ 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 +160,8 @@ public String testNamespace() { } } - public static class NamespacedTest extends SessionManagerTest { + public static class NamespacedTest extends SessionManagerIT + { @Override public String startNamespace() { return ""; @@ -171,7 +173,8 @@ public String testNamespace() { } } - public static class NamespacedTestTest extends SessionManagerTest { + public static class NamespacedTestTest extends SessionManagerIT + { @Override public String startNamespace() { return "start-namespace"; 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 100% 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 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 100% 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 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..8e1ebbe 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 @@ -22,17 +22,17 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThat; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.methods.RequestEntity; - import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; -public class AsyncServletTest extends VmRuntimeTestBase { +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.RequestEntity; + +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 index 375de62..44ca388 100644 --- 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 @@ -21,6 +21,13 @@ import com.google.apphosting.vmruntime.VmRuntimeFileLogHandler; +import java.io.File; +import java.io.IOException; +import java.net.ServerSocket; +import java.util.Collections; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.eclipse.jetty.apache.jsp.JettyJasperInitializer; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.server.Handler; @@ -39,13 +46,6 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.Assert; -import java.io.File; -import java.io.IOException; -import java.net.ServerSocket; -import java.util.Collections; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - class JettyRunner extends AbstractLifeCycle implements Runnable { private File logs; 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..b29ca7d 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 @@ -21,16 +21,16 @@ import com.google.gson.Gson; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -public class LoggingTest extends VmRuntimeTestBase { +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + +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 95% 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..c88fdca 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 @@ -22,7 +22,7 @@ * 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..19ecef1 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 @@ -28,7 +28,7 @@ * 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..82ba6d2 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,22 +25,23 @@ 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 java.net.HttpURLConnection; + import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpVersion; import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; import org.apache.commons.httpclient.methods.PostMethod; -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..5a066ee 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 @@ -21,9 +21,6 @@ import com.google.apphosting.vmruntime.VmApiProxyDelegate; import com.google.apphosting.vmruntime.VmApiProxyEnvironment; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -32,11 +29,14 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + /** * 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..e280059 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 @@ -28,9 +28,6 @@ import com.google.storage.onestore.v3.OnestoreEntity.Path.Element; import com.google.storage.onestore.v3.OnestoreEntity.Reference; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -38,13 +35,16 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + /** * Tests for running AppEngine Java apps inside a VM using a Jetty 9 container * with HTTP servlet sessions enabled. * * @author isdal@google.com (Tomas Isdal) */ -public class VmRuntimeJettySessionTest extends VmRuntimeTestBase { +public class VmRuntimeJettySessionIT extends VmRuntimeTestBase { @Override protected void setUp() throws Exception { 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 100% 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..5ccea57 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 @@ -21,8 +21,6 @@ import junit.framework.TestCase; -import org.junit.Ignore; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -37,6 +35,8 @@ import javax.servlet.http.HttpServletResponse; +import org.junit.Ignore; + /** * Base test class for the Java VmRuntime. * 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 100% 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..ed9d1fa 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 @@ -24,14 +24,6 @@ import com.google.apphosting.api.ApiProxy; import com.google.apphosting.vmruntime.VmApiProxyEnvironment; -import org.eclipse.jetty.server.LocalConnector; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletHolder; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import java.io.IOException; import java.io.PrintWriter; @@ -40,6 +32,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.server.LocalConnector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.servlet.ServletHolder; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * Test VmRuntimeWebAppContext directly, without using VmRuntimeTestBase * 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..6b9fbc2 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ UTF-8 + UTF-8 yyyyMMddHHmm 9.3.8.v20160314 1.9.38 @@ -152,13 +153,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 +200,7 @@ maven-deploy-plugin 2.8.2 + org.apache.maven.plugins maven-release-plugin @@ -235,6 +238,26 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + + integration-test + verify + + + + + + org.apache.maven.surefire + surefire-junit47 + 2.19.1 + + + From 02edd9a027178be19776b1cda9138a5a883b741b Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 8 Jun 2016 17:42:53 -0700 Subject: [PATCH 2/3] Issue #262 - src/test/java passed through google-java-format-1.0-all-deps.jar --- .../runtime/jetty9/SessionManagerIT.java | 25 ++++++++----------- .../jetty9/AppEngineAuthenticationTest.java | 8 +++--- .../vmruntime/jetty9/NoAppWebXmlIT.java | 1 - .../jetty9/VmRuntimeJettyAuthIT.java | 1 - .../jetty9/VmRuntimeJettyKitchenSink2IT.java | 1 - .../jetty9/VmRuntimeJettyKitchenSinkIT.java | 1 - .../jetty9/VmRuntimeJettySessionIT.java | 1 + .../vmruntime/jetty9/VmRuntimeTestBase.java | 8 ++++-- .../jetty9/VmRuntimeWebAppContextTest.java | 1 - 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java index 0694271..0195eb4 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java @@ -16,12 +16,6 @@ package com.google.apphosting.runtime.jetty9; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertArrayEquals; - import com.google.appengine.api.NamespaceManager; import com.google.appengine.api.datastore.DatastoreService; import com.google.appengine.api.datastore.DatastoreServiceFactory; @@ -52,6 +46,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; +import org.easymock.EasyMock; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; @@ -66,7 +62,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.easymock.EasyMock; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertArrayEquals; /** * Tests for SessionManager and its inner classes. @@ -147,8 +147,7 @@ public String testNamespace() { return ""; } - public static class NamespacedStartTest extends SessionManagerIT - { + public static class NamespacedStartTest extends SessionManagerIT { @Override public String startNamespace() { return "start-namespace"; @@ -160,8 +159,7 @@ public String testNamespace() { } } - public static class NamespacedTest extends SessionManagerIT - { + public static class NamespacedTest extends SessionManagerIT { @Override public String startNamespace() { return ""; @@ -173,8 +171,7 @@ public String testNamespace() { } } - public static class NamespacedTestTest extends SessionManagerIT - { + public static class NamespacedTestTest extends SessionManagerIT { @Override public String startNamespace() { return "start-namespace"; @@ -514,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/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java index e8be523..1621b57 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java @@ -51,8 +51,8 @@ /** * 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/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java index c88fdca..9e46b98 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/NoAppWebXmlIT.java @@ -20,7 +20,6 @@ /** * Testing that appengine-web.xml can be optional. - * */ public class NoAppWebXmlIT extends VmRuntimeTestBase { diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java index 19ecef1..afe156b 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyAuthIT.java @@ -26,7 +26,6 @@ /** * Testing Jetty9 auth handling. - * */ public class VmRuntimeJettyAuthIT extends VmRuntimeTestBase { diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java index 82ba6d2..03618d6 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java @@ -39,7 +39,6 @@ /** * Misc individual Jetty9 vmengines tests. - * */ public class VmRuntimeJettyKitchenSink2IT extends VmRuntimeTestBase { diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java index 5a066ee..b49cbae 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java @@ -34,7 +34,6 @@ /** * Misc individual Jetty9 vmengines tests. - * */ public class VmRuntimeJettyKitchenSinkIT extends VmRuntimeTestBase { diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java index e280059..c63e602 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java @@ -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/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java index 5ccea57..9eb0ffa 100644 --- a/jetty9-compat-base/src/test/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/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java index ed9d1fa..96930f0 100644 --- a/jetty9-compat-base/src/test/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 { From 4405b396f4d497a9f21e7c869d28630b4e879e2f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 9 Jun 2016 10:40:40 -0700 Subject: [PATCH 3/3] Issue #262 - Checkstyle updates + Fixed import order issues + Added checkstyle/checkstyle-suppressions.xml + Updated root pom.xml to use new suppressions techniques in a way that's friendly to a maven reactor build --- checkstyle/checkstyle-suppressions.xml | 14 ++++++++++++++ checkstyle/google-checks.xml | 4 ++++ .../runtime/jetty9/SessionManagerIT.java | 12 ++++++------ .../apphosting/vmruntime/jetty9/ApiRequest.java | 8 ++++++++ .../jetty9/AppEngineAuthenticationTest.java | 4 ++-- .../vmruntime/jetty9/AsyncServletIT.java | 8 ++++---- .../apphosting/vmruntime/jetty9/JettyRunner.java | 14 +++++++------- .../apphosting/vmruntime/jetty9/LoggingIT.java | 6 +++--- .../jetty9/VmRuntimeJettyKitchenSink2IT.java | 4 ++-- .../jetty9/VmRuntimeJettyKitchenSinkIT.java | 6 +++--- .../jetty9/VmRuntimeJettySessionIT.java | 6 +++--- .../vmruntime/jetty9/VmRuntimeTestBase.java | 4 ++-- .../jetty9/VmRuntimeWebAppContextTest.java | 16 ++++++++-------- pom.xml | 3 ++- 14 files changed, 68 insertions(+), 41 deletions(-) create mode 100644 checkstyle/checkstyle-suppressions.xml 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/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java index 0195eb4..5c92f7d 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/runtime/jetty9/SessionManagerIT.java @@ -16,6 +16,12 @@ package com.google.apphosting.runtime.jetty9; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertArrayEquals; + import com.google.appengine.api.NamespaceManager; import com.google.appengine.api.datastore.DatastoreService; import com.google.appengine.api.datastore.DatastoreServiceFactory; @@ -62,12 +68,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertArrayEquals; - /** * Tests for SessionManager and its inner classes. * diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/ApiRequest.java index 9bb5614..c094590 100644 --- a/jetty9-compat-base/src/test/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/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java index 1621b57..1456a31 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AppEngineAuthenticationTest.java @@ -51,8 +51,8 @@ /** * 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. diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java index 8e1ebbe..b0a4341 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/AsyncServletIT.java @@ -22,16 +22,16 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThat; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.RequestEntity; + import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.methods.RequestEntity; - public class AsyncServletIT extends VmRuntimeTestBase { /** diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java index 44ca388..375de62 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/JettyRunner.java @@ -21,13 +21,6 @@ import com.google.apphosting.vmruntime.VmRuntimeFileLogHandler; -import java.io.File; -import java.io.IOException; -import java.net.ServerSocket; -import java.util.Collections; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.eclipse.jetty.apache.jsp.JettyJasperInitializer; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.server.Handler; @@ -46,6 +39,13 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.Assert; +import java.io.File; +import java.io.IOException; +import java.net.ServerSocket; +import java.util.Collections; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + class JettyRunner extends AbstractLifeCycle implements Runnable { private File logs; diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java index b29ca7d..be97a82 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/LoggingIT.java @@ -21,15 +21,15 @@ import com.google.gson.Gson; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - public class LoggingIT extends VmRuntimeTestBase { public void testGet() throws Exception { diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java index 03618d6..9ffcf40 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSink2IT.java @@ -27,14 +27,14 @@ import com.google.apphosting.api.ApiProxy; import com.google.apphosting.api.DatastorePb.Transaction; -import java.net.HttpURLConnection; - import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpVersion; import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; import org.apache.commons.httpclient.methods.PostMethod; +import java.net.HttpURLConnection; + //import com.google.apphosting.datastore.DatastoreV3Pb.Transaction; /** diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java index b49cbae..8d3b80c 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettyKitchenSinkIT.java @@ -21,6 +21,9 @@ import com.google.apphosting.vmruntime.VmApiProxyDelegate; import com.google.apphosting.vmruntime.VmApiProxyEnvironment; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -29,9 +32,6 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - /** * Misc individual Jetty9 vmengines tests. */ diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java index c63e602..b4d204c 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeJettySessionIT.java @@ -28,6 +28,9 @@ import com.google.storage.onestore.v3.OnestoreEntity.Path.Element; import com.google.storage.onestore.v3.OnestoreEntity.Reference; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -35,9 +38,6 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.GetMethod; - /** * Tests for running AppEngine Java apps inside a VM using a Jetty 9 container * with HTTP servlet sessions enabled. diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java index 9eb0ffa..bcafcc7 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java @@ -21,6 +21,8 @@ import junit.framework.TestCase; +import org.junit.Ignore; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -35,8 +37,6 @@ import javax.servlet.http.HttpServletResponse; -import org.junit.Ignore; - /** * Base test class for the Java VmRuntime. *

diff --git a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java index 96930f0..6055a3c 100644 --- a/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java +++ b/jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeWebAppContextTest.java @@ -24,14 +24,6 @@ import com.google.apphosting.api.ApiProxy; import com.google.apphosting.vmruntime.VmApiProxyEnvironment; -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHolder; @@ -40,6 +32,14 @@ import org.junit.Before; import org.junit.Test; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Test VmRuntimeWebAppContext directly, without using VmRuntimeTestBase */ diff --git a/pom.xml b/pom.xml index 6b9fbc2..02ae6a9 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ 9.3.8.v20160314 1.9.38 async- - checkstyle/google-checks.xml @@ -229,6 +228,8 @@ check + checkstyle/google-checks.xml + checkstyle/checkstyle-suppressions.xml true true error