Skip to content

Commit

Permalink
Update gax (#1404)
Browse files Browse the repository at this point in the history 
* Update gax
* Update language
* Error reporting
* Logging
* Update pubsub
* Monitoring
* Speech, trace, vision
  • Loading branch information
@michaelbausor @garrettjonesgoogle
michaelbausor authored and garrettjonesgoogle committed Nov 17, 2016
1 parent e2bf4d4 commit 164878e
Show file tree
Hide file tree
Showing 47 changed files with 2,072 additions and 514 deletions.
2 changes: 1 addition & 1 deletion google-cloud-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>0.0.22</version>
<version>0.0.23</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
Expand Down
44 changes: 37 additions & 7 deletions ...ting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
*/
package com.google.cloud.errorreporting.spi.v1beta1;

import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.testing.MockGrpcService;
import com.google.api.gax.testing.MockServiceHelper;
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest;
import com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest;
import com.google.protobuf.GeneratedMessageV3;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.After;
Expand Down Expand Up @@ -79,9 +81,7 @@ public void getGroupTest() {
String name = "name3373707";
String groupId = "groupId506361563";
ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
expectedResponses.add(expectedResponse);
mockErrorGroupService.setResponses(expectedResponses);
mockErrorGroupService.addResponse(expectedResponse);

String formattedGroupName = ErrorGroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");

Expand All @@ -95,15 +95,29 @@ public void getGroupTest() {
Assert.assertEquals(formattedGroupName, actualRequest.getGroupName());
}

@Test
@SuppressWarnings("all")
public void getGroupExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
mockErrorGroupService.addException(exception);

try {
String formattedGroupName = ErrorGroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");

api.getGroup(formattedGroupName);
Assert.fail("No exception raised");
} catch (ApiException e) {
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
}
}

@Test
@SuppressWarnings("all")
public void updateGroupTest() {
String name = "name3373707";
String groupId = "groupId506361563";
ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
expectedResponses.add(expectedResponse);
mockErrorGroupService.setResponses(expectedResponses);
mockErrorGroupService.addResponse(expectedResponse);

ErrorGroup group = ErrorGroup.newBuilder().build();

Expand All @@ -116,4 +130,20 @@ public void updateGroupTest() {

Assert.assertEquals(group, actualRequest.getGroup());
}

@Test
@SuppressWarnings("all")
public void updateGroupExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
mockErrorGroupService.addException(exception);

try {
ErrorGroup group = ErrorGroup.newBuilder().build();

api.updateGroup(group);
Assert.fail("No exception raised");
} catch (ApiException e) {
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
}
}
}
66 changes: 56 additions & 10 deletions ...ting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;

import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.testing.MockGrpcService;
import com.google.api.gax.testing.MockServiceHelper;
import com.google.common.collect.Lists;
Expand All @@ -31,8 +32,9 @@
import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse;
import com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange;
import com.google.protobuf.GeneratedMessageV3;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.After;
Expand Down Expand Up @@ -94,9 +96,7 @@ public void listGroupStatsTest() {
.setNextPageToken(nextPageToken)
.addAllErrorGroupStats(errorGroupStats)
.build();
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
expectedResponses.add(expectedResponse);
mockErrorStatsService.setResponses(expectedResponses);
mockErrorStatsService.addResponse(expectedResponse);

String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
Expand All @@ -116,6 +116,23 @@ public void listGroupStatsTest() {
Assert.assertEquals(timeRange, actualRequest.getTimeRange());
}

@Test
@SuppressWarnings("all")
public void listGroupStatsExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
mockErrorStatsService.addException(exception);

try {
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();

api.listGroupStats(formattedProjectName, timeRange);
Assert.fail("No exception raised");
} catch (ApiException e) {
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
}
}

