Skip to content

Commit 46aa4da

Browse files
vishesh92vishesh92
committed
agent: remove powermock from tests
1 parent 27b0a64 commit 46aa4da

3 files changed

Lines changed: 95 additions & 91 deletions

File tree

‎agent/src/test/java/com/cloud/agent/AgentShellTest.java‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@
3333
import org.junit.runner.RunWith;
3434
import org.mockito.InjectMocks;
3535
import org.mockito.Mock;
36+
import org.mockito.MockedStatic;
3637
import org.mockito.Mockito;
3738
import org.mockito.Spy;
38-
import org.powermock.api.mockito.PowerMockito;
39-
import org.powermock.core.classloader.annotations.PrepareForTest;
40-
import org.powermock.modules.junit4.PowerMockRunner;
39+
import org.mockito.junit.MockitoJUnitRunner;
4140

42-
@RunWith(PowerMockRunner.class)
41+
@RunWith(MockitoJUnitRunner.class)
4342
public class AgentShellTest {
4443

4544
@InjectMocks
@@ -106,44 +105,42 @@ public void isValueStartingAndEndingWithAtSignTestValues() {
106105
}
107106

108107
@Test
109-
@PrepareForTest(AgentPropertiesFileHandler.class)
110108
public void getPortOrWorkersTestValueIsNullGetFromProperty() {
111109
int expected = 195;
112-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
113-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
110+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
111+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
114112

115113
int result = agentShellSpy.getPortOrWorkers(null, propertyIntegerMock);
116114
Assert.assertEquals(expected, result);
115+
agentPropertiesFileHandlerMocked.close();
117116
}
118117

119118
@Test
120-
@PrepareForTest(AgentPropertiesFileHandler.class)
121119
public void getPortOrWorkersTestValueIsNotAValidIntegerReturnDefaultFromProperty() {
122120
int expected = 42;
123-
124-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
121+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
125122
Mockito.doReturn(expected).when(propertyIntegerMock).getDefaultValue();
126123

127124
int result = agentShellSpy.getPortOrWorkers("test", propertyIntegerMock);
128125
Assert.assertEquals(expected, result);
129126

130-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
131-
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
127+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
128+
agentPropertiesFileHandlerMocked.close();
132129
}
133130

134131
@Test
135-
@PrepareForTest(AgentPropertiesFileHandler.class)
136132
public void getPortOrWorkersTestValueIsAValidIntegerReturnValue() {
137133
int expected = 42;
138134

139-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
135+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
140136
Mockito.doReturn(79).when(propertyIntegerMock).getDefaultValue();
141137

142138
int result = agentShellSpy.getPortOrWorkers(String.valueOf(expected), propertyIntegerMock);
143139
Assert.assertEquals(expected, result);
144140

145-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
141+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
146142
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
143+
agentPropertiesFileHandlerMocked.close();
147144
}
148145

149146
@Test
@@ -183,67 +180,64 @@ public void getWorkersTestWorkersHigherThan0ReturnValue() {
183180
}
184181

185182
@Test
186-
@PrepareForTest(AgentPropertiesFileHandler.class)
187183
public void getZoneOrPodTestValueIsNullAndPropertyStartsAndEndsWithAtSignReturnPropertyDefaultValue() {
188184
String expected = "default";
189-
190-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
191-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn("test");
185+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
186+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn("test");
192187

193188
Mockito.doReturn(true).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
194189
Mockito.doReturn(expected).when(propertyStringMock).getDefaultValue();
195190

196191
String result = agentShellSpy.getZoneOrPod(null, propertyStringMock);
197192
Assert.assertEquals(expected, result);
193+
194+
agentPropertiesFileHandlerMocked.close();
198195
}
199196

200197
@Test
201-
@PrepareForTest(AgentPropertiesFileHandler.class)
202198
public void getZoneOrPodTestValueIsNullAndPropertyDoesNotStartAndEndWithAtSignReturnPropertyDefaultValue() {
203199
String expected = "test";
204200

205-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
206-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
201+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
202+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
207203

208204
Mockito.doReturn(false).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
209-
Mockito.doReturn("default").when(propertyStringMock).getDefaultValue();
210205

211206
String result = agentShellSpy.getZoneOrPod(null, propertyStringMock);
212207
Assert.assertEquals(expected, result);
208+
agentPropertiesFileHandlerMocked.close();
213209
}
214210

215211
@Test
216-
@PrepareForTest(AgentPropertiesFileHandler.class)
217212
public void getZoneOrPodTestValueIsNotNullAndStartsAndEndsWithAtSignReturnPropertyDefaultValue() {
218213
String expected = "default";
219214

220-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
215+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
221216

222217
Mockito.doReturn(true).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
223218
Mockito.doReturn(expected).when(propertyStringMock).getDefaultValue();
224219

225220
String result = agentShellSpy.getZoneOrPod("test", propertyStringMock);
226221
Assert.assertEquals(expected, result);
227222

228-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
223+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
229224
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
225+
agentPropertiesFileHandlerMocked.close();
230226
}
231227

232228
@Test
233-
@PrepareForTest(AgentPropertiesFileHandler.class)
234229
public void getZoneOrPodTestValueIsNotNullAndDoesNotStartAndEndWithAtSignReturnPropertyDefaultValue() {
235230
String expected = "test";
236231

237-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
232+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
238233

239234
Mockito.doReturn(false).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
240-
Mockito.doReturn("default").when(propertyStringMock).getDefaultValue();
241235

242236
String result = agentShellSpy.getZoneOrPod(expected, propertyStringMock);
243237
Assert.assertEquals(expected, result);
244238

245-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
246-
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
239+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
240+
agentPropertiesFileHandlerMocked.close();
247241
}
248242

249243
@Test
@@ -255,47 +249,52 @@ public void getGuidTestGuidNotNullReturnIt() throws ConfigurationException {
255249
}
256250

257251
@Test
258-
@PrepareForTest(AgentPropertiesFileHandler.class)
259252
public void getGuidTestGuidIsNullReturnProperty() throws ConfigurationException {
260253
String expected = "test";
261254

262-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
263-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
255+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
256+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
264257

265258
String result = agentShellSpy.getGuid(null);
266259

267260
Assert.assertEquals(expected, result);
261+
agentPropertiesFileHandlerMocked.close();
268262
}
269263

270264
@Test
271-
@PrepareForTest({AgentShell.class, AgentPropertiesFileHandler.class})
272265
public void getGuidTestGuidAndPropertyAreNullIsDeveloperGenerateNewUuid() throws ConfigurationException {
273266
String expected = "test";
274267

275-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class, UUID.class);
276-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(null, true);
277-
PowerMockito.when(UUID.randomUUID()).thenReturn(uuidMock);
268+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
269+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(null, true);
270+
MockedStatic<UUID> uuidMocked = Mockito.mockStatic(UUID.class);
271+
uuidMocked.when(() -> UUID.randomUUID()).thenReturn(uuidMock);
278272
Mockito.doReturn(expected).when(uuidMock).toString();
279273

280274
String result = agentShellSpy.getGuid(null);
281275

282276
Assert.assertEquals(expected, result);
277+
agentPropertiesFileHandlerMocked.close();
278+
uuidMocked.close();
283279
}
284280

