raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

StreamTcpDocSpec: Less race, better error if client fails #24500

Browse source
This commit is contained in:
Johan Andrén 2018-02-12 14:42:52 +01:00 • committed by GitHub
parent 4cde6e7feb
commit cb048457c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

51
akka-docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
View file

@ -12,6 +12,7 @@ import jdocs.AbstractJavaTest;
import jdocs.stream.SilenceSystemOut;
import akka.testkit.javadsl.TestKit;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@ -47,7 +48,7 @@ public class StreamTcpDocTest extends AbstractJavaTest {
final SilenceSystemOut.System System = SilenceSystemOut.get();
private final ConcurrentLinkedQueue<String> input = new ConcurrentLinkedQueue<String>();
private final ConcurrentLinkedQueue<String> input = new ConcurrentLinkedQueue<>();
{
input.add("Hello world");
input.add("What a lovely day");
@ -90,27 +91,27 @@ public class StreamTcpDocTest extends AbstractJavaTest {
}
@Test
public void actuallyWorkingClientServerApp() {
public void actuallyWorkingClientServerApp() throws Exception {
final InetSocketAddress localhost = SocketUtil.temporaryServerAddress("127.0.0.1", false);
final TestProbe serverProbe = new TestProbe(system);
final Source<IncomingConnection,CompletionStage<ServerBinding>> connections =
Tcp.get(system).bind(localhost.getHostString(), localhost.getPort());
Tcp.get(system).bind(localhost.getHostString(), localhost.getPort());
final CompletionStage<ServerBinding> bindingCS =
//#welcome-banner-chat-server
connections.runForeach(connection -> {
// server logic, parses incoming commands
final Flow<String, String, NotUsed> commandParser =
connections.to(Sink.foreach((IncomingConnection connection) -> {
// server logic, parses incoming commands
final Flow<String, String, NotUsed> commandParser =
Flow.<String>create()
.takeWhile(elem -> !elem.equals("BYE"))
.map(elem -> elem + "!");
final String welcomeMsg = "Welcome to: " + connection.localAddress() +
final String welcomeMsg = "Welcome to: " + connection.localAddress() +
" you are: " + connection.remoteAddress() + "!";
final Source<String, NotUsed> welcome = Source.single(welcomeMsg);
final Flow<ByteString, ByteString, NotUsed> serverLogic =
final Source<String, NotUsed> welcome = Source.single(welcomeMsg);
final Flow<ByteString, ByteString, NotUsed> serverLogic =
Flow.of(ByteString.class)
.via(Framing.delimiter(ByteString.fromString("\n"), 256, FramingTruncation.DISALLOW))
.map(ByteString::utf8String)
@ -122,16 +123,20 @@ public class StreamTcpDocTest extends AbstractJavaTest {
//#welcome-banner-chat-server
.via(commandParser)
.merge(welcome)
.map(s -> s + "\n")
.map(s -> s + "\n")
.map(ByteString::fromString);
connection.handleWith(serverLogic, mat);
}, mat);
connection.handleWith(serverLogic, mat);
})).run(mat);
//#welcome-banner-chat-server
// make sure server is bound before we do anything else
bindingCS.toCompletableFuture().get(3, TimeUnit.SECONDS);
{
//#repl-client
// just for docs, never actually used
//#repl-client
final Flow<ByteString, ByteString, CompletionStage<OutgoingConnection>> connection =
Tcp.get(system).outgoingConnection("127.0.0.1", 8888);
//#repl-client
@ -139,13 +144,13 @@ public class StreamTcpDocTest extends AbstractJavaTest {
{
final Flow<ByteString, ByteString, CompletionStage<OutgoingConnection>> connection =
Tcp.get(system).outgoingConnection(localhost.getHostString(), localhost.getPort());
Tcp.get(system).outgoingConnection(localhost.getHostString(), localhost.getPort());
//#repl-client
final Flow<String, ByteString, NotUsed> replParser =
Flow.<String>create()
.takeWhile(elem -> !elem.equals("q"))
.concat(Source.single("BYE")) // will run after the original flow completes
.map(elem -> ByteString.fromString(elem + "\n"));
Flow.<String>create()
.takeWhile(elem -> !elem.equals("q"))
.concat(Source.single("BYE")) // will run after the original flow completes
.map(elem -> ByteString.fromString(elem + "\n"));
final Flow<ByteString, ByteString, NotUsed> repl = Flow.of(ByteString.class)
.via(Framing.delimiter(ByteString.fromString("\n"), 256, FramingTruncation.DISALLOW))
@ -154,10 +159,12 @@ public class StreamTcpDocTest extends AbstractJavaTest {
.map(elem -> readLine("> "))
.via(replParser);
connection.join(repl).run(mat);
CompletionStage<OutgoingConnection> connectionCS = connection.join(repl).run(mat);
//#repl-client
}
// make sure it got connected (or fails the test)
connectionCS.toCompletableFuture().get(5L, TimeUnit.SECONDS);
}
serverProbe.expectMsg("Hello world");