Skip to content

Commit fe0d5cb

Browse files
renovate-botaverikitsch
renovate-bot
and
averikitsch
authored
chore(deps): update dependency com.google.apis:google-api-services-cloudresourcemanager to v1-rev20200720-1.30.10 (GoogleCloudPlatform#3414)
* chore(deps): update dependency com.google.apis:google-api-services-cloudresourcemanager to v1-rev20200720-1.30.10 * Update tests * Update test string Co-authored-by: averikitsch <akitsch@google.com>
1 parent 7d72784 commit fe0d5cb

File tree

6 files changed

+44
-29
lines changed

6 files changed

+44
-29
lines changed

‎iam/api-client/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.google.apis</groupId>
5353
<artifactId>google-api-services-cloudresourcemanager</artifactId>
54-
<version>v1-rev20200622-1.30.10</version><!-- v1 required here, v2 is different - DO NOT UPDATE to v2 -->
54+
<version>v1-rev20200720-1.30.10</version><!-- v1 required here, v2 is different - DO NOT UPDATE to v2 -->
5555
</dependency>
5656
<dependency>
5757
<groupId>commons-cli</groupId>
@@ -72,6 +72,12 @@
7272
<version>1.0.1</version>
7373
<scope>test</scope>
7474
</dependency>
75+
<dependency>
76+
<groupId>org.hamcrest</groupId>
77+
<artifactId>hamcrest-library</artifactId>
78+
<version>2.2</version>
79+
<scope>test</scope>
80+
</dependency>
7581
</dependencies>
7682

7783
<build>

‎iam/api-client/src/test/java/iam/snippets/AccessTests.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
package iam.snippets;
1717

18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
import static org.hamcrest.core.StringContains.containsString;
1820
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertTrue;
2021

2122
import com.google.api.services.cloudresourcemanager.model.Binding;
2223
import com.google.api.services.cloudresourcemanager.model.Policy;
@@ -76,45 +77,49 @@ public void tearDown() {
7677
public void testGetPolicy() {
7778
GetPolicy.getPolicy(PROJECT_ID);
7879
String got = bout.toString();
79-
assertTrue(got.contains("Policy retrieved: "));
80+
assertThat(got, containsString("Policy retrieved: "));
8081
}
8182

8283
@Test
8384
public void testSetPolicy() {
8485
Policy policy = GetPolicy.getPolicy(PROJECT_ID);
8586
SetPolicy.setPolicy(policy, PROJECT_ID);
8687
String got = bout.toString();
87-
assertTrue(got.contains("Policy set: "));
88+
assertThat(got, containsString("Policy retrieved: "));
8889
}
8990

9091
@Test
9192
public void testAddBinding() {
9293
AddBinding.addBinding(policyMock);
9394
String got = bout.toString();
94-
assertTrue(got.contains("Added binding: "));
95+
assertThat(got, containsString("Added binding: "));
9596
}
9697

9798
@Test
9899
public void testAddMember() {
99100
AddMember.addMember(policyMock);
100101
String got = bout.toString();
101-
assertTrue(
102-
got.contains("Member user:member-to-add@example.com added to role roles/existing-role"));
102+
assertThat(
103+
got,
104+
containsString("Member user:member-to-add@example.com added to role roles/existing-role"));
103105
}
104106

105107
@Test
106108
public void testRemoveMember() {
107109
RemoveMember.removeMember(policyMock);
108110
String got = bout.toString();
109-
assertTrue(
110-
got.contains("Member user:member-to-remove@example.com removed from roles/existing-role"));
111+
assertThat(
112+
got,
113+
containsString(
114+
"Member user:member-to-remove@example.com removed from roles/existing-role"));
111115
}
112116

113117
@Test
114118
public void testTestPermissions() {
115119
TestPermissions.testPermissions(PROJECT_ID);
116120
String got = bout.toString();
117-
assertTrue(
118-
got.contains("Of the permissions listed in the request, the caller has the following: "));
121+
assertThat(
122+
got,
123+
containsString("Of the permissions listed in the request, the caller has the following: "));
119124
}
120125
}

‎iam/api-client/src/test/java/iam/snippets/GrantableRolesIT.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
package iam.snippets;
1717

18-
import static org.junit.Assert.assertTrue;
18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
import static org.hamcrest.core.StringContains.containsString;
1920

2021
import java.io.ByteArrayOutputStream;
2122
import java.io.PrintStream;
@@ -46,6 +47,6 @@ public void testQuickstart() throws Exception {
4647
GrantableRoles.main(new String[] {resource});
4748

4849
String got = bout.toString();
49-
assertTrue(got.contains("Title"));
50+
assertThat(got, containsString("Title"));
5051
}
5152
}

‎iam/api-client/src/test/java/iam/snippets/QuickstartIT.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
package iam.snippets;
1717

18-
import static org.junit.Assert.assertTrue;
18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
import static org.hamcrest.core.StringContains.containsString;
1920

