Skip to content

Commit 6ac1730

Browse files
Pearl1594DaanHoogland
Pearl1594
authored and
DaanHoogland
committed
fix test issues identified by errorprone
1 parent d60ef69 commit 6ac1730

File tree

21 files changed

+70
-72
lines changed

21 files changed

+70
-72
lines changed

‎core/src/test/java/com/cloud/resource/ServerResourceBaseTest.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,36 +182,36 @@ public void tryToAutoDiscoverResourcePrivateNetworkInterfaceTestReturnNic() thro
182182
@Test
183183
public void defineResourceNetworkInterfacesTestUseXenbr0WhenPrivateNetworkInterfaceNotConfigured() {
184184
Map<String, Object> params = createParamsMap(null, "cloudbr1", "cloudbr2", "cloudbr3");
185-
try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {
186-
Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
185+
try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {
186+
mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
187187

188188
serverResourceBaseSpy.defineResourceNetworkInterfaces(params);
189189

190-
verifyAndAssertNetworkInterfaces("xenbr0", "cloudbr1", "cloudbr2", "cloudbr3");
190+
verifyAndAssertNetworkInterfaces(mockedNetUtils, "xenbr0", "cloudbr1", "cloudbr2", "cloudbr3");
191191
}
192192
}
193193

194194
@Test
195195
public void defineResourceNetworkInterfacesTestUseXenbr1WhenPublicNetworkInterfaceNotConfigured() {
196196
Map<String, Object> params = createParamsMap("cloudbr0", null, "cloudbr2", "cloudbr3");
197-
try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {
198-
Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
197+
try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {
198+
mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
199199

200200
serverResourceBaseSpy.defineResourceNetworkInterfaces(params);
201201

202-
verifyAndAssertNetworkInterfaces("cloudbr0", "xenbr1", "cloudbr2", "cloudbr3");
202+
verifyAndAssertNetworkInterfaces(mockedNetUtils, "cloudbr0", "xenbr1", "cloudbr2", "cloudbr3");
203203
}
204204
}
205205

206206
@Test
207207
public void defineResourceNetworkInterfacesTestUseConfiguredNetworkInterfaces() {
208208
Map<String, Object> params = createParamsMap("cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");
209-
try (MockedStatic<NetUtils> ignored = Mockito.mockStatic(NetUtils.class)) {
210-
Mockito.when(NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
209+
try (MockedStatic<NetUtils> mockedNetUtils = Mockito.mockStatic(NetUtils.class)) {
210+
mockedNetUtils.when(() -> NetUtils.getNetworkInterface(Mockito.anyString())).thenReturn(networkInterfaceMock1, networkInterfaceMock2, networkInterfaceMock3, networkInterfaceMock4);
211211

212212
serverResourceBaseSpy.defineResourceNetworkInterfaces(params);
213213

214-
verifyAndAssertNetworkInterfaces("cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");
214+
verifyAndAssertNetworkInterfaces(mockedNetUtils, "cloudbr0", "cloudbr1", "cloudbr2", "cloudbr3");
215215
}
216216
}
217217

@@ -224,9 +224,8 @@ private Map<String, Object> createParamsMap(String... params) {
224224
return result;
225225
}
226226

227-
private void verifyAndAssertNetworkInterfaces(String... expectedResults) {
228-
Mockito.verify(NetUtils.class, Mockito.times(4));
229-
NetUtils.getNetworkInterface(keyCaptor.capture());
227+
private void verifyAndAssertNetworkInterfaces(MockedStatic<NetUtils> mockedNetUtils, String... expectedResults) {
228+
mockedNetUtils.verify(() -> NetUtils.getNetworkInterface(keyCaptor.capture()), Mockito.times(4));
230229
List<String> keys = keyCaptor.getAllValues();
231230

232231
for (int i = 0; i < expectedResults.length; i++) {

‎plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.junit.After;
4141
import org.junit.Assert;
4242
import org.junit.Before;
43+
import org.junit.Ignore;
4344
import org.junit.Test;
4445

4546
import com.google.common.io.Files;
@@ -248,6 +249,7 @@ public final void testGetVmStatsCommand() {
248249
Assert.assertTrue(ans.getDetails(), ans.getResult());
249250
}
250251

252+
@Ignore
251253
public final void testStartupCommand() {
252254
StartupRoutingCommand defaultStartRoutCmd =
253255
new StartupRoutingCommand(0, 0, 0, 0, null, Hypervisor.HypervisorType.Hyperv, RouterPrivateIpStrategy.HostLocal);
@@ -278,6 +280,7 @@ public final void testStartupCommand() {
278280
}
279281

280282
// @Test
283+
@Ignore
281284
public final void testJson() {
282285
StartupStorageCommand sscmd = null;
283286
com.cloud.agent.api.StoragePoolInfo pi = new com.cloud.agent.api.StoragePoolInfo("test123", "192.168.0.1", "c:\\", "c:\\", StoragePoolType.Filesystem, 100L, 50L);

‎plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/ConnectionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Object callTimeoutInSec(String method, List<?> params, int timeout,
6565
logger.debug("methodresponse call: " + method + " - " + params);
6666
logger.trace("methodresponse reply: " + result);
6767
}
68-
if (result == null && multiRes.size() >= 0) {
68+
if (result == null && !multiRes.isEmpty()) {
6969
result = getResult();
7070
logger.debug("getresult call: " + method + " - " + params);
7171
logger.trace("getresult reply: " + result);

‎plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/NtpTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.ArrayList;
2222
import java.util.List;
2323

24+
import org.junit.Ignore;
2425
import org.junit.Test;
2526

2627
public class NtpTest {
@@ -42,6 +43,7 @@ public class NtpTest {
4243
+ "</data>\n"
4344
+ "</array>\n");
4445

46+
@Ignore
4547
public void testGetNtp() throws Ovm3ResourceException {
4648
con.setResult(results.getNil());
4749
results.basicBooleanTest(nTp.getDetails());

‎plugins/network-elements/brocade-vcs/src/test/java/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ public void testImplement() throws InsufficientVirtualNetworkCapacityException,
231231

232232
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
233233

234-
mock(DeploymentPlan.class);
235234

236235
final NetworkVO network = mock(NetworkVO.class);
237236
when(network.getName()).thenReturn("testnetwork");
@@ -291,7 +290,6 @@ public void testImplementFail() throws InsufficientVirtualNetworkCapacityExcepti
291290

292291
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
293292

294-
mock(DeploymentPlan.class);
295293

296294
final NetworkVO network = mock(NetworkVO.class);
297295
when(network.getName()).thenReturn("testnetwork");

‎plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuruTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ public void testDesignNoElementOnPhysicalNetwork() {
180180
when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"STT", "VXLAN"}));
181181
when(physnet.getId()).thenReturn(NETWORK_ID);
182182

183-
mock(NiciraNvpDeviceVO.class);
184183
when(nvpdao.listByPhysicalNetwork(NETWORK_ID)).thenReturn(Collections.<NiciraNvpDeviceVO> emptyList());
185184

186185
final NetworkOffering offering = mock(NetworkOffering.class);
@@ -203,7 +202,6 @@ public void testDesignNoIsolationMethodSTT() {
203202
when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VLAN"}));
204203
when(physnet.getId()).thenReturn(NETWORK_ID);
205204

206-
mock(NiciraNvpDeviceVO.class);
207205
when(nvpdao.listByPhysicalNetwork(NETWORK_ID)).thenReturn(Collections.<NiciraNvpDeviceVO> emptyList());
208206

209207
final NetworkOffering offering = mock(NetworkOffering.class);
@@ -263,7 +261,6 @@ public void testImplement() throws InsufficientVirtualNetworkCapacityException {
263261

264262
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
265263

266-
mock(DeploymentPlan.class);
267264

268265
final NetworkVO network = mock(NetworkVO.class);
269266
when(network.getName()).thenReturn("testnetwork");
@@ -318,7 +315,6 @@ public void testImplementWithCidr() throws InsufficientVirtualNetworkCapacityExc
318315

319316
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
320317

321-
mock(DeploymentPlan.class);
322318

323319
final NetworkVO network = mock(NetworkVO.class);
324320
when(network.getName()).thenReturn("testnetwork");
@@ -377,7 +373,6 @@ public void testImplementURIException() throws InsufficientVirtualNetworkCapacit
377373

378374
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
379375

380-
mock(DeploymentPlan.class);
381376

382377
final NetworkVO network = mock(NetworkVO.class);
383378
when(network.getName()).thenReturn("testnetwork");
@@ -432,7 +427,6 @@ public void testShutdown() throws InsufficientVirtualNetworkCapacityException, U
432427

433428
when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
434429

435-
mock(DeploymentPlan.class);
436430

437431
final NetworkVO network = mock(NetworkVO.class);
438432
when(network.getName()).thenReturn("testnetwork");

‎plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,6 @@ public void testCRUDLogicalRouter() {
273273
}
274274
}
275275

276-
UUID.randomUUID().toString();
277-
278276
// Test CRUD for Nat Rules
279277
SourceNatRule snr = new SourceNatRule();
280278
snr.setToSourceIpAddressMin("192.168.10.10");

‎plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.junit.AfterClass;
3535
import org.junit.Before;
3636
import org.junit.BeforeClass;
37+
import org.junit.Ignore;
3738
import org.junit.Test;
3839
import org.junit.runner.RunWith;
3940
import org.mockito.InjectMocks;
@@ -136,6 +137,7 @@ public void testEmbeddedLdapServerInitialization() throws IndexNotFoundException
136137
}
137138

138139
// @Test
140+
@Ignore
139141
public void testEmbeddedLdapAvailable() {
140142
try {
141143
List<LdapUser> usahs = ldapManager.getUsers(1L);
@@ -157,6 +159,7 @@ public void testSchemaLoading() {
157159
}
158160

159161
// @Test
162+
@Ignore
160163
public void testUserCreation() {
161164
LdapConnection connection = new LdapNetworkConnection( "localhost", 10389 );
162165
try {

‎plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public void testUnsharedLdapConnection() throws Exception {
6868
}
6969

7070
@Test
71+
@SuppressWarnings("BanJNDI")
7172
public void testDirContext() throws Exception {
7273

7374
// Test using the good ol' JDNI-LDAP integration
@@ -78,7 +79,9 @@ public void testDirContext() throws Exception {
7879
dirContext.search(DOMAIN_DSN, "(objectClass=person)", searchControls);
7980
assertEquals(24, Iterators.size(Iterators.forEnumeration(resultNamingEnumeration)));
8081
}
82+
8183
@Test
84+
@SuppressWarnings("BanJNDI")
8285
public void testContext() throws Exception {
8386

8487
// Another test using the good ol' JDNI-LDAP integration, this time with the Context interface

‎server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ public void testGetHostTagsForServiceOfferingsListingSuccess() {
456456
Assert.assertTrue(CollectionUtils.isNotEmpty(result));
457457
}
458458

459+
@Test
459460
public void testListAffectedVmsForScopeChange() {
460461
Long clusterId = 1L;
461462
Long poolId = 2L;

0 commit comments

Comments
 (0)