Removing devtools from package, refreshing tests

garrettjonesgoogle · garrettjonesgoogle · commit 28f216ed8900 · 2016-08-26T17:03:37.000-07:00
diff --git a/gcloud-java-core/pom.xml b/gcloud-java-core/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
-      <version>0.0.15</version>
+      <version>0.0.16</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
diff --git a/gcloud-java-errorreporting/pom.xml b/gcloud-java-errorreporting/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.2.8-SNAPSHOT</version>
+    <version>0.2.9-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>gcloud-java-errorreporting</site.installationModule>
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.grpc.ApiCallable;
 import com.google.api.gax.protobuf.PathTemplate;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.ConnectionSettings;
 import com.google.api.gax.core.RetrySettings;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.PageAccessor;
 import com.google.api.gax.grpc.ApiCallable;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.ConnectionSettings;
 import com.google.api.gax.core.RetrySettings;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.grpc.ApiCallable;
 import com.google.api.gax.protobuf.PathTemplate;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.ConnectionSettings;
 import com.google.api.gax.core.RetrySettings;
diff --git a/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java b/gcloud-java-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java
@@ -68,4 +68,4 @@
  * </pre>
  *
  */
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceTest.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceTest.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.PageAccessor;
 import com.google.api.gax.testing.MockGrpcService;
