Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Commit 25991d5

Browse files
committed
travis build: fix infinite loop
1 parent ced7972 commit 25991d5

File tree

2 files changed

+21
-29
lines changed

2 files changed

+21
-29
lines changed

jooby/src/test/java/org/jooby/AssetForwardingTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package org.jooby;
22

33
import static org.easymock.EasyMock.expect;
4+
import org.jooby.test.MockUnit;
45
import static org.junit.Assert.assertEquals;
6+
import org.junit.Test;
57

8+
import java.io.File;
69
import java.io.InputStream;
710
import java.net.URL;
811

9-
import org.jooby.Asset;
10-
import org.jooby.MediaType;
11-
import org.jooby.test.MockUnit;
12-
import org.junit.Test;
13-
1412
public class AssetForwardingTest {
1513

1614
@Test
@@ -75,13 +73,14 @@ public void path() throws Exception {
7573

7674
@Test
7775
public void url() throws Exception {
78-
new MockUnit(Asset.class, URL.class)
76+
URL url = new File("pom.xml").toURI().toURL();
77+
new MockUnit(Asset.class)
7978
.expect(unit -> {
8079
Asset asset = unit.get(Asset.class);
81-
expect(asset.resource()).andReturn(unit.get(URL.class));
80+
expect(asset.resource()).andReturn(url);
8281
})
8382
.run(unit -> {
84-
assertEquals(unit.get(URL.class), new Asset.Forwarding(unit.get(Asset.class)).resource());
83+
assertEquals(url, new Asset.Forwarding(unit.get(Asset.class)).resource());
8584
});
8685
}
8786

modules/coverage-report/src/test/java/org/jooby/ws/WebSocketPauseResumeFeature.java

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
package org.jooby.ws;
22

3+
import com.google.common.collect.Sets;
4+
import com.ning.http.client.AsyncHttpClient;
5+
import com.ning.http.client.AsyncHttpClientConfig;
6+
import com.ning.http.client.ws.WebSocket;
7+
import com.ning.http.client.ws.WebSocketTextListener;
8+
import com.ning.http.client.ws.WebSocketUpgradeHandler;
9+
import org.jooby.test.ServerFeature;
10+
import org.junit.After;
311
import static org.junit.Assert.assertEquals;
12+
import org.junit.Before;
13+
import org.junit.Test;
414

515
import java.util.HashSet;
616
import java.util.Set;
@@ -9,40 +19,23 @@
919
import java.util.concurrent.ScheduledExecutorService;
1020
import java.util.concurrent.TimeUnit;
1121

12-
import org.jooby.test.ServerFeature;
13-
import org.junit.After;
14-
import org.junit.Before;
15-
import org.junit.Test;
16-
17-
import com.google.common.collect.Sets;
18-
import com.ning.http.client.AsyncHttpClient;
19-
import com.ning.http.client.AsyncHttpClientConfig;
20-
import com.ning.http.client.ws.WebSocket;
21-
import com.ning.http.client.ws.WebSocketTextListener;
22-
import com.ning.http.client.ws.WebSocketUpgradeHandler;
23-
2422
public class WebSocketPauseResumeFeature extends ServerFeature {
2523

2624
static final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
25+
2726
{
2827
ws("/ws", ws -> {
29-
CountDownLatch latch = new CountDownLatch(1);
30-
3128
ws.pause();
3229
// 2nd ignored
3330
ws.pause();
3431

35-
executor.schedule(() -> {
36-
ws.resume();
37-
// 2nd call ignored
38-
ws.resume();
39-
latch.countDown();
40-
}, 1, TimeUnit.SECONDS);
32+
ws.resume();
33+
// 2nd call ignored
34+
ws.resume();
4135

4236
ws.onMessage(message -> {
4337

4438
ws.send("=" + message.value(), () -> {
45-
latch.await();
4639
ws.close();
4740
});
4841

0 commit comments

Comments
 (0)