FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: Replace deprecated method with non-deprecated one (#279) · googleapis/google-cloud-java@754b14c · GitHub

/ google-cloud-java Public

Commit 754b14c

Browse files
irvifa
authored
test: Replace deprecated method with non-deprecated one (#279)
Since we have several deprecated method in the ITPubSubTest, I think we can begin to migrate it to non-deprecated method one.
1 parent 0af4474 commit 754b14c

1 file changed

Lines changed: 54 additions & 15 deletions

File tree

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java‎

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@
3030
import com.google.cloud.pubsub.v1.TopicAdminClient;
3131
import com.google.common.util.concurrent.MoreExecutors;
3232
import com.google.iam.v1.Binding;
33+
import com.google.iam.v1.GetIamPolicyRequest;
3334
import com.google.iam.v1.Policy;
35+
import com.google.iam.v1.SetIamPolicyRequest;
36+
import com.google.iam.v1.TestIamPermissionsRequest;
3437
import com.google.protobuf.ByteString;
3538
import com.google.pubsub.v1.ProjectSubscriptionName;
36-
import com.google.pubsub.v1.ProjectTopicName;
3739
import com.google.pubsub.v1.PubsubMessage;
3840
import com.google.pubsub.v1.PushConfig;
41+
import com.google.pubsub.v1.Subscription;
42+
import com.google.pubsub.v1.TopicName;
3943
import java.util.Collections;
4044
import java.util.List;
4145
import java.util.UUID;
@@ -89,23 +93,50 @@ private String formatForTest(String resourceName) {
8993
return resourceName + "-" + NAME_SUFFIX;
9094
}
9195

96+
private Subscription getSubscription(
97+
ProjectSubscriptionName subscriptionName,
98+
TopicName topicName,
99+
PushConfig pushConfig,
100+
int ackDeadline) {
101+
return Subscription.newBuilder()
102+
.setName(subscriptionName.toString())
103+
.setTopic(topicName.toString())
104+
.setPushConfig(pushConfig)
105+
.setAckDeadlineSeconds(ackDeadline)
106+
.build();
107+
}
108+
92109
@Test
93110
public void testTopicPolicy() {
94-
ProjectTopicName topicName =
95-
ProjectTopicName.of(projectId, formatForTest("testing-topic-policy"));
111+
TopicName topicName =
112+
TopicName.newBuilder()
113+
.setProject(projectId)
114+
.setTopic(formatForTest("testing-topic-policy"))
115+
.build();
96116
topicAdminClient.createTopic(topicName);
97-
Policy policy = topicAdminClient.getIamPolicy(topicName.toString());
117+
118+
Policy policy =
119+
topicAdminClient.getIamPolicy(
120+
GetIamPolicyRequest.newBuilder().setResource(topicName.toString()).build());
98121
Binding binding =
99122
Binding.newBuilder().setRole("roles/viewer").addMembers("allAuthenticatedUsers").build();
123+
100124
Policy newPolicy =
101125
topicAdminClient.setIamPolicy(
102-
topicName.toString(), policy.toBuilder().addBindings(binding).build());
126+
SetIamPolicyRequest.newBuilder()
127+
.setResource(topicName.toString())
128+
.setPolicy(policy.toBuilder().addBindings(binding).build())
129+
.build());
103130
assertThat(newPolicy.getBindingsList()).contains(binding);
104131

105132
String permissionName = "pubsub.topics.get";
106133
List<String> permissions =
107134
topicAdminClient
108-
.testIamPermissions(topicName.toString(), Collections.singletonList(permissionName))
135+
.testIamPermissions(
136+
TestIamPermissionsRequest.newBuilder()
137+
.setResource(topicName.toString())
138+
.addAllPermissions(Collections.singletonList(permissionName))
139+
.build())
109140
.getPermissionsList();
110141
assertThat(permissions).contains(permissionName);
111142

@@ -115,19 +146,23 @@ public void testTopicPolicy() {
115146
@Test
116147
public void testVPCPushSubscriber() {
117148
assumeTrue(IS_VPC_TEST);
118-
ProjectTopicName topicName =
119-
ProjectTopicName.of(projectId, formatForTest("testing-vpc-push-subscriber-topic"));
149+
TopicName topicName =
150+
TopicName.newBuilder()
151+
.setProject(projectId)
152+
.setTopic(formatForTest("testing-vpc-push-subscriber-topic"))
153+
.build();
120154
ProjectSubscriptionName subscriptionName =
121155
ProjectSubscriptionName.of(
122156
projectId, formatForTest("testing-vpc-push-subscriber-subscription"));
123157
topicAdminClient.createTopic(topicName);
124158

125159
try {
126160
subscriptionAdminClient.createSubscription(
127-
subscriptionName,
128-
topicName,
129-
PushConfig.newBuilder().setPushEndpoint("https://random_point").build(),
130-
10);
161+
getSubscription(
162+
subscriptionName,
163+
topicName,
164+
PushConfig.newBuilder().setPushEndpoint("https://random_point").build(),
165+
10));
131166
subscriptionAdminClient.deleteSubscription(subscriptionName);
132167
Assert.fail("No exception raised");
133168
} catch (PermissionDeniedException e) {
@@ -139,15 +174,19 @@ public void testVPCPushSubscriber() {
139174

140175
@Test
141176
public void testPublishSubscribe() throws Exception {
142-
ProjectTopicName topicName =
143-
ProjectTopicName.of(projectId, formatForTest("testing-publish-subscribe-topic"));
177+
TopicName topicName =
178+
TopicName.newBuilder()
179+
.setProject(projectId)
180+
.setTopic(formatForTest("testing-publish-subscribe-topic"))
181+
.build();
144182
ProjectSubscriptionName subscriptionName =
145183
ProjectSubscriptionName.of(
146184
projectId, formatForTest("testing-publish-subscribe-subscription"));
147185

148186
topicAdminClient.createTopic(topicName);
187+
149188
subscriptionAdminClient.createSubscription(
150-
subscriptionName, topicName, PushConfig.newBuilder().build(), 10);
189+
getSubscription(subscriptionName, topicName, PushConfig.newBuilder().build(), 10));
151190

152191
final BlockingQueue<Object> receiveQueue = new LinkedBlockingQueue<>();
153192
Subscriber subscriber =

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL