demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[feed] Try to make tests more stable (#9315)

Browse Source 
Signed-off-by: Fabian Wolter <github@fabian-wolter.de>
This commit is contained in:
Fabian Wolter 2020-12-12 19:30:28 +01:00 committed by GitHub
parent 70adea298a
commit 2bcb548381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
itests/org.openhab.binding.feed.tests/src/main/java/org/openhab/binding/feed/test/FeedHandlerTest.java
View File

@ -104,6 +104,7 @@ public class FeedHandlerTest extends JavaOSGiTest {
private Thing feedThing;
private FeedHandler feedHandler;
private ChannelUID channelUID;
private HttpService httpService;
/**
* This class is used as a mock for HTTP web server, serving XML feed content.
@ -175,9 +176,8 @@ public class FeedHandlerTest extends JavaOSGiTest {
});
}
private void registerFeedTestServlet() {
HttpService httpService = getService(HttpService.class);
assertThat(httpService, is(notNullValue()));
private synchronized void registerFeedTestServlet() {
waitForAssert(() -> assertThat(httpService = getService(HttpService.class), is(notNullValue())));
servlet = new FeedServiceMock(DEFAULT_MOCK_CONTENT);
try {
httpService.registerServlet(MOCK_SERVLET_PATH, servlet, null, null);
@ -186,9 +186,8 @@ public class FeedHandlerTest extends JavaOSGiTest {
}
}
private void unregisterFeedTestServlet() {
HttpService httpService = getService(HttpService.class);
assertThat(httpService, is(notNullValue()));
private synchronized void unregisterFeedTestServlet() {
waitForAssert(() -> assertThat(httpService = getService(HttpService.class), is(notNullValue())));
httpService.unregister(MOCK_SERVLET_PATH);
servlet = null;
}