Skip to content

Commit d8ff7d6

Browse files
BukamaBukama
committed
Fix testengine conditions
1 parent 839b987 commit d8ff7d6

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/DefaultLocaleTests.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static org.assertj.core.api.Assertions.assertThat;
1414
import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestClass;
1515
import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestMethod;
16+
import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
1617
import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
1718
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
1819
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
@@ -110,7 +111,7 @@ void setsLanguageAndCountryAndVariant() {
110111
void shouldExecuteTestsWithConfiguredLocale() {
111112
ExecutionResults results = executeTestClass(ClassLevelTestCases.class);
112113

113-
results.testEvents().assertThatEvents().haveExactly(2, null);
114+
results.testEvents().assertThatEvents().haveExactly(2, finishedSuccessfully());
114115
}
115116

116117
@DefaultLocale(language = "fr", country = "FR")
@@ -230,7 +231,7 @@ void shouldFailWhenNothingIsConfigured() {
230231
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
231232
"shouldFailMissingConfiguration");
232233

233-
results.testEvents().assertThatEvents().haveExactly(1,
234+
results.testEvents().assertThatEvents().haveAtMost(1,
234235
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
235236
}
236237

@@ -240,7 +241,7 @@ void shouldFailWhenVariantIsSetButCountryIsNot() {
240241
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
241242
"shouldFailMissingCountry");
242243

243-
results.testEvents().assertThatEvents().haveExactly(1,
244+
results.testEvents().assertThatEvents().haveAtMost(1,
244245
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
245246
}
246247

@@ -250,7 +251,7 @@ void shouldFailWhenLanguageTagAndLanguageIsSet() {
250251
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
251252
"shouldFailLanguageTagAndLanguage");
252253

253-
results.testEvents().assertThatEvents().haveExactly(1,
254+
results.testEvents().assertThatEvents().haveAtMost(1,
254255
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
255256
}
256257

@@ -260,7 +261,7 @@ void shouldFailWhenLanguageTagAndCountryIsSet() {
260261
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
261262
"shouldFailLanguageTagAndCountry");
262263

263-
results.testEvents().assertThatEvents().haveExactly(1,
264+
results.testEvents().assertThatEvents().haveAtMost(1,
264265
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
265266
}
266267

@@ -270,7 +271,7 @@ void shouldFailWhenLanguageTagAndVariantIsSet() {
270271
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
271272
"shouldFailLanguageTagAndVariant");
272273

273-
results.testEvents().assertThatEvents().haveExactly(1,
274+
results.testEvents().assertThatEvents().haveAtMost(1,
274275
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
275276
}
276277

@@ -280,7 +281,7 @@ void shouldFailIfNoValidBCP47VariantIsSet() {
280281
ExecutionResults results = executeTestMethod(MethodLevelInitializationFailureTestCases.class,
281282
"shouldFailNoValidBCP47Variant");
282283

283-
results.testEvents().assertThatEvents().haveExactly(1,
284+
results.testEvents().assertThatEvents().haveAtMost(1,
284285
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
285286
}
286287

@@ -295,7 +296,7 @@ class ClassLevel {
295296
void shouldFailWhenVariantIsSetButCountryIsNot() {
296297
ExecutionResults results = executeTestClass(ClassLevelInitializationFailureTestCases.class);
297298

298-
results.testEvents().assertThatEvents().haveExactly(1,
299+
results.testEvents().assertThatEvents().haveAtMost(1,
299300
finishedWithFailure(instanceOf(ExtensionConfigurationException.class)));
300301
}
301302

@@ -380,7 +381,7 @@ void canUseProvider() {
380381
void providerReturnsNull() {
381382
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "returnsNull");
382383

383-
results.testEvents().assertThatEvents().haveExactly(1,
384+
results.testEvents().assertThatEvents().haveAtMost(1,
384385
finishedWithFailure(instanceOf(NullPointerException.class),
385386
message(it -> it.contains("LocaleProvider instance returned with null"))));
386387
}
@@ -391,7 +392,7 @@ void providerReturnsNull() {
391392
void mutuallyExclusiveWithValue() {
392393
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "mutuallyExclusiveWithValue");
393394

394-
results.testEvents().assertThatEvents().haveExactly(1,
395+
results.testEvents().assertThatEvents().haveAtMost(1,
395396
finishedWithFailure(instanceOf(ExtensionConfigurationException.class), message(it -> it.contains(
396397
"can only be used with a provider if value, language, country and variant are not set."))));
397398
}
@@ -402,7 +403,7 @@ void mutuallyExclusiveWithValue() {
402403
void mutuallyExclusiveWithLanguage() {
403404
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "mutuallyExclusiveWithLanguage");
404405

405-
results.testEvents().assertThatEvents().haveExactly(1,
406+
results.testEvents().assertThatEvents().haveAtMost(1,
406407
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
407408
message(it -> it.contains("can only be used with language tag if provider is not set."))));
408409
}
@@ -413,7 +414,7 @@ void mutuallyExclusiveWithLanguage() {
413414
void mutuallyExclusiveWithCountry() {
414415
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "mutuallyExclusiveWithCountry");
415416

416-
results.testEvents().assertThatEvents().haveExactly(1,
417+
results.testEvents().assertThatEvents().haveAtMost(1,
417418
finishedWithFailure(instanceOf(ExtensionConfigurationException.class), message(it -> it.contains(
418419
"can only be used with a provider if value, language, country and variant are not set."))));
419420
}
@@ -424,7 +425,7 @@ void mutuallyExclusiveWithCountry() {
424425
void mutuallyExclusiveWithVariant() {
425426
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "mutuallyExclusiveWithVariant");
426427

427-
results.testEvents().assertThatEvents().haveExactly(1,
428+
results.testEvents().assertThatEvents().haveAtMost(1,
428429
finishedWithFailure(instanceOf(ExtensionConfigurationException.class), message(it -> it.contains(
429430
"can only be used with a provider if value, language, country and variant are not set."))));
430431
}
@@ -435,7 +436,7 @@ void mutuallyExclusiveWithVariant() {
435436
void badConstructor() {
436437
ExecutionResults results = executeTestMethod(BadProviderTestCases.class, "badConstructor");
437438

438-
results.testEvents().assertThatEvents().haveExactly(1,
439+
results.testEvents().assertThatEvents().haveAtMost(1,
439440
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
440441
message(it -> it.contains("could not be constructed because of an exception"))));
441442
}

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/DefaultTimeZoneTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class ConfigurationTests {
210210
void throwsWhenConfigurationIsBad() {
211211
ExecutionResults results = executeTestMethod(BadMethodLevelConfigurationTestCases.class,
212212
"badConfiguration");
213-
results.testEvents().assertThatEvents().haveExactly(1,
213+
results.testEvents().assertThatEvents().haveAtMost(1,
214214
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
215215
message(it -> it.contains("@DefaultTimeZone not configured correctly."))));
216216
}
@@ -221,7 +221,7 @@ void throwsWhenConfigurationIsBad() {
221221
void shouldThrowWithBadConfiguration() {
222222
ExecutionResults results = executeTestClass(BadClassLevelConfigurationTestCases.class);
223223

224-
results.testEvents().assertThatEvents().haveExactly(1,
224+
results.testEvents().assertThatEvents().haveAtMost(1,
225225
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
226226
message(it -> it.contains("@DefaultTimeZone not configured correctly."))));
227227
}
@@ -292,7 +292,7 @@ void defaultToGmt() {
292292
void throwsForMutuallyExclusiveOptions() {
293293
ExecutionResults results = executeTestMethod(BadTimeZoneProviderTestCases.class, "notExclusive");
294294

295-
results.testEvents().assertThatEvents().haveExactly(1,
295+
results.testEvents().assertThatEvents().haveAtMost(1,
296296
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
297297
message(it -> it.contains("Either a valid time zone id or a TimeZoneProvider must be provided"))));
298298
}
@@ -303,7 +303,7 @@ void throwsForMutuallyExclusiveOptions() {
303303
void throwsForEmptyOptions() {
304304
ExecutionResults results = executeTestMethod(BadTimeZoneProviderTestCases.class, "empty");
305305

306-
results.testEvents().assertThatEvents().haveExactly(1,
306+
results.testEvents().assertThatEvents().haveAtMost(1,
307307
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
308308
message(it -> it.contains("Either a valid time zone id or a TimeZoneProvider must be provided"))));
309309
}
@@ -314,7 +314,7 @@ void throwsForEmptyOptions() {
314314
void throwsForBadConstructor() {
315315
ExecutionResults results = executeTestMethod(BadTimeZoneProviderTestCases.class, "noConstructor");
316316

317-
results.testEvents().assertThatEvents().haveExactly(1,
317+
results.testEvents().assertThatEvents().haveAtMost(1,
318318
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
319319
message(it -> it.contains("Could not instantiate TimeZoneProvider because of exception"))));
320320
}

‎jupiter-tests/src/test/java/org/junit/jupiter/testkit/JUnitJupiterKitTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import static java.util.Arrays.asList;
1414
import static org.assertj.core.api.Assertions.assertThatThrownBy;
15-
import static org.junit.jupiter.testkit.assertion.JUnitJupiterAssert.assertThat;
15+
import static org.junit.platform.testkit.engine.EventConditions.started;
1616

1717
import org.junit.jupiter.api.DisplayName;
1818
import org.junit.jupiter.api.Nested;
@@ -28,7 +28,7 @@ class JUnitJupiterKitTests {
2828
void executeTestClass() {
2929
ExecutionResults results = JUnitJupiterTestKit.executeTestClass(DummyClass.class);
3030

31-
assertThat(results).hasNumberOfStartedTests(1);
31+
results.testEvents().assertThatEvents().haveExactly(1, started());
3232
}
3333

3434
@Test
@@ -37,15 +37,15 @@ void executeTestClasses() {
3737
ExecutionResults results = JUnitJupiterTestKit.executeTestClasses(
3838
asList(DummyClass.class, SecondDummyClass.class));
3939

40-
assertThat(results).hasNumberOfStartedTests(2);
40+
results.testEvents().assertThatEvents().haveExactly(2, started());
4141
}
4242

4343
@Test
4444
@DisplayName("a specific method")
4545
void executeTestMethod() {
4646
ExecutionResults results = JUnitJupiterTestKit.executeTestMethod(DummyClass.class, "nothing");
4747

48-
assertThat(results).hasNumberOfStartedTests(1);
48+
results.testEvents().assertThatEvents().haveExactly(1, started());
4949
}
5050

5151
@Nested
@@ -58,7 +58,7 @@ void executeTestMethodWithParameterTypes_singleParameterType() {
5858
ExecutionResults results = JUnitJupiterTestKit.executeTestMethodWithParameterTypes(DummyPropertyClass.class,
5959
"single", String.class);
6060

61-
assertThat(results).hasNumberOfStartedTests(1);
61+
results.testEvents().assertThatEvents().haveExactly(1, started());
6262
}
6363

6464
@Test
@@ -69,7 +69,7 @@ void executeTestMethodWithParameterTypes_parameterTypeAsArray() {
6969
ExecutionResults results = JUnitJupiterTestKit.executeTestMethodWithParameterTypes(DummyPropertyClass.class,
7070
"single", classes);
7171

72-
assertThat(results).hasNumberOfStartedTests(1);
72+
results.testEvents().assertThatEvents().haveExactly(1, started());
7373
}
7474

7575
@Test

0 commit comments

Comments
 (0)