Skip to content

Commit ef17fc0

Browse files
committed
Delete tests for legacy semantics for field and method searches
I'm intentionally leaving this commit in the Git history, in case we later decide to re-introduce these tests. See #3553
1 parent 64b697f commit ef17fc0

File tree

2 files changed

+0
-74
lines changed

2 files changed

+0
-74
lines changed

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/OrderedProgrammaticExtensionRegistrationTests.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
24-
import org.junit.jupiter.api.Disabled;
2524
import org.junit.jupiter.api.Order;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.TestInstance;
@@ -168,20 +167,6 @@ void classLevelWithDefaultOrderDoesNotShadowExtensionFromSuperclass() {
168167
);
169168
}
170169

171-
@Disabled("Disabled until legacy search mode is supported")
172-
@Test
173-
void classLevelWithDefaultOrderShadowingOrderFromSuperclassInLegacyMode() {
174-
Class<?> testClass = DefaultOrderShadowingDefaultOrderAndExplicitOrderClassLevelExtensionRegistrationTestCase.class;
175-
String testClassName = testClass.getSimpleName();
176-
Class<?> parent = DefaultOrderAndExplicitOrderClassLevelExtensionRegistrationTestCase.class;
177-
String parentName = parent.getSimpleName();
178-
assertOutcome(testClass, //
179-
parentName + " :: extension1 :: before test", //
180-
parentName + " :: extension2 :: before test", //
181-
testClassName + " :: extension3 :: before test" //
182-
);
183-
}
184-
185170
@Test
186171
void classLevelWithExplicitOrderDoesNotShadowExtensionFromSuperclass() {
187172
Class<?> testClass = ExplicitOrderShadowingDefaultOrderAndExplicitOrderClassLevelExtensionRegistrationTestCase.class;
@@ -196,20 +181,6 @@ void classLevelWithExplicitOrderDoesNotShadowExtensionFromSuperclass() {
196181
);
197182
}
198183

199-
@Disabled("Disabled until legacy search mode is supported")
200-
@Test
201-
void classLevelWithExplicitOrderShadowingOrderFromSuperclassInLegacyMode() {
202-
Class<?> testClass = ExplicitOrderShadowingDefaultOrderAndExplicitOrderClassLevelExtensionRegistrationTestCase.class;
203-
String testClassName = testClass.getSimpleName();
204-
Class<?> parent = DefaultOrderAndExplicitOrderClassLevelExtensionRegistrationTestCase.class;
205-
String parentName = parent.getSimpleName();
206-
assertOutcome(testClass, //
207-
parentName + " :: extension3 :: before test", //
208-
testClassName + " :: extension2 :: before test", //
209-
parentName + " :: extension1 :: before test" //
210-
);
211-
}
212-
213184
@Test
214185
void classLevelWithDefaultOrderAndExplicitOrderFromInterface() {
215186
Class<?> testClass = DefaultOrderAndExplicitOrderExtensionRegistrationFromInterfaceTestCase.class;

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ProgrammaticExtensionRegistrationTests.java

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.junit.jupiter.api.AfterEach;
3333
import org.junit.jupiter.api.BeforeAll;
3434
import org.junit.jupiter.api.BeforeEach;
35-
import org.junit.jupiter.api.Disabled;
3635
import org.junit.jupiter.api.Nested;
3736
import org.junit.jupiter.api.Test;
3837
import org.junit.jupiter.api.TestInstance;
@@ -120,28 +119,6 @@ void instanceLevelWithInheritedExtensions() {
120119
);
121120
}
122121

123-
@Disabled("Disabled until legacy search mode is supported")
124-
@Test
125-
void instanceLevelWithInheritedAndHiddenExtensionsInLegacyMode() {
126-
Class<?> testClass = InstanceLevelExtensionRegistrationParentTestCase.class;
127-
String parent = testClass.getSimpleName();
128-
assertOneTestSucceeded(testClass);
129-
assertThat(callSequence).containsExactly( //
130-
parent + " :: extension1 :: before test", //
131-
parent + " :: extension2 :: before test" //
132-
);
133-
134-
callSequence.clear();
135-
testClass = InstanceLevelExtensionRegistrationChildTestCase.class;
136-
String child = testClass.getSimpleName();
137-
assertOneTestSucceeded(testClass);
138-
assertThat(callSequence).containsExactly( //
139-
parent + " :: extension1 :: before test", //
140-
child + " :: extension2 :: before test", //
141-
child + " :: extension3 :: before test" //
142-
);
143-
}
144-
145122
@Test
146123
void classLevelWithInheritedExtensions() {
147124
Class<?> testClass = ClassLevelExtensionRegistrationParentTestCase.class;
@@ -164,28 +141,6 @@ void classLevelWithInheritedExtensions() {
164141
);
165142
}
166143

167-
@Disabled("Disabled until legacy search mode is supported")
168-
@Test
169-
void classLevelWithInheritedAndHiddenExtensionsInLegacyMode() {
170-
Class<?> testClass = ClassLevelExtensionRegistrationParentTestCase.class;
171-
String parent = testClass.getSimpleName();
172-
assertOneTestSucceeded(testClass);
173-
assertThat(callSequence).containsExactly( //
174-
parent + " :: extension1 :: before test", //
175-
parent + " :: extension2 :: before test" //
176-
);
177-
178-
callSequence.clear();
179-
testClass = ClassLevelExtensionRegistrationChildTestCase.class;
180-
String child = testClass.getSimpleName();
181-
assertOneTestSucceeded(testClass);
182-
assertThat(callSequence).containsExactly( //
183-
parent + " :: extension1 :: before test", //
184-
child + " :: extension2 :: before test", //
185-
child + " :: extension3 :: before test" //
186-
);
187-
}
188-
189144
/**
190145
* @since 5.5
191146
*/

0 commit comments

Comments
 (0)