Skip to content

Commit 8203603

Browse files
committed
Execute simple JUnit tests and @QuarkusComponentTest first
I was hoping to constrain JUnit tests and @QuarkusComponentTests but @QuarkusComponentTest is in another artifact so this will have to do. Related to quarkusio#46035. Note that you can still break things if you specify another priority but that's how it is :). (cherry picked from commit 3b89af2)
1 parent 9364f6b commit 8203603

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
*/
5959
public class QuarkusTestProfileAwareClassOrderer implements ClassOrderer {
6060

61+
protected static final String DEFAULT_ORDER_PREFIX_NON_QUARKUS_TEST = "10_";
6162
protected static final String DEFAULT_ORDER_PREFIX_QUARKUS_TEST = "20_";
6263
protected static final String DEFAULT_ORDER_PREFIX_QUARKUS_TEST_WITH_MATCHING_RES = "30_";
6364
protected static final String DEFAULT_ORDER_PREFIX_QUARKUS_TEST_WITH_PROFILE = "40_";
6465
protected static final String DEFAULT_ORDER_PREFIX_QUARKUS_TEST_WITH_RESTRICTED_RES = "45_";
65-
protected static final String DEFAULT_ORDER_PREFIX_NON_QUARKUS_TEST = "60_";
6666

6767
static final String CFGKEY_ORDER_PREFIX_QUARKUS_TEST = "junit.quarkus.orderer.prefix.quarkus-test";
6868

test-framework/junit5/src/test/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrdererTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ void allVariants() {
9898
new QuarkusTestProfileAwareClassOrderer().orderClasses(contextMock);
9999

100100
assertThat(input).containsExactly(
101+
nonQuarkusTest1Desc,
102+
nonQuarkusTest2Desc,
101103
quarkusTest1Desc,
102104
quarkusTest1aDesc,
103105
quarkusTest2Desc,
@@ -112,9 +114,7 @@ void allVariants() {
112114
quarkusTestWithRestrictedResourceDesc,
113115
quarkusTestWithRestrictedResourceDesc2,
114116
quarkusTestWithMetaResourceDesc,
115-
quarkusTestWithMetaResourceDesc2,
116-
nonQuarkusTest1Desc,
117-
nonQuarkusTest2Desc);
117+
quarkusTestWithMetaResourceDesc2);
118118
}
119119

120120
@Test
@@ -124,9 +124,9 @@ void configuredPrefix() {
124124
List<ClassDescriptor> input = Arrays.asList(quarkusTestDesc, nonQuarkusTestDesc);
125125
doReturn(input).when(contextMock).getClassDescriptors();
126126

127-
new QuarkusTestProfileAwareClassOrderer("20_", "30_", "40_", "45_", "01_", Optional.empty()).orderClasses(contextMock);
127+
new QuarkusTestProfileAwareClassOrderer("20_", "30_", "40_", "45_", "60_", Optional.empty()).orderClasses(contextMock);
128128

129-
assertThat(input).containsExactly(nonQuarkusTestDesc, quarkusTestDesc);
129+
assertThat(input).containsExactly(quarkusTestDesc, nonQuarkusTestDesc);
130130
}
131131

132132
@Test

0 commit comments

Comments
 (0)