@Test
@SuppressWarnings("all")
public void listEventsTest() {
Expand All @@ -127,9 +144,7 @@ public void listEventsTest() {
.setNextPageToken(nextPageToken)
.addAllErrorEvents(errorEvents)
.build();
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
expectedResponses.add(expectedResponse);
mockErrorStatsService.setResponses(expectedResponses);
mockErrorStatsService.addResponse(expectedResponse);

String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
String groupId = "groupId506361563";
Expand All @@ -148,13 +163,28 @@ public void listEventsTest() {
Assert.assertEquals(groupId, actualRequest.getGroupId());
}

@Test
@SuppressWarnings("all")
public void listEventsExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
mockErrorStatsService.addException(exception);

try {
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
String groupId = "groupId506361563";

api.listEvents(formattedProjectName, groupId);
Assert.fail("No exception raised");
} catch (ApiException e) {
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
}
}

@Test
@SuppressWarnings("all")
public void deleteEventsTest() {
DeleteEventsResponse expectedResponse = DeleteEventsResponse.newBuilder().build();
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
expectedResponses.add(expectedResponse);
mockErrorStatsService.setResponses(expectedResponses);
mockErrorStatsService.addResponse(expectedResponse);

String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");

Expand All @@ -167,4 +197,20 @@ public void deleteEventsTest() {

Assert.assertEquals(formattedProjectName, actualRequest.getProjectName());
}

@Test
@SuppressWarnings("all")
public void deleteEventsExceptionTest() throws Exception {
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
mockErrorStatsService.addException(exception);

try {
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");

api.deleteEvents(formattedProjectName);
Assert.fail("No exception raised");
} catch (ApiException e) {
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
}
}
}
10 changes: 10 additions & 0 deletions ...ting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ public List<GeneratedMessageV3> getRequests() {
return serviceImpl.getRequests();
}

@Override
public void addResponse(GeneratedMessageV3 response) {
serviceImpl.addResponse(response);
}

@Override
public void addException(Exception exception) {
serviceImpl.addException(exception);
}

@Override
public void setResponses(List<GeneratedMessageV3> responses) {
serviceImpl.setResponses(responses);
Expand Down
41 changes: 30 additions & 11 deletions .../src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.google.cloud.errorreporting.spi.v1beta1;

import com.google.common.collect.Lists;
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc.ErrorGroupServiceImplBase;
import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest;
Expand All @@ -30,7 +29,7 @@
@javax.annotation.Generated("by GAPIC")
public class MockErrorGroupServiceImpl extends ErrorGroupServiceImplBase {
private ArrayList<GeneratedMessageV3> requests;
private Queue<GeneratedMessageV3> responses;
private Queue<Object> responses;

public MockErrorGroupServiceImpl() {
requests = new ArrayList<>();
Expand All @@ -41,8 +40,16 @@ public List<GeneratedMessageV3> getRequests() {
return requests;
}

public void addResponse(GeneratedMessageV3 response) {
responses.add(response);
}

public void setResponses(List<GeneratedMessageV3> responses) {
this.responses = Lists.newLinkedList(responses);
this.responses = new LinkedList<Object>(responses);
}

public void addException(Exception exception) {
responses.add(exception);
}

public void reset() {
Expand All @@ -52,17 +59,29 @@ public void reset() {

@Override
public void getGroup(GetGroupRequest request, StreamObserver<ErrorGroup> responseObserver) {
ErrorGroup response = (ErrorGroup) responses.remove();
requests.add(request);
responseObserver.onNext(response);
responseObserver.onCompleted();
Object response = responses.remove();
if (response instanceof ErrorGroup) {
requests.add(request);
responseObserver.onNext((ErrorGroup) response);
responseObserver.onCompleted();
} else if (response instanceof Exception) {
responseObserver.onError((Exception) response);
} else {
responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
}
}

@Override
public void updateGroup(UpdateGroupRequest request, StreamObserver<ErrorGroup> responseObserver) {
ErrorGroup response = (ErrorGroup) responses.remove();
requests.add(request);
responseObserver.onNext(response);
responseObserver.onCompleted();
Object response = responses.remove();
if (response instanceof ErrorGroup) {
requests.add(request);
responseObserver.onNext((ErrorGroup) response);
responseObserver.onCompleted();
} else if (response instanceof Exception) {
responseObserver.onError((Exception) response);
} else {
responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
}
}
}
10 changes: 10 additions & 0 deletions ...ting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ public List<GeneratedMessageV3> getRequests() {
return serviceImpl.getRequests();
}

@Override
public void addResponse(GeneratedMessageV3 response) {
serviceImpl.addResponse(response);
}

@Override
public void addException(Exception exception) {
serviceImpl.addException(exception);
}

@Override
public void setResponses(List<GeneratedMessageV3> responses) {
serviceImpl.setResponses(responses);
Expand Down
Loading

0 comments on commit 164878e

Please sign in to comment.