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

Merge pull request #76 from lukas-krecan/trivial-test-fix 

Replacing potentionally slow and infinite while loop by a latch
This commit is contained in:
Arjen Poutsma 2016-03-29 10:36:22 +02:00
parent d9d76ecd19 23f3fff367
commit d927d72204
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandlerIntegrationTests.java
View File

@ -19,6 +19,8 @@ package org.springframework.http.server.reactive;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
@ -69,9 +71,7 @@ public class XmlHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe
ResponseEntity<Person> response = restTemplate.exchange(request, Person.class);
assertEquals(janeDoe, response.getBody());
while (!handler.requestComplete) {
Thread.sleep(100);
}
handler.requestComplete.await(10, TimeUnit.SECONDS);
if (handler.requestError != null) {
throw handler.requestError;
}
@ -81,7 +81,7 @@ public class XmlHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe
private static class XmlHandler implements HttpHandler {
private volatile boolean requestComplete = false;
private CountDownLatch requestComplete = new CountDownLatch(1);
private Person requestPerson;
@ -108,7 +108,7 @@ public class XmlHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe
requestError = ex;
}
finally {
requestComplete = true;
requestComplete.countDown();
}
};