2021
import java.io.ByteArrayOutputStream;
2122
import java.io.PrintStream;
@@ -43,6 +44,6 @@ public void testQuickstart() throws Exception {
4344
Quickstart.main(new String[0]);
4445

4546
String got = bout.toString();
46-
assertTrue(got.contains("Title"));
47+
assertThat(got, containsString("Title"));
4748
}
4849
}

‎iam/api-client/src/test/java/iam/snippets/QuickstartV2Tests.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515

1616
package iam.snippets;
1717

18-
import static org.junit.Assert.assertFalse;
18+
import static org.hamcrest.CoreMatchers.not;
19+
import static org.hamcrest.MatcherAssert.assertThat;
20+
import static org.hamcrest.core.IsCollectionContaining.hasItem;
1921
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.assertTrue;
2122

2223
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2324
import com.google.api.client.json.jackson2.JacksonFactory;
@@ -134,7 +135,7 @@ public void testQuickstart() throws Exception {
134135
break;
135136
}
136137
}
137-
assertTrue(binding.getMembers().contains(member));
138+
assertThat(binding.getMembers(), hasItem(member));
138139

139140
// Tests removeMember()
140141
QuickstartV2.removeMember(crmService, PROJECT_ID, member, role);
@@ -149,7 +150,7 @@ public void testQuickstart() throws Exception {
149150
}
150151
}
151152
if (binding != null) {
152-
assertFalse(binding.getMembers().contains(member));
153+
assertThat(binding.getMembers(), not(hasItem(member)));
153154
}
154155
}
155156
}

‎iam/api-client/src/test/java/iam/snippets/ServiceAccountTests.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
package iam.snippets;
1717

18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
import static org.hamcrest.core.StringContains.containsString;
1820
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertTrue;
2021

2122
import java.io.ByteArrayOutputStream;
2223
import java.io.PrintStream;
@@ -64,62 +65,62 @@ public void tearDown() {
6465
public void stage1_testServiceAccountCreate() {
6566
CreateServiceAccount.createServiceAccount(PROJECT_ID);
6667
String got = bout.toString();
67-
assertTrue(got.contains("Created service account: your-service-account-name"));
68+
assertThat(got, containsString("Created service account: your-service-account-name"));
6869
}
6970

7071
@Test
7172
public void stage1_testServiceAccountsList() {
7273
ListServiceAccounts.listServiceAccounts(PROJECT_ID);
7374
String got = bout.toString();
74-
assertTrue(got.matches("(Name:.*\nDisplay Name:.*\nEmail.*\n\n)*"));
75+
assertThat(got, containsString("Display Name:"));
7576
}
7677

7778
@Test
7879
public void stage2_testServiceAccountRename() {
7980
RenameServiceAccount.renameServiceAccount(PROJECT_ID);
8081
String got = bout.toString();
81-
assertTrue(got.contains("Updated display name"));
82+
assertThat(got, containsString("Updated display name"));
8283
}
8384

8485
@Test
8586
public void stage2_testServiceAccountKeyCreate() {
8687
CreateServiceAccountKey.createKey(PROJECT_ID);
8788
String got = bout.toString();
88-
assertTrue(got.contains("Created key:"));
89+
assertThat(got, containsString("Created key:"));
8990
}
9091

9192
@Test
9293
public void stage2_testServiceAccountKeysList() {
9394
ListServiceAccountKeys.listKeys(PROJECT_ID);
9495
String got = bout.toString();
95-
assertTrue(got.contains("Key:"));
96+
assertThat(got, containsString("Key:"));
9697
}
9798

9899
@Test
99100
public void stage3_testServiceAccountKeyDelete() {
100101
DeleteServiceAccountKey.deleteKey(PROJECT_ID);
101102
String got = bout.toString();
102-
assertTrue(got.contains("Deleted key:"));
103+
assertThat(got, containsString("Deleted key:"));
103104
}
104105

105106
@Test
106107
public void stage4_testDisableServiceAccount() {
107108
DisableServiceAccount.disableServiceAccount(PROJECT_ID);
108109
String got = bout.toString();
109-
assertTrue(got.contains("Disabled service account:"));
110+
assertThat(got, containsString("Disabled service account:"));
110111
}
111112

112113
@Test
113114
public void stage5_testEnableServiceAccount() {
114115
EnableServiceAccount.enableServiceAccount(PROJECT_ID);
115116
String got = bout.toString();
116-
assertTrue(got.contains("Enabled service account:"));
117+
assertThat(got, containsString("Enabled service account:"));
117118
}
118119

119120
@Test
120121
public void stage6_testServiceAccountDelete() {
121122
DeleteServiceAccount.deleteServiceAccount(PROJECT_ID);
122123
String got = bout.toString();
123-
assertTrue(got.contains("Deleted service account:"));
124+
assertThat(got, containsString("Deleted service account:"));
124125
}
125126
}

0 commit comments

Comments
 (0)