Skip to content

Commit 9edc007

Browse files
feeblefakieKodaiD
feeblefakie
and
KodaiD
authored
Backport to branch(3.14) : Add a new line between ARRANGE and ACT/ASSERT sections in permission tests (#2997)
Co-authored-by: Kodai Doki <[email protected]>
1 parent c0d2248 commit 9edc007

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

‎integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminPermissionIntegrationTestBase.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public void getImportTableMetadata_WithSufficientPermission_ShouldSucceed()
120120
// Arrange
121121
createNamespaceByRoot();
122122
createTableByRoot();
123+
123124
// Act Assert
124125
assertThatCode(() -> adminForNormalUser.getImportTableMetadata(NAMESPACE, TABLE))
125126
.doesNotThrowAnyException();
@@ -131,6 +132,7 @@ public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed()
131132
// Arrange
132133
createNamespaceByRoot();
133134
createTableByRoot();
135+
134136
// Act Assert
135137
assertThatCode(
136138
() ->
@@ -142,6 +144,7 @@ public void addRawColumnToTable_WithSufficientPermission_ShouldSucceed()
142144
@Test
143145
public void createNamespace_WithSufficientPermission_ShouldSucceed() {
144146
// Arrange
147+
145148
// Act Assert
146149
assertThatCode(() -> adminForNormalUser.createNamespace(NAMESPACE, getCreationOptions()))
147150
.doesNotThrowAnyException();
@@ -151,6 +154,7 @@ public void createNamespace_WithSufficientPermission_ShouldSucceed() {
151154
public void createTable_WithSufficientPermission_ShouldSucceed() throws ExecutionException {
152155
// Arrange
153156
createNamespaceByRoot();
157+
154158
// Act Assert
155159
assertThatCode(
156160
() ->
@@ -164,6 +168,7 @@ public void dropTable_WithSufficientPermission_ShouldSucceed() throws ExecutionE
164168
// Arrange
165169
createNamespaceByRoot();
166170
createTableByRoot();
171+
167172
// Act Assert
168173
assertThatCode(() -> adminForNormalUser.dropTable(NAMESPACE, TABLE)).doesNotThrowAnyException();
169174
}
@@ -172,6 +177,7 @@ public void dropTable_WithSufficientPermission_ShouldSucceed() throws ExecutionE
172177
public void dropNamespace_WithSufficientPermission_ShouldSucceed() throws ExecutionException {
173178
// Arrange
174179
createNamespaceByRoot();
180+
175181
// Act Assert
176182
assertThatCode(() -> adminForNormalUser.dropNamespace(NAMESPACE, true))
177183
.doesNotThrowAnyException();
@@ -182,6 +188,7 @@ public void truncateTable_WithSufficientPermission_ShouldSucceed() throws Execut
182188
// Arrange
183189
createNamespaceByRoot();
184190
createTableByRoot();
191+
185192
// Act Assert
186193
assertThatCode(() -> adminForNormalUser.truncateTable(NAMESPACE, TABLE))
187194
.doesNotThrowAnyException();
@@ -192,6 +199,7 @@ public void createIndex_WithSufficientPermission_ShouldSucceed() throws Executio
192199
// Arrange
193200
createNamespaceByRoot();
194201
createTableByRoot();
202+
195203
// Act Assert
196204
assertThatCode(
197205
() -> adminForNormalUser.createIndex(NAMESPACE, TABLE, COL_NAME3, getCreationOptions()))
@@ -203,6 +211,7 @@ public void dropIndex_WithSufficientPermission_ShouldSucceed() throws ExecutionE
203211
// Arrange
204212
createNamespaceByRoot();
205213
createTableByRoot();
214+
206215
// Act Assert
207216
assertThatCode(() -> adminForNormalUser.dropIndex(NAMESPACE, TABLE, COL_NAME4))
208217
.doesNotThrowAnyException();
@@ -213,6 +222,7 @@ public void indexExists_WithSufficientPermission_ShouldSucceed() throws Executio
213222
// Arrange
214223
createNamespaceByRoot();
215224
createTableByRoot();
225+
216226
// Act Assert
217227
assertThatCode(() -> adminForNormalUser.indexExists(NAMESPACE, TABLE, COL_NAME4))
218228
.doesNotThrowAnyException();
@@ -223,6 +233,7 @@ public void getTableMetadata_WithSufficientPermission_ShouldSucceed() throws Exe
223233
// Arrange
224234
createNamespaceByRoot();
225235
createTableByRoot();
236+
226237
// Act Assert
227238
assertThatCode(() -> adminForNormalUser.getTableMetadata(NAMESPACE, TABLE))
228239
.doesNotThrowAnyException();
@@ -234,6 +245,7 @@ public void getNamespaceTableNames_WithSufficientPermission_ShouldSucceed()
234245
// Arrange
235246
createNamespaceByRoot();
236247
createTableByRoot();
248+
237249
// Act Assert
238250
assertThatCode(() -> adminForNormalUser.getNamespaceTableNames(NAMESPACE))
239251
.doesNotThrowAnyException();
@@ -244,6 +256,7 @@ public void namespaceExists_WithSufficientPermission_ShouldSucceed() throws Exec
244256
// Arrange
245257
createNamespaceByRoot();
246258
createTableByRoot();
259+
247260
// Act Assert
248261
assertThatCode(() -> adminForNormalUser.namespaceExists(NAMESPACE)).doesNotThrowAnyException();
249262
}
@@ -253,6 +266,7 @@ public void tableExists_WithSufficientPermission_ShouldSucceed() throws Executio
253266
// Arrange
254267
createNamespaceByRoot();
255268
createTableByRoot();
269+
256270
// Act Assert
257271
assertThatCode(() -> adminForNormalUser.tableExists(NAMESPACE, TABLE))
258272
.doesNotThrowAnyException();
@@ -270,6 +284,7 @@ public void repairTable_WithSufficientPermission_ShouldSucceed() throws Exceptio
270284
} finally {
271285
adminTestUtils.close();
272286
}
287+
273288
// Act Assert
274289
assertThatCode(
275290
() ->
@@ -284,6 +299,7 @@ public void addNewColumnToTable_WithSufficientPermission_ShouldSucceed()
284299
// Arrange
285300
createNamespaceByRoot();
286301
createTableByRoot();
302+
287303
// Act Assert
288304
assertThatCode(
289305
() ->
@@ -303,6 +319,7 @@ public void importTable_WithSufficientPermission_ShouldSucceed() throws Exceptio
303319
} finally {
304320
adminTestUtils.close();
305321
}
322+
306323
// Act Assert
307324
assertThatCode(() -> adminForNormalUser.importTable(NAMESPACE, TABLE, getCreationOptions()))
308325
.doesNotThrowAnyException();
@@ -312,6 +329,7 @@ public void importTable_WithSufficientPermission_ShouldSucceed() throws Exceptio
312329
public void getNamespaceNames_WithSufficientPermission_ShouldSucceed() throws ExecutionException {
313330
// Arrange
314331
createNamespaceByRoot();
332+
315333
// Act Assert
316334
assertThatCode(() -> adminForNormalUser.getNamespaceNames()).doesNotThrowAnyException();
317335
}

‎integration-test/src/main/java/com/scalar/db/api/DistributedStoragePermissionIntegrationTestBase.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public void get_WithSufficientPermission_ShouldSucceed() {
118118
.partitionKey(Key.ofInt(COL_NAME1, PARTITION_KEY_VALUE))
119119
.clusteringKey(Key.ofText(COL_NAME2, CLUSTERING_KEY_VALUE1))
120120
.build();
121+
121122
// Act Assert
122123
assertThatCode(() -> storageForNormalUser.get(get)).doesNotThrowAnyException();
123124
}
@@ -131,6 +132,7 @@ public void get_WithIndexKey_WithSufficientPermission_ShouldSucceed() {
131132
.table(TABLE)
132133
.indexKey(Key.ofInt("c3", INT_COLUMN_VALUE1))
133134
.build();
135+
134136
// Act Assert
135137
assertThatCode(() -> storageForNormalUser.get(get)).doesNotThrowAnyException();
136138
}
@@ -144,6 +146,7 @@ public void scan_WithSufficientPermission_ShouldSucceed() {
144146
.table(TABLE)
145147
.partitionKey(Key.ofInt(COL_NAME1, PARTITION_KEY_VALUE))
146148
.build();
149+
147150
// Act Assert
148151
assertThatCode(() -> storageForNormalUser.scan(scan).close()).doesNotThrowAnyException();
149152
}
@@ -157,6 +160,7 @@ public void scan_WithIndexKey_WithSufficientPermission_ShouldSucceed() {
157160
.table(TABLE)
158161
.indexKey(Key.ofInt("c3", INT_COLUMN_VALUE1))
159162
.build();
163+
160164
// Act Assert
161165
assertThatCode(() -> storageForNormalUser.scan(scan).close()).doesNotThrowAnyException();
162166
}
@@ -165,6 +169,7 @@ public void scan_WithIndexKey_WithSufficientPermission_ShouldSucceed() {
165169
public void scanAll_WithSufficientPermission_ShouldSucceed() {
166170
// Arrange
167171
Scan scan = Scan.newBuilder().namespace(namespace).table(TABLE).all().build();
172+
168173
// Act Assert
169174
assertThatCode(() -> storageForNormalUser.scan(scan).close()).doesNotThrowAnyException();
170175
}
@@ -173,6 +178,7 @@ public void scanAll_WithSufficientPermission_ShouldSucceed() {
173178
public void put_WithoutCondition_WithSufficientPermission_ShouldSucceed() {
174179
// Arrange
175180
Put put = createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE1, null);
181+
176182
// Act Assert
177183
assertThatCode(() -> storageForNormalUser.put(put)).doesNotThrowAnyException();
178184
}
@@ -182,6 +188,7 @@ public void put_WithPutIfNotExists_WithSufficientPermission_ShouldSucceed() {
182188
// Arrange
183189
Put putWithPutIfNotExists =
184190
createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE1, ConditionBuilder.putIfNotExists());
191+
185192
// Act Assert
186193
assertThatCode(() -> storageForNormalUser.put(putWithPutIfNotExists))
187194
.doesNotThrowAnyException();
@@ -195,6 +202,7 @@ public void put_WithPutIfExists_WithSufficientPermission_ShouldSucceed()
195202
storageForNormalUser.put(put);
196203
Put putWithPutIfExists =
197204
createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE2, ConditionBuilder.putIfExists());
205+
198206
// Act Assert
199207
assertThatCode(() -> storageForNormalUser.put(putWithPutIfExists)).doesNotThrowAnyException();
200208
}
@@ -221,6 +229,7 @@ public void put_WithMultiplePuts_WithSufficientPermission_ShouldSucceed() {
221229
// Arrange
222230
Put put1 = createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE1, null);
223231
Put put2 = createPut(CLUSTERING_KEY_VALUE2, INT_COLUMN_VALUE2, null);
232+
224233
// Act Assert
225234
assertThatCode(() -> storageForNormalUser.put(Arrays.asList(put1, put2)))
226235
.doesNotThrowAnyException();
@@ -230,6 +239,7 @@ public void put_WithMultiplePuts_WithSufficientPermission_ShouldSucceed() {
230239
public void delete_WithSufficientPermission_ShouldSucceed() {
231240
// Arrange
232241
Delete delete = createDelete(CLUSTERING_KEY_VALUE1, null);
242+
233243
// Act Assert
234244
assertThatCode(() -> storageForNormalUser.delete(delete)).doesNotThrowAnyException();
235245
}
@@ -241,6 +251,7 @@ public void delete_WithDeleteIfExists_WithSufficientPermission_ShouldSucceed()
241251
Put put = createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE1, null);
242252
storageForNormalUser.put(put);
243253
Delete delete = createDelete(CLUSTERING_KEY_VALUE1, ConditionBuilder.deleteIfExists());
254+
244255
// Act Assert
245256
assertThatCode(() -> storageForNormalUser.delete(delete)).doesNotThrowAnyException();
246257
}
@@ -266,6 +277,7 @@ public void delete_WithMultipleDeletes_WithSufficientPermission_ShouldSucceed()
266277
// Arrange
267278
Delete delete1 = createDelete(CLUSTERING_KEY_VALUE1, null);
268279
Delete delete2 = createDelete(CLUSTERING_KEY_VALUE2, null);
280+
269281
// Act Assert
270282
assertThatCode(() -> storageForNormalUser.delete(Arrays.asList(delete1, delete2)))
271283
.doesNotThrowAnyException();
@@ -276,6 +288,7 @@ public void mutate_WithSufficientPermission_ShouldSucceed() {
276288
// Arrange
277289
Put put = createPut(CLUSTERING_KEY_VALUE1, INT_COLUMN_VALUE1, null);
278290
Delete delete = createDelete(CLUSTERING_KEY_VALUE2, null);
291+
279292
// Act Assert
280293
assertThatCode(() -> storageForNormalUser.mutate(Arrays.asList(put, delete)))
281294
.doesNotThrowAnyException();

0 commit comments

Comments
 (0)