Skip to content

Commit 8916def

Browse files
Fixed test
1 parent c501fe4 commit 8916def

File tree

1 file changed

+29
-6
lines changed

1 file changed

+29
-6
lines changed

compute/cloud-client/src/test/java/compute/disks/ConsistencyGroupIT.java

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.cloud.compute.v1.ResourcePolicy;
3434
import compute.disks.consistencygroup.AddDiskToConsistencyGroup;
3535
import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
36+
import compute.disks.consistencygroup.DeleteDiskConsistencyGroup;
3637
import compute.disks.consistencygroup.RemoveDiskFromConsistencyGroup;
3738
import org.junit.jupiter.api.Test;
3839
import org.junit.jupiter.api.Timeout;
@@ -41,7 +42,7 @@
4142
import org.mockito.MockedStatic;
4243

4344
@RunWith(JUnit4.class)
44-
@Timeout(value = 15)
45+
@Timeout(value = 20)
4546
public class ConsistencyGroupIT {
4647
private static final String PROJECT_ID = "project-id";
4748
private static final String REGION = "asia-east1";
@@ -69,14 +70,13 @@ public void testCreateDiskConsistencyGroupResourcePolicy() throws Exception {
6970
when(mockFuture.get()).thenReturn(operation);
7071
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
7172

72-
7373
Operation.Status status = CreateDiskConsistencyGroup.createDiskConsistencyGroup(
7474
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
7575

7676
verify(mockClient, times(1))
7777
.insertAsync(PROJECT_ID, REGION, resourcePolicy);
7878
verify(mockFuture, times(1)).get();
79-
assertEquals(status, Operation.Status.DONE);
79+
assertEquals(Operation.Status.DONE, status);
8080
}
8181
}
8282

@@ -94,14 +94,13 @@ public void testAddRegionalDiskToConsistencyGroup() throws Exception {
9494
when(mockFuture.get()).thenReturn(operation);
9595
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
9696

97-
9897
Operation.Status status = AddDiskToConsistencyGroup.addDiskToConsistencyGroup(
9998
PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME, REGION);
10099

101100
verify(mockClient, times(1))
102101
.addResourcePoliciesAsync(any(AddResourcePoliciesRegionDiskRequest.class));
103102
verify(mockFuture, times(1)).get();
104-
assertEquals(status, Operation.Status.DONE);
103+
assertEquals(Operation.Status.DONE, status);
105104
}
106105
}
107106

@@ -125,7 +124,31 @@ public void testRemoveDiskFromConsistencyGroup() throws Exception {
125124
verify(mockClient, times(1))
126125
.removeResourcePoliciesAsync(any(RemoveResourcePoliciesRegionDiskRequest.class));
127126
verify(mockFuture, times(1)).get();
128-
assertEquals(status, Operation.Status.DONE);
127+
assertEquals(Operation.Status.DONE, status);
128+
}
129+
}
130+
131+
@Test
132+
public void testDeleteDiskConsistencyGroup() throws Exception {
133+
try (MockedStatic<ResourcePoliciesClient> mockedResourcePoliciesClient =
134+
mockStatic(ResourcePoliciesClient.class)) {
135+
Operation operation = mock(Operation.class);
136+
ResourcePoliciesClient mockClient = mock(ResourcePoliciesClient.class);
137+
OperationFuture mockFuture = mock(OperationFuture.class);
138+
139+
mockedResourcePoliciesClient.when(ResourcePoliciesClient::create).thenReturn(mockClient);
140+
when(mockClient.deleteAsync(PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME))
141+
.thenReturn(mockFuture);
142+
when(mockFuture.get()).thenReturn(operation);
143+
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
144+
145+
Operation.Status status = DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup(
146+
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
147+
148+
verify(mockClient, times(1))
149+
.deleteAsync(PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
150+
verify(mockFuture, times(1)).get();
151+
assertEquals(Operation.Status.DONE, status);
129152
}
130153
}
131154
}

0 commit comments

Comments
 (0)