Issue GoogleCloudPlatform#262 - src/test/java passed through google-java-format-1.0-all-deps.jar

Author: joakime

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);
-   *
+   * <p>
    * AppEngineSession session = manager.newSession(request);
    * session.setAttribute("foo", "bar");
    * session.save();

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
+ * <p>
+ * 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()
    */

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 {
 

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 {
 

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 {
 

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 {
 

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.

jetty9-compat-base/src/test/java/com/google/apphosting/vmruntime/jetty9/VmRuntimeTestBase.java

@@ -39,7 +39,7 @@
 
 /**
  * Base test class for the Java VmRuntime.
- *
+ * <p>
  * 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 {

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 {