From d71ba251ed7476edd24c5271b934ece7019e8686 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 16 Oct 2018 14:52:54 +0200 Subject: [PATCH] make java sample code independent of Scala (#25800) * need this for gathering and compiling java sources (in IDE), https://github.com/patriknw/akka-compile-ide-java --- .../typed/BasicClusterExampleTest.java | 26 +++++++++++++++---- ...ctJavaTest.scala => AbstractJavaTest.java} | 6 ++--- 2 files changed, 24 insertions(+), 8 deletions(-) rename akka-docs/src/test/java/jdocs/{AbstractJavaTest.scala => AbstractJavaTest.java} (57%) diff --git a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java index 4d55d86859..f8d1a1cdef 100644 --- a/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java +++ b/akka-cluster-typed/src/test/java/jdocs/akka/cluster/typed/BasicClusterExampleTest.java @@ -11,17 +11,33 @@ import akka.cluster.ClusterEvent; import akka.cluster.typed.*; //#cluster-imports import akka.actor.testkit.typed.javadsl.TestProbe; -import docs.akka.cluster.typed.BasicClusterManualSpec; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; // FIXME these tests are awaiting typed Java testkit to be able to await cluster forming like in BasicClusterExampleSpec public class BasicClusterExampleTest { // extends JUnitSuite { + private Config clusterConfig = ConfigFactory.parseString( + "akka { \n" + + " actor.provider = cluster \n" + + " remote { \n" + + " netty.tcp { \n" + + " hostname = \"127.0.0.1\" \n" + + " port = 2551 \n" + + " } \n" + + " } \n" + + "} \n"); + + private Config noPort = ConfigFactory.parseString( + " akka.remote.netty.tcp.port = 0 \n" + + " akka.remote.artery.canonical.port = 0 \n"); + // @Test public void clusterApiExample() { ActorSystem system = ActorSystem.create(Behaviors.empty(), "ClusterSystem", - BasicClusterManualSpec.noPort().withFallback(BasicClusterManualSpec.clusterConfig())); + noPort.withFallback(clusterConfig)); ActorSystem system2 = ActorSystem.create(Behaviors.empty(), "ClusterSystem", - BasicClusterManualSpec.noPort().withFallback(BasicClusterManualSpec.clusterConfig())); + noPort.withFallback(clusterConfig)); try { //#cluster-create @@ -52,9 +68,9 @@ public class BasicClusterExampleTest { // extends JUnitSuite { // @Test public void clusterLeave() throws Exception { ActorSystem system = ActorSystem.create(Behaviors.empty(), "ClusterSystem", - BasicClusterManualSpec.noPort().withFallback(BasicClusterManualSpec.clusterConfig())); + noPort.withFallback(clusterConfig)); ActorSystem system2 = ActorSystem.create(Behaviors.empty(), "ClusterSystem", - BasicClusterManualSpec.noPort().withFallback(BasicClusterManualSpec.clusterConfig())); + noPort.withFallback(clusterConfig)); try { Cluster cluster = Cluster.get(system); diff --git a/akka-docs/src/test/java/jdocs/AbstractJavaTest.scala b/akka-docs/src/test/java/jdocs/AbstractJavaTest.java similarity index 57% rename from akka-docs/src/test/java/jdocs/AbstractJavaTest.scala rename to akka-docs/src/test/java/jdocs/AbstractJavaTest.java index 840357dc9d..7e5c3563e7 100644 --- a/akka-docs/src/test/java/jdocs/AbstractJavaTest.scala +++ b/akka-docs/src/test/java/jdocs/AbstractJavaTest.java @@ -2,13 +2,13 @@ * Copyright (C) 2016-2018 Lightbend Inc. */ -package jdocs +package jdocs; -import org.scalatest.junit.JUnitSuite +import org.scalatest.junit.JUnitSuite; /** * Base class for all runnable example tests written in Java */ -abstract class AbstractJavaTest extends JUnitSuite { +public abstract class AbstractJavaTest extends JUnitSuite { }