root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Reinstate performance test group assumption in SockJS tests

This commit is contained in:
Sam Brannen 2015-08-22 15:02:18 +02:00
parent a43d78ea55
commit 732a655f82
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Supplier; import java.util.function.BooleanSupplier;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -102,7 +103,7 @@ public abstract class AbstractSockJsIntegrationTests {
@BeforeClass @BeforeClass
public static void performanceTestGroupAssumption() throws Exception { public static void performanceTestGroupAssumption() throws Exception {
// Assume.group(TestGroup.PERFORMANCE); Assume.group(TestGroup.PERFORMANCE);
} }
@ -301,10 +302,10 @@ public abstract class AbstractSockJsIntegrationTests {
clientHandler.awaitMessage(message, 5000); clientHandler.awaitMessage(message, 5000);
} }
private static void awaitEvent(Supplier<Boolean> condition, long timeToWait, String description) { private static void awaitEvent(BooleanSupplier condition, long timeToWait, String description) {
long timeToSleep = 200; long timeToSleep = 200;
for (int i = 0 ; i < Math.floor(timeToWait / timeToSleep); i++) { for (int i = 0 ; i < Math.floor(timeToWait / timeToSleep); i++) {
if (condition.get()) { if (condition.getAsBoolean()) {
return; return;
} }
try { try {