Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 005f1df

Browse files
slu-itslu-it
committed
fixed issues with JUnit 5 RC3
1 parent be9c504 commit 005f1df

File tree

8 files changed

+38
-49
lines changed

8 files changed

+38
-49
lines changed

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464

6565
<version.testutils>0.2</version.testutils>
6666
<version.junit4>4.12</version.junit4>
67-
<version.junit5.jupiter>5.0.0-M4</version.junit5.jupiter>
68-
<version.junit5.vintage>4.12.0-M4</version.junit5.vintage>
69-
<version.junit5.platform>1.0.0-M4</version.junit5.platform>
67+
<version.junit5.jupiter>5.0.0-RC3</version.junit5.jupiter>
68+
<version.junit5.vintage>4.12.0-RC3</version.junit5.vintage>
69+
<version.junit5.platform>1.0.0-RC3</version.junit5.platform>
7070
<version.hamcrest>1.3</version.hamcrest>
7171
<version.assertj>3.7.0</version.assertj>
7272
<version.mockito>2.7.22</version.mockito>

‎webtester-support-junit5/src/main/java/info/novatec/testit/webtester/junit5/extensions/browsers/EntryPointExtension.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.apache.commons.lang.StringUtils;
88
import org.junit.jupiter.api.extension.BeforeEachCallback;
99
import org.junit.jupiter.api.extension.Extension;
10-
import org.junit.jupiter.api.extension.TestExtensionContext;
10+
import org.junit.jupiter.api.extension.ExtensionContext;
1111

1212
import lombok.extern.slf4j.Slf4j;
1313

@@ -64,8 +64,8 @@ public class EntryPointExtension extends BaseExtension implements BeforeEachCall
6464
private static final String VARIABLE_INDICATOR = "${";
6565

