SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrades to JUnit5; fixes gh-1567

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-03-03 19:53:50 +01:00
parent a59bfb00cf
commit 3ce018bc51
129 changed files with 482 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js
View File

@@ -752,7 +752,6 @@ SockJS = (function () {
on_unload[ref]();
delete on_unload[ref];
}
;
};
var unload_triggered = function () {
@@ -821,7 +820,6 @@ SockJS = (function () {
}
} catch (x) {
}
;
};
iframe.src = iframe_url;
@@ -881,7 +879,6 @@ SockJS = (function () {
}
} catch (x) {
}
;
};
doc.open();
@@ -928,14 +925,12 @@ SockJS = (function () {
that.xhr = new XMLHttpRequest();
} catch (x) {
}
;
if (!that.xhr) {
try {
that.xhr = new _window.ActiveXObject('Microsoft.XMLHTTP');
} catch (x) {
}
;
}
if (_window.ActiveXObject || _window.XDomainRequest) {
// IE8 caches even POSTs
@@ -955,7 +950,6 @@ SockJS = (function () {
that._cleanup();
return;
}
;
if (!opts || !opts.no_credentials) {
// Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :
@@ -980,7 +974,6 @@ SockJS = (function () {
var text = x.responseText;
} catch (x) {
}
;
// IE returns 1223 for 204: https://bugs.jquery.com/ticket/1450
if (status === 1223) status = 204;
@@ -1017,7 +1010,6 @@ SockJS = (function () {
that.xhr.abort();
} catch (x) {
}
;
}
that.unload_ref = that.xhr = null;
};
@@ -1099,7 +1091,6 @@ SockJS = (function () {
that.xdr.abort();
} catch (x) {
}
;
}
that.unload_ref = that.xdr = null;
};
@@ -2241,7 +2232,6 @@ SockJS = (function () {
// IE 7
return new InfoReceiverFake();
}
;
};

5
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/test/java/sample/SampleWebsocketApplicationTests.java
View File

@@ -16,15 +16,12 @@
package sample;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = SampleWebsocketApplication.class)
@WebAppConfiguration
@TestPropertySource(properties = "sample.zipkin.enabled=false")