@@ -24,23 +24,33 @@
 import com.google.protobuf.GeneratedMessage;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import junit.framework.Assert;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 @javax.annotation.Generated("by GAPIC")
 public class ErrorGroupServiceTest {
+  private static MockErrorGroupService mockErrorGroupService;
+  private static MockErrorStatsService mockErrorStatsService;
+  private static MockReportErrorsService mockReportErrorsService;
   private static MockServiceHelper serviceHelper;
   private ErrorGroupServiceApi api;
 
   @BeforeClass
   public static void startStaticServer() {
-    MockErrorGroupService mockService = new MockErrorGroupService();
-    serviceHelper = new MockServiceHelper("in-process-1", mockService);
+    mockErrorGroupService = new MockErrorGroupService();
+    mockErrorStatsService = new MockErrorStatsService();
+    mockReportErrorsService = new MockReportErrorsService();
+    serviceHelper =
+        new MockServiceHelper(
+            "in-process-1",
+            Arrays.<MockGrpcService>asList(
+                mockErrorGroupService, mockErrorStatsService, mockReportErrorsService));
     serviceHelper.start();
   }
 
@@ -67,38 +77,44 @@ public void tearDown() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getGroupTest() {
-    ErrorGroup expectedResponse = ErrorGroup.newBuilder().build();
+    String name = "name3373707";
+    String groupId = "groupId506361563";
+    ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
     List<GeneratedMessage> expectedResponses = new ArrayList<>();
     expectedResponses.add(expectedResponse);
-    serviceHelper.getService().setResponses(expectedResponses);
+    mockErrorGroupService.setResponses(expectedResponses);
 
     String formattedGroupName = ErrorGroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");
+
     ErrorGroup actualResponse = api.getGroup(formattedGroupName);
     Assert.assertEquals(expectedResponse, actualResponse);
 
-    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    List<GeneratedMessage> actualRequests = mockErrorGroupService.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     GetGroupRequest actualRequest = (GetGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(actualRequest.getGroupName(), formattedGroupName);
+    Assert.assertEquals(formattedGroupName, actualRequest.getGroupName());
   }
 
   @Test
   @SuppressWarnings("all")
   public void updateGroupTest() {
-    ErrorGroup expectedResponse = ErrorGroup.newBuilder().build();
+    String name = "name3373707";
+    String groupId = "groupId506361563";
+    ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
     List<GeneratedMessage> expectedResponses = new ArrayList<>();
     expectedResponses.add(expectedResponse);
-    serviceHelper.getService().setResponses(expectedResponses);
+    mockErrorGroupService.setResponses(expectedResponses);
 
     ErrorGroup group = ErrorGroup.newBuilder().build();
+
     ErrorGroup actualResponse = api.updateGroup(group);
     Assert.assertEquals(expectedResponse, actualResponse);
 
-    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    List<GeneratedMessage> actualRequests = mockErrorGroupService.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     UpdateGroupRequest actualRequest = (UpdateGroupRequest) actualRequests.get(0);
 
-    Assert.assertEquals(actualRequest.getGroup(), group);
+    Assert.assertEquals(group, actualRequest.getGroup());
   }
 }
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceTest.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceTest.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.core.PageAccessor;
 import com.google.api.gax.testing.MockGrpcService;
@@ -30,23 +30,33 @@
 import com.google.protobuf.GeneratedMessage;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import junit.framework.Assert;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 @javax.annotation.Generated("by GAPIC")
 public class ErrorStatsServiceTest {
+  private static MockErrorGroupService mockErrorGroupService;
+  private static MockErrorStatsService mockErrorStatsService;
+  private static MockReportErrorsService mockReportErrorsService;
   private static MockServiceHelper serviceHelper;
   private ErrorStatsServiceApi api;
 
   @BeforeClass
   public static void startStaticServer() {
-    MockErrorStatsService mockService = new MockErrorStatsService();
-    serviceHelper = new MockServiceHelper("in-process-1", mockService);
+    mockErrorGroupService = new MockErrorGroupService();
+    mockErrorStatsService = new MockErrorStatsService();
+    mockReportErrorsService = new MockReportErrorsService();
+    serviceHelper =
+        new MockServiceHelper(
+            "in-process-1",
+            Arrays.<MockGrpcService>asList(
+                mockErrorGroupService, mockErrorStatsService, mockReportErrorsService));
     serviceHelper.start();
   }
 
@@ -73,52 +83,70 @@ public void tearDown() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void listGroupStatsTest() {
-    ListGroupStatsResponse expectedResponse = ListGroupStatsResponse.newBuilder().build();
+    ErrorGroupStats errorGroupStatsElement = ErrorGroupStats.newBuilder().build();
+    List<ErrorGroupStats> errorGroupStats = Arrays.asList(errorGroupStatsElement);
+    String nextPageToken = "nextPageToken-1530815211";
+    ListGroupStatsResponse expectedResponse =
+        ListGroupStatsResponse.newBuilder()
+            .addAllErrorGroupStats(errorGroupStats)
+            .setNextPageToken(nextPageToken)
+            .build();
     List<GeneratedMessage> expectedResponses = new ArrayList<>();
     expectedResponses.add(expectedResponse);
-    serviceHelper.getService().setResponses(expectedResponses);
+    mockErrorStatsService.setResponses(expectedResponses);
 
     String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
     QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
+
     PageAccessor<ErrorGroupStats> pageAccessor =
         api.listGroupStats(formattedProjectName, timeRange);
 
     // PageAccessor will not make actual request until it is being used.
     // Add all the pages here in order to make grpc requests.
     List<ErrorGroupStats> resources = Lists.newArrayList(pageAccessor.getPageValues());
-    Assert.assertEquals(0, resources.size());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getErrorGroupStatsList().get(0), resources.get(0));
 
-    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    List<GeneratedMessage> actualRequests = mockErrorStatsService.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ListGroupStatsRequest actualRequest = (ListGroupStatsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(actualRequest.getProjectName(), formattedProjectName);
-    Assert.assertEquals(actualRequest.getTimeRange(), timeRange);
+    Assert.assertEquals(formattedProjectName, actualRequest.getProjectName());
+    Assert.assertEquals(timeRange, actualRequest.getTimeRange());
   }
 
   @Test
   @SuppressWarnings("all")
   public void listEventsTest() {
-    ListEventsResponse expectedResponse = ListEventsResponse.newBuilder().build();
+    ErrorEvent errorEventsElement = ErrorEvent.newBuilder().build();
+    List<ErrorEvent> errorEvents = Arrays.asList(errorEventsElement);
+    String nextPageToken = "nextPageToken-1530815211";
+    ListEventsResponse expectedResponse =
+        ListEventsResponse.newBuilder()
+            .addAllErrorEvents(errorEvents)
+            .setNextPageToken(nextPageToken)
+            .build();
     List<GeneratedMessage> expectedResponses = new ArrayList<>();
     expectedResponses.add(expectedResponse);
-    serviceHelper.getService().setResponses(expectedResponses);
+    mockErrorStatsService.setResponses(expectedResponses);
 
     String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
-    String groupId = "";
+    String groupId = "groupId506361563";
+
     PageAccessor<ErrorEvent> pageAccessor = api.listEvents(formattedProjectName, groupId);
 
     // PageAccessor will not make actual request until it is being used.
     // Add all the pages here in order to make grpc requests.
     List<ErrorEvent> resources = Lists.newArrayList(pageAccessor.getPageValues());
-    Assert.assertEquals(0, resources.size());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getErrorEventsList().get(0), resources.get(0));
 
-    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    List<GeneratedMessage> actualRequests = mockErrorStatsService.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ListEventsRequest actualRequest = (ListEventsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(actualRequest.getProjectName(), formattedProjectName);
-    Assert.assertEquals(actualRequest.getGroupId(), groupId);
+    Assert.assertEquals(formattedProjectName, actualRequest.getProjectName());
+    Assert.assertEquals(groupId, actualRequest.getGroupId());
   }
 
   @Test
@@ -127,16 +155,17 @@ public void deleteEventsTest() {
     DeleteEventsResponse expectedResponse = DeleteEventsResponse.newBuilder().build();
     List<GeneratedMessage> expectedResponses = new ArrayList<>();
     expectedResponses.add(expectedResponse);
-    serviceHelper.getService().setResponses(expectedResponses);
+    mockErrorStatsService.setResponses(expectedResponses);
 
     String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
+
     DeleteEventsResponse actualResponse = api.deleteEvents(formattedProjectName);
     Assert.assertEquals(expectedResponse, actualResponse);
 
-    List<GeneratedMessage> actualRequests = serviceHelper.getService().getRequests();
+    List<GeneratedMessage> actualRequests = mockErrorStatsService.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     DeleteEventsRequest actualRequest = (DeleteEventsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(actualRequest.getProjectName(), formattedProjectName);
+    Assert.assertEquals(formattedProjectName, actualRequest.getProjectName());
   }
 }
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.testing.MockGrpcService;
 import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.common.collect.Lists;
 import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.testing.MockGrpcService;
 import com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceGrpc;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsServiceImpl.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsServiceImpl.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.common.collect.Lists;
 import com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.api.gax.testing.MockGrpcService;
 import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceGrpc;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsServiceImpl.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsServiceImpl.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;
+package com.google.cloud.errorreporting.spi.v1beta1;
 
 import com.google.common.collect.Lists;
 import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest;
diff --git a/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceTest.java b/gcloud-java-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@`
`68`	`68`	`* </pre>`
`69`	`69`	`*`
`70`	`70`	`*/`
`71`		`-package com.google.cloud.devtools.clouderrorreporting.spi.v1beta1;`
	`71`	`+package com.google.cloud.errorreporting.spi.v1beta1;`