Skip to content

Commit abd0a48

Browse files
committed
use try catch for test
1 parent 6f7047e commit abd0a48

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

services/venice-controller/src/test/java/com/linkedin/venice/controller/TestVeniceParentHelixAdmin.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,7 @@ public void testRollForwardPartialFailure() {
32553255
verify(adminSpy, times(5)).getCurrentVersionsForMultiColos(clusterName, storeName);
32563256
}
32573257

3258-
@Test(expectedExceptions = AdminMessageConsumptionTimeoutException.class)
3258+
@Test
32593259
public void testDeleteStoreAdminMessageTimeout() {
32603260
VeniceParentHelixAdmin adminSpy = spy(parentAdmin);
32613261

@@ -3265,11 +3265,16 @@ public void testDeleteStoreAdminMessageTimeout() {
32653265
doReturn(store).when(internalAdmin).getStore(eq(clusterName), eq(storeName));
32663266
doReturn(store).when(internalAdmin).checkPreConditionForDeletion(eq(clusterName), eq(storeName));
32673267

3268-
AdminMessageConsumptionTimeoutException exception =
3268+
AdminMessageConsumptionTimeoutException expectedException =
32693269
new AdminMessageConsumptionTimeoutException("timed out!", new Exception());
3270-
doThrow(exception).when(adminSpy).sendAdminMessageAndWaitForConsumed(any(), any(), any());
3271-
adminSpy.deleteStore(clusterName, storeName, false, 0, true);
3272-
verify(adminSpy, times(1)).deleteAclsForStore(store, storeName);
3270+
doThrow(expectedException).when(adminSpy).sendAdminMessageAndWaitForConsumed(any(), any(), any());
3271+
try {
3272+
adminSpy.deleteStore(clusterName, storeName, false, 0, true);
3273+
Assert.fail("Delete store should time out");
3274+
} catch (AdminMessageConsumptionTimeoutException e) {
3275+
Assert.assertEquals(e, expectedException);
3276+
verify(adminSpy, times(1)).deleteAclsForStore(store, storeName);
3277+
}
32733278
}
32743279

32753280
private Store setupForStoreViewConfigUpdateTest(String storeName) {

0 commit comments

Comments
 (0)