api: Move test utils out of unit test directories.

https://codereview.appspot.com/107160043/

Author: wonderfly

google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/MockAppIdentityService.java renamed to google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java

@@ -12,18 +12,22 @@
  * the License.
  */
 
-package com.google.api.client.googleapis.extensions.appengine.auth.oauth2;
+package com.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2;
 
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFailureException;
 import com.google.appengine.api.appidentity.PublicCertificate;
+import com.google.api.client.util.Beta;
 
 import java.util.Collection;
 
 /**
+ * {@link Beta} <br/>
  * Mock implementation of AppIdentityService interface for testing.
  *
+ * @since 1.19
  */
+@Beta
 public class MockAppIdentityService implements AppIdentityService {
 
   private int getAccessTokenCallCount = 0;

google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * {@link com.google.api.client.util.Beta} <br/>
+ * Test utilities for the {@code com.google.api.client.googleapis.extensions.appengine.auth.oauth2}
+ * package.
+ *
+ * @since 1.19
+ */
+@com.google.api.client.util.Beta
+package com.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2;
+

google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java

@@ -15,6 +15,7 @@
 package com.google.api.client.googleapis.extensions.appengine.auth.oauth2;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2.MockAppIdentityService;
 import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;

google-api-client/pom.xml

@@ -85,7 +85,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-jdk5</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

google-api-client/src/test/java/com/google/api/client/googleapis/TestUtils.java renamed to google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java

@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.api.client.googleapis;
+package com.google.api.client.googleapis.testing;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;

google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/MockTokenServerTransport.java renamed to google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java

@@ -12,29 +12,34 @@
  * the License.
  */
 
-package com.google.api.client.googleapis.auth.oauth2;
+package com.google.api.client.googleapis.testing.auth.oauth2;
 
-import com.google.api.client.googleapis.TestUtils;
+import com.google.api.client.googleapis.auth.oauth2.GoogleOAuthConstants;
+import com.google.api.client.googleapis.testing.TestUtils;
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
+import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.util.Beta;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
+ * {@link Beta} <br/>
  * A test transport that simulates Google's token server for refresh tokens and service accounts.
+ *
+ * @since 1.19
  */
-class MockTokenServerTransport extends MockHttpTransport {
+@Beta
+public class MockTokenServerTransport extends MockHttpTransport {
   static final String EXPECTED_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
   static final JsonFactory JSON_FACTORY = new JacksonFactory();
   Map<String, String> serviceAccounts = new HashMap<String, String>();
@@ -48,11 +53,11 @@ public void addServiceAccount(String email, String accessToken) {
     serviceAccounts.put(email, accessToken);
   }
 
-  void addClient(String clientId, String clientSecret) {
+  public void addClient(String clientId, String clientSecret) {
     clients.put(clientId, clientSecret);
   }
 
-  void addRefreshToken(String refreshToken, String accessTokenToReturn) {
+  public void addRefreshToken(String refreshToken, String accessTokenToReturn) {
     refreshTokens.put(refreshToken, accessTokenToReturn);
   }
 
@@ -81,7 +86,6 @@ public LowLevelHttpResponse execute() throws IOException {
               throw new IOException("Refresh Token not found.");
             }
             accessToken = refreshTokens.get(foundRefresh);
-
           } else if (query.containsKey("grant_type")) {
             String grantType = query.get("grant_type");
             if (!EXPECTED_GRANT_TYPE.equals(grantType)) {

google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * {@link com.google.api.client.util.Beta} <br/>
+ * Test utilities for the {@code com.google.api.client.googleapis.auth.oauth2} package.
+ *
+ * @since 1.19
+ */
+@com.google.api.client.util.Beta
+package com.google.api.client.googleapis.testing.auth.oauth2;
+

google-api-client/src/test/java/com/google/api/client/googleapis/compute/MockMetadataServerTransport.java renamed to google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java

@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.api.client.googleapis.compute;
+package com.google.api.client.googleapis.testing.compute;
 
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
@@ -23,19 +23,23 @@
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.util.Beta;
 
 import java.io.IOException;
 
 /**
- * Transport that simulates the GCE metadata server for access tokens
+ * {@link Beta} <br/>
+ * Transport that simulates the GCE metadata server for access tokens.
  *
+ * @since 1.19
  */
+@Beta
 public class MockMetadataServerTransport extends MockHttpTransport {
 
-  private final static String METADATA_TOKEN_SERVER_URL =
+  private static final String METADATA_TOKEN_SERVER_URL =
       "http://metadata/computeMetadata/v1/instance/service-accounts/default/token";
 
-  private final static String METADATA_SERVER_URL = "http://metadata.google.internal";
+  private static final String METADATA_SERVER_URL = "http://metadata.google.internal";
 
 
   static final JsonFactory JSON_FACTORY = new JacksonFactory();
@@ -88,8 +92,7 @@ public LowLevelHttpResponse execute() throws IOException {
         }
       };
       return request;
-    }
-    else if (url.equals(METADATA_SERVER_URL)) {
+    } else if (url.equals(METADATA_SERVER_URL)) {
       MockLowLevelHttpRequest request = new MockLowLevelHttpRequest(url) {
         @Override
         public LowLevelHttpResponse execute() {

google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * {@link com.google.api.client.util.Beta} <br/>
+ * Test utilities for the {@code com.google.api.client.googleapis.compute} package.
+ *
+ * @since 1.19
+ */
+@com.google.api.client.util.Beta
+package com.google.api.client.googleapis.testing.compute;
+

google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * {@link com.google.api.client.util.Beta} <br/>
+ * Test utilities for the {@code com.google.api.client.googleapis} package.
+ *
+ * @since 1.19
+ */
+@com.google.api.client.util.Beta
+package com.google.api.client.googleapis.testing;
+