285281
@Test(expected = ConfigurationException.class)
286-
@PrepareForTest(AgentPropertiesFileHandler.class)
287282
public void getGuidTestGuidAndPropertyAreNullIsNotDeveloperThrowConfigurationException() throws ConfigurationException {
288-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
289-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(null, false);
283+
284+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
285+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(null, false);
290286

291287
agentShellSpy.getGuid(null);
288+
agentPropertiesFileHandlerMocked.close();
292289
}
293290

294291
@Test
295-
@PrepareForTest(AgentPropertiesFileHandler.class)
296292
public void setHostTestValueIsNotNullAndStartsAndEndsWithAtSignThrowConfigurationException(){
297293
Mockito.doReturn(true).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
298-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
294+
295+
296+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
297+
299298

300299
boolean error = false;
301300

@@ -309,16 +308,16 @@ public void setHostTestValueIsNotNullAndStartsAndEndsWithAtSignThrowConfiguratio
309308
throw new AssertionError("This test expects a ConfigurationException.");
310309
}
311310

312-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
313-
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
311+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
312+
agentPropertiesFileHandlerMocked.close();
314313
}
315314

316315
@Test
317-
@PrepareForTest(AgentPropertiesFileHandler.class)
318316
public void setHostTestValueIsNullPropertyStartsAndEndsWithAtSignThrowConfigurationException(){
319317
Mockito.doReturn(true).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
320-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
321-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn("test");
318+
319+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
320+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn("test");
322321

323322
boolean error = false;
324323

@@ -332,39 +331,39 @@ public void setHostTestValueIsNullPropertyStartsAndEndsWithAtSignThrowConfigurat
332331
throw new AssertionError("This test expects a ConfigurationException.");
333332
}
334333

335-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class);
336-
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
334+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()));
335+
agentPropertiesFileHandlerMocked.close();
337336
}
338337

339338
@Test
340-
@PrepareForTest(AgentPropertiesFileHandler.class)
341339
public void setHostTestValueIsNotNullAndDoesNotStartAndEndWithAtSignSetHosts() throws ConfigurationException {
342340
String expected = "test";
343341
Mockito.doReturn(false).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
344-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
342+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
345343

346344
agentShellSpy.setHost(expected);
347345

348-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class, Mockito.never());
349-
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
346+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()), Mockito.never());
350347

351348
Mockito.verify(agentShellSpy).setHosts(expected);
349+
agentPropertiesFileHandlerMocked.close();
352350
}
353351

354352
@Test
355-
@PrepareForTest(AgentPropertiesFileHandler.class)
356353
public void setHostTestValueIsNullPropertyDoesNotStartAndEndWithAtSignSetHosts() throws ConfigurationException {
357354
String expected = "test";
358355

359356
Mockito.doReturn(false).when(agentShellSpy).isValueStartingAndEndingWithAtSign(Mockito.any());
360-
PowerMockito.mockStatic(AgentPropertiesFileHandler.class);
361-
PowerMockito.when(AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
357+
358+
MockedStatic<AgentPropertiesFileHandler> agentPropertiesFileHandlerMocked = Mockito.mockStatic(AgentPropertiesFileHandler.class);
359+
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any())).thenReturn(expected);
362360

363361
agentShellSpy.setHost(null);
364362

365-
PowerMockito.verifyStatic(AgentPropertiesFileHandler.class);
363+
agentPropertiesFileHandlerMocked.verify(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.any()));
366364
AgentPropertiesFileHandler.getPropertyValue(Mockito.any());
367365

368366
Mockito.verify(agentShellSpy).setHosts(expected);
367+
agentPropertiesFileHandlerMocked.close();
369368
}
370369
}

0 commit comments

Comments
 (0)