6666
@Override
67-
public void beforeEach(TestExtensionContext context) {
68-
Object testInstance = context.getTestInstance();
67+
public void beforeEach(ExtensionContext context) {
68+
Object testInstance = context.getRequiredTestInstance();
6969
getModel(context).getBrowserFields()
7070
.stream()
7171
.filter(browserField -> browserField.isAnnotationPresent(EntryPoint.class))

‎webtester-support-junit5/src/main/java/info/novatec/testit/webtester/junit5/extensions/browsers/ManagedBrowserExtension.java‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
import org.junit.jupiter.api.extension.AfterEachCallback;
1717
import org.junit.jupiter.api.extension.BeforeAllCallback;
1818
import org.junit.jupiter.api.extension.BeforeEachCallback;
19-
import org.junit.jupiter.api.extension.ContainerExtensionContext;
2019
import org.junit.jupiter.api.extension.Extension;
2120
import org.junit.jupiter.api.extension.ExtensionContext;
22-
import org.junit.jupiter.api.extension.TestExtensionContext;
2321

2422
import lombok.extern.slf4j.Slf4j;
2523

@@ -83,31 +81,23 @@ public class ManagedBrowserExtension extends BaseExtension
8381
private final Predicate<Field> isInstanceField = isStaticField.negate();
8482

8583
@Override
86-
public void beforeAll(ContainerExtensionContext context) throws Exception {
87-
if (isRootContext(context)) {
88-
executeHandlingUndeclaredThrowables(context, this::initializeAndInjectStaticBrowsers);
89-
}
84+
public void beforeAll(ExtensionContext context) throws Exception {
85+
executeHandlingUndeclaredThrowables(context, this::initializeAndInjectStaticBrowsers);
9086
}
9187

9288
@Override
93-
public void beforeEach(TestExtensionContext context) throws Exception {
89+
public void beforeEach(ExtensionContext context) throws Exception {
9490
executeHandlingUndeclaredThrowables(context, this::initializeAndInjectInstanceBrowsers);
9591
}
9692

9793
@Override
98-
public void afterEach(TestExtensionContext context) {
94+
public void afterEach(ExtensionContext context) {
9995
getManagedInstanceBrowsers(context).forEach(this::closeAndLogErrors);
10096
}
10197

10298
@Override
103-
public void afterAll(ContainerExtensionContext context) {
104-
if (isRootContext(context)) {
105-
getManagedStaticBrowsers(context).forEach(this::closeAndLogErrors);
106-
}
107-
}
108-
109-
private boolean isRootContext(ContainerExtensionContext context) {
110-
return !context.getParent().isPresent();
99+
public void afterAll(ExtensionContext context) {
100+
getManagedStaticBrowsers(context).forEach(this::closeAndLogErrors);
111101
}
112102

113103
private void closeAndLogErrors(Browser browser) {
@@ -119,7 +109,7 @@ private void closeAndLogErrors(Browser browser) {
119109
}
120110
}
121111

122-
private void initializeAndInjectStaticBrowsers(ContainerExtensionContext context) {
112+
private void initializeAndInjectStaticBrowsers(ExtensionContext context) {
123113
List<Browser> managedBrowsers = getManagedStaticBrowsers(context);
124114
getModel(context).getBrowserFields().stream().filter(isStaticField).forEach(field -> {
125115
Browser browser = createBrowserFor(field);
@@ -128,8 +118,8 @@ private void initializeAndInjectStaticBrowsers(ContainerExtensionContext context
128118
});
129119
}
130120

131-
private void initializeAndInjectInstanceBrowsers(TestExtensionContext context) {
132-
Object testInstance = context.getTestInstance();
121+
private void initializeAndInjectInstanceBrowsers(ExtensionContext context) {
122+
Object testInstance = context.getRequiredTestInstance();
133123
List<Browser> managedBrowsers = getManagedInstanceBrowsers(context);
134124
getModel(context).getBrowserFields().stream().filter(isInstanceField).forEach(field -> {
135125
Browser browser = createBrowserFor(field);

‎webtester-support-junit5/src/main/java/info/novatec/testit/webtester/junit5/extensions/configuration/ConfigurationValueExtension.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.junit.jupiter.api.BeforeEach;
1010
import org.junit.jupiter.api.extension.BeforeEachCallback;
1111
import org.junit.jupiter.api.extension.Extension;
12-
import org.junit.jupiter.api.extension.TestExtensionContext;
12+
import org.junit.jupiter.api.extension.ExtensionContext;
1313

1414
import lombok.extern.slf4j.Slf4j;
1515

@@ -100,11 +100,11 @@ public class ConfigurationValueExtension extends BaseExtension implements Before
100100

101101
@Override
102102
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
103-
public void beforeEach(TestExtensionContext context) throws Exception {
103+
public void beforeEach(ExtensionContext context) throws Exception {
104104
executeHandlingUndeclaredThrowables(context, this::injectValuesIntoAnnotatedFields);
105105
}
106106

107-
private void injectValuesIntoAnnotatedFields(TestExtensionContext context) {
107+
private void injectValuesIntoAnnotatedFields(ExtensionContext context) {
108108

109109
List<Field> valueFields = getModel(context).getConfigurationValueFields();
110110
if (valueFields.isEmpty()) {
@@ -117,7 +117,7 @@ private void injectValuesIntoAnnotatedFields(TestExtensionContext context) {
117117
throw new NoManagedBrowserException();
118118
}
119119

120-
Object testInstance = context.getTestInstance();
120+
Object testInstance = context.getRequiredTestInstance();
121121
valueFields.forEach(field -> {
122122

123123
ConfigurationValue annotation = field.getAnnotation(ConfigurationValue.class);

‎webtester-support-junit5/src/main/java/info/novatec/testit/webtester/junit5/extensions/eventlisteners/RegisteredEventListenerExtension.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.junit.jupiter.api.extension.AfterEachCallback;
1414
import org.junit.jupiter.api.extension.BeforeEachCallback;
1515
import org.junit.jupiter.api.extension.Extension;
16-
import org.junit.jupiter.api.extension.TestExtensionContext;
16+
import org.junit.jupiter.api.extension.ExtensionContext;
1717

1818
import com.google.common.collect.HashMultimap;
1919
import com.google.common.collect.Multimap;
@@ -75,17 +75,17 @@ public class RegisteredEventListenerExtension extends BaseExtension implements B
7575

7676
@Override
7777
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
78-
public void beforeEach(TestExtensionContext context) throws Exception {
78+
public void beforeEach(ExtensionContext context) throws Exception {
7979
initializeEventListener(context);
8080
}
8181

8282
@Override
8383
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
84-
public void afterEach(TestExtensionContext context) throws Exception {
84+
public void afterEach(ExtensionContext context) throws Exception {
8585
deRegisterAllEventListeners(context);
8686
}
8787

88-
private void initializeEventListener(TestExtensionContext context) {
88+
private void initializeEventListener(ExtensionContext context) {
8989
Multimap<EventListener, Browser> registeredEventListener = HashMultimap.create();
9090
getModel(context).getEventListenerFields().stream().filter(isInstanceField).forEach(listenerField -> {
9191
createEventListenerFor(listenerField, context);
@@ -101,8 +101,8 @@ private void initializeEventListener(TestExtensionContext context) {
101101
context.getStore(BaseExtension.NAMESPACE).put("registered-eventlisteners", registeredEventListener);
102102
}
103103

104-
private void createEventListenerFor(Field field, TestExtensionContext context) {
105-
Object testInstance = context.getTestInstance();
104+
private void createEventListenerFor(Field field, ExtensionContext context) {
105+
Object testInstance = context.getRequiredTestInstance();
106106
try {
107107
if (field.get(testInstance) == null) {
108108
EventListener newEventListener = ( EventListener ) field.getType().newInstance();
@@ -113,7 +113,7 @@ private void createEventListenerFor(Field field, TestExtensionContext context) {
113113
}
114114
}
115115

116-
private List<Field> findBrowserFieldFor(Field listenerField, TestExtensionContext context) {
116+
private List<Field> findBrowserFieldFor(Field listenerField, ExtensionContext context) {
117117
return getModel(context).getNamedBrowserFields()
118118
.values()
119119
.stream()
@@ -139,28 +139,28 @@ private String getBrowserName(Field browserField) {
139139
return browserField.getAnnotation(Managed.class).value();
140140
}
141141

142-
private Browser getBrowser(Field browserField, TestExtensionContext context) {
142+
private Browser getBrowser(Field browserField, ExtensionContext context) {
143143
try {
144-
return ( Browser ) browserField.get(context.getTestInstance());
144+
return ( Browser ) browserField.get(context.getRequiredTestInstance());
145145
} catch (IllegalAccessException e) {
146146
throw new UndeclaredThrowableException(e, "error while finding managed browser");
147147
}
148148
}
149149

150-
private EventListener registerEventListener(Browser browser, Field listenerField, TestExtensionContext context) {
151-
EventListener eventListener = getValue(listenerField, context.getTestInstance());
150+
private EventListener registerEventListener(Browser browser, Field listenerField, ExtensionContext context) {
151+
EventListener eventListener = getValue(listenerField, context.getRequiredTestInstance());
152152
browser.events().register(eventListener);
153153
return eventListener;
154154
}
155155

156-
private void deRegisterAllEventListeners(TestExtensionContext context) {
156+
private void deRegisterAllEventListeners(ExtensionContext context) {
157157
getRegisteredEventListeners(context).entries()
158158
.forEach(entry -> entry.getValue().events().deregister(entry.getKey()));
159159
log.debug("Unregistered all event listeners each mapped with its target browser");
160160
}
161161

162162
@SuppressWarnings("unchecked")
163-
private Multimap<EventListener, Browser> getRegisteredEventListeners(TestExtensionContext context) {
163+
private Multimap<EventListener, Browser> getRegisteredEventListeners(ExtensionContext context) {
164164
return ( Multimap<EventListener, Browser> ) context.getStore(BaseExtension.NAMESPACE)
165165
.getOrComputeIfAbsent("registered-eventlisteners", s -> HashMultimap.create());
166166
}

‎webtester-support-junit5/src/main/java/info/novatec/testit/webtester/junit5/extensions/pages/PageInitializerExtension.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.jupiter.api.BeforeEach;
88
import org.junit.jupiter.api.extension.BeforeEachCallback;
99
import org.junit.jupiter.api.extension.Extension;
10-
import org.junit.jupiter.api.extension.TestExtensionContext;
10+
import org.junit.jupiter.api.extension.ExtensionContext;
1111

1212
import lombok.extern.slf4j.Slf4j;
1313

@@ -61,11 +61,11 @@ public class PageInitializerExtension extends BaseExtension implements BeforeEac
6161

6262
@Override
6363
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
64-
public void beforeEach(TestExtensionContext context) throws Exception {
64+
public void beforeEach(ExtensionContext context) throws Exception {
6565
executeHandlingUndeclaredThrowables(context, this::createPagesForAnnotatedFields);
6666
}
6767

68-
private void createPagesForAnnotatedFields(TestExtensionContext context) {
68+
private void createPagesForAnnotatedFields(ExtensionContext context) {
6969

7070
List<Field> pageFields = getModel(context).getPageFields();
7171
if (pageFields.isEmpty()) {
@@ -78,7 +78,7 @@ private void createPagesForAnnotatedFields(TestExtensionContext context) {
7878
throw new NoManagedBrowserException();
7979
}
8080

81-
Object testInstance = context.getTestInstance();
81+
Object testInstance = context.getRequiredTestInstance();
8282
pageFields.forEach(pageField -> {
8383

8484
String browserName = getBrowserName(pageField);

‎webtester-support-junit5/src/test/java/info/novatec/testit/webtester/junit5/extensions/BaseExtensionTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.api.extension.ExtensionContext;
1818
import org.junit.jupiter.api.extension.ExtensionContext.Store;
19-
import org.junit.jupiter.api.extension.TestExtensionContext;
2019
import org.mockito.InjectMocks;
2120
import org.mockito.Mock;
2221
import org.testit.testutils.mockito.junit5.EnableMocking;
@@ -31,7 +30,7 @@ class BaseExtensionTest {
3130
@Mock
3231
Store store;
3332
@Mock
34-
TestExtensionContext context;
33+
ExtensionContext context;
3534
@Mock
3635
Consumer<ExtensionContext> contextConsumer;
3736

‎webtester-support-junit5/src/test/java/utils/TestClassExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public <T extends DiscoverySelector> List<T> getSelectorsByType(Class<T> selecto
9696
}
9797

9898
@Override
99-
public <T extends DiscoveryFilter<?>> List<T> getDiscoveryFiltersByType(Class<T> filterType) {
99+
public <T extends DiscoveryFilter<?>> List<T> getFiltersByType(Class<T> filterType) {
100100
return Collections.emptyList();
101101
}
102102

0 commit comments

Comments
 (0)