Permalink
Browse files

Maintenance: merged the changes from the master branch, and added a m…

…aven dependency on the newly created Maven-based wo-furi project.
  • Loading branch information...
1 parent b9d95c0 commit 08cfcf4d8e5fde945e64bf2269dae771a81a1e0f @green-coder green-coder committed Apr 9, 2012
Showing with 9 additions and 2 deletions.
  1. +6 −0 pom.xml
  2. +3 −2 src/test/java/org/webbitserver/rest/RestTest.java
View
@@ -72,6 +72,12 @@
<version>3.2.7.Final</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.weborganic</groupId>
+ <artifactId>furi</artifactId>
+ <version>0.8.4</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -9,6 +9,7 @@
import org.webbitserver.WebServer;
import java.io.IOException;
+import java.util.concurrent.ExecutionException;
import static org.junit.Assert.assertEquals;
import static org.webbitserver.WebServers.createWebServer;
@@ -23,8 +24,8 @@
private Rest rest = new Rest(webServer);
@After
- public void die() throws IOException, InterruptedException {
- webServer.stop().join();
+ public void die() throws IOException, InterruptedException, ExecutionException {
+ webServer.stop().get();
}
@Test

0 comments on commit 08cfcf4

Please sign in to comment.