Skip to content

Commit 5735ed3

Browse files
committed
[JAVA-48023] Moved code for articles /java-thread-join and /java-completablefuture-timeout from core-java-concurrency-simple to core-java-concurrency-basic-5
1 parent 64cfeb5 commit 5735ed3

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/completablefuture/CompletableFutureTimeoutUnitTest.java renamed to core-java-modules/core-java-concurrency-basic-5/src/test/java/com/baeldung/concurrent/completablefuture/CompletableFutureTimeoutUnitTest.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
package com.baeldung.concurrent.completablefuture;
22

3-
import com.github.tomakehurst.wiremock.WireMockServer;
4-
import com.github.tomakehurst.wiremock.client.WireMock;
5-
import org.junit.jupiter.api.AfterAll;
6-
import org.junit.jupiter.api.BeforeAll;
7-
import org.junit.jupiter.api.Test;
8-
import org.junit.jupiter.api.TestInstance;
3+
import static com.github.tomakehurst.wiremock.client.WireMock.*;
4+
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
import static org.junit.jupiter.api.Assertions.assertThrows;
96

107
import java.io.BufferedReader;
11-
import java.io.IOException;
128
import java.io.InputStreamReader;
139
import java.net.HttpURLConnection;
1410
import java.net.URI;
1511
import java.net.URL;
16-
import java.util.concurrent.*;
12+
import java.util.concurrent.CompletableFuture;
13+
import java.util.concurrent.ExecutionException;
14+
import java.util.concurrent.Executors;
15+
import java.util.concurrent.ScheduledExecutorService;
16+
import java.util.concurrent.TimeUnit;
17+
import java.util.concurrent.TimeoutException;
1718

18-
import static com.github.tomakehurst.wiremock.client.WireMock.*;
19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertThrows;
19+
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.BeforeAll;
21+
import org.junit.jupiter.api.Test;
22+
import org.junit.jupiter.api.TestInstance;
23+
24+
import com.github.tomakehurst.wiremock.WireMockServer;
25+
import com.github.tomakehurst.wiremock.client.WireMock;
2126

2227
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2328
class CompletableFutureTimeoutUnitTest {

core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/concurrent/threadjoin/ThreadJoinUnitTest.java renamed to core-java-modules/core-java-concurrency-basic-5/src/test/java/com/baeldung/concurrent/threadjoin/ThreadJoinUnitTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.baeldung.concurrent.threadjoin;
22

3+
import static org.junit.Assert.assertFalse;
4+
import static org.junit.Assert.assertTrue;
5+
36
import org.junit.Ignore;
47
import org.junit.Test;
58
import org.slf4j.Logger;
69
import org.slf4j.LoggerFactory;
710

8-
import static org.junit.Assert.assertFalse;
9-
import static org.junit.Assert.assertTrue;
10-
1111
/**
1212
* Demonstrates Thread.join behavior.
1313
*

0 commit comments

Comments
 (0)