From c8a7f22a45958258c3d7be269a0eeb170a4d363f Mon Sep 17 00:00:00 2001 From: Jaime Freire <5436581+jaimefreire@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:58:58 +0100 Subject: [PATCH] Cleanups and fixed test --- .../social_altruism/chat/PotQuickStart.java | 9 +++-- .../chat/participant/Participant.java | 16 ++++---- .../chat/participant/ParticipantProtocol.java | 2 - .../social_altruism/chat/potroom/PotRoom.java | 11 ++--- .../chat/potroom/PotRoomProtocol.java | 4 +- .../social_altruism/chat/potroom/Session.java | 1 - .../chat/potroom/SessionProtocol.java | 1 - .../chat/PotQuickStartTest.java | 40 ++++++++----------- 8 files changed, 36 insertions(+), 48 deletions(-) diff --git a/src/main/java/dev/freireservices/social_altruism/chat/PotQuickStart.java b/src/main/java/dev/freireservices/social_altruism/chat/PotQuickStart.java index 697f58e..c71b863 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/PotQuickStart.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/PotQuickStart.java @@ -1,19 +1,20 @@ package dev.freireservices.social_altruism.chat; -import static dev.freireservices.social_altruism.chat.participant.ParticipantType.*; - import akka.actor.typed.ActorRef; import akka.actor.typed.ActorSystem; import akka.actor.typed.Behavior; import akka.actor.typed.Terminated; import akka.actor.typed.javadsl.Behaviors; -import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; import dev.freireservices.social_altruism.chat.participant.Participant; +import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; import dev.freireservices.social_altruism.chat.potroom.PotRoom; +import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol; + import java.util.ArrayList; import java.util.List; +import static dev.freireservices.social_altruism.chat.participant.ParticipantType.*; + public class PotQuickStart { public static final int MONEDAS_INIT = 100; diff --git a/src/main/java/dev/freireservices/social_altruism/chat/participant/Participant.java b/src/main/java/dev/freireservices/social_altruism/chat/participant/Participant.java index 8c11a58..4ecd0f4 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/participant/Participant.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/participant/Participant.java @@ -1,25 +1,23 @@ package dev.freireservices.social_altruism.chat.participant; -import static dev.freireservices.social_altruism.chat.participant.ParticipantType.*; -import static dev.freireservices.social_altruism.chat.participant.ParticipantType.JUSTICIERO; - import akka.actor.typed.ActorRef; import akka.actor.typed.Behavior; import akka.actor.typed.javadsl.ActorContext; import akka.actor.typed.javadsl.Behaviors; import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.*; import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.PotRoomMessage; - -import java.security.SecureRandom; -import java.sql.Time; -import java.util.List; -import java.util.concurrent.TimeUnit; - import dev.freireservices.social_altruism.chat.potroom.SessionProtocol; import dev.freireservices.social_altruism.chat.potroom.SessionProtocol.SessionMessage; import lombok.Getter; import lombok.Setter; +import java.security.SecureRandom; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import static dev.freireservices.social_altruism.chat.participant.ParticipantType.JUSTICIERO; +import static dev.freireservices.social_altruism.chat.participant.ParticipantType.SANTO; + @Setter @Getter public class Participant { diff --git a/src/main/java/dev/freireservices/social_altruism/chat/participant/ParticipantProtocol.java b/src/main/java/dev/freireservices/social_altruism/chat/participant/ParticipantProtocol.java index 51181d0..7db134e 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/participant/ParticipantProtocol.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/participant/ParticipantProtocol.java @@ -1,9 +1,7 @@ package dev.freireservices.social_altruism.chat.participant; import akka.actor.typed.ActorRef; -import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol; import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.PotRoomMessage; -import dev.freireservices.social_altruism.chat.potroom.SessionProtocol; import dev.freireservices.social_altruism.chat.potroom.SessionProtocol.SessionMessage; import java.util.List; diff --git a/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoom.java b/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoom.java index 3ef1727..78b4783 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoom.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoom.java @@ -1,14 +1,12 @@ package dev.freireservices.social_altruism.chat.potroom; -import static dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.*; -import static java.nio.charset.StandardCharsets.*; - import akka.actor.typed.ActorRef; import akka.actor.typed.Behavior; import akka.actor.typed.javadsl.ActorContext; import akka.actor.typed.javadsl.Behaviors; -import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.*; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; +import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.*; +import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.EnterPot; +import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.PotRoomMessage; import dev.freireservices.social_altruism.chat.potroom.SessionProtocol.SessionMessage; import lombok.Getter; @@ -16,6 +14,9 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import static dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.*; +import static java.nio.charset.StandardCharsets.UTF_8; + @Getter public class PotRoom { private final ActorContext context; diff --git a/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoomProtocol.java b/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoomProtocol.java index c15d084..f5d5ee3 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoomProtocol.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/potroom/PotRoomProtocol.java @@ -2,9 +2,7 @@ package dev.freireservices.social_altruism.chat.potroom; import akka.actor.typed.ActorRef; -import java.util.List; - -import static dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.*; +import static dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; public class PotRoomProtocol { public interface PotRoomMessage {} diff --git a/src/main/java/dev/freireservices/social_altruism/chat/potroom/Session.java b/src/main/java/dev/freireservices/social_altruism/chat/potroom/Session.java index 75cce7b..c485c0a 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/potroom/Session.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/potroom/Session.java @@ -4,7 +4,6 @@ import akka.actor.typed.ActorRef; import akka.actor.typed.Behavior; import akka.actor.typed.javadsl.ActorContext; import akka.actor.typed.javadsl.Behaviors; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.PotReturned; import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.SessionEnded; diff --git a/src/main/java/dev/freireservices/social_altruism/chat/potroom/SessionProtocol.java b/src/main/java/dev/freireservices/social_altruism/chat/potroom/SessionProtocol.java index bb36790..99d398a 100644 --- a/src/main/java/dev/freireservices/social_altruism/chat/potroom/SessionProtocol.java +++ b/src/main/java/dev/freireservices/social_altruism/chat/potroom/SessionProtocol.java @@ -1,7 +1,6 @@ package dev.freireservices.social_altruism.chat.potroom; import akka.actor.typed.ActorRef; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol.PotRoomMessage; import lombok.Getter; diff --git a/src/test/java/dev/freireservices/social_altruism/chat/PotQuickStartTest.java b/src/test/java/dev/freireservices/social_altruism/chat/PotQuickStartTest.java index 87cef0e..0cb662a 100644 --- a/src/test/java/dev/freireservices/social_altruism/chat/PotQuickStartTest.java +++ b/src/test/java/dev/freireservices/social_altruism/chat/PotQuickStartTest.java @@ -1,45 +1,39 @@ package dev.freireservices.social_altruism.chat; -import static dev.freireservices.social_altruism.chat.participant.ParticipantType.*; -import static java.net.URLEncoder.encode; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Mockito.mock; - import akka.actor.testkit.typed.javadsl.ActorTestKit; +import akka.actor.testkit.typed.javadsl.BehaviorTestKit; +import akka.actor.testkit.typed.javadsl.BehaviorTestKit$; import akka.actor.testkit.typed.javadsl.TestProbe; import akka.actor.typed.ActorRef; -import akka.actor.typed.javadsl.ActorContext; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.SessionEnded; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.SessionStarted; -import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol; -import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; import dev.freireservices.social_altruism.chat.participant.Participant; +import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol; +import dev.freireservices.social_altruism.chat.participant.ParticipantProtocol.ParticipantMessage; import dev.freireservices.social_altruism.chat.potroom.PotRoom; -import dev.freireservices.social_altruism.chat.potroom.Session; +import dev.freireservices.social_altruism.chat.potroom.PotRoomProtocol; +import org.junit.Test; import java.time.Duration; -import java.util.List; -import dev.freireservices.social_altruism.chat.potroom.SessionProtocol; -import dev.freireservices.social_altruism.chat.potroom.SessionProtocol.SessionMessage; -import org.junit.Test; +import static dev.freireservices.social_altruism.chat.participant.ParticipantType.*; public class PotQuickStartTest { public static final int INITIAL_COINS = 100; - public static final int TOTAL_PARTICIPANTS = 3; + public static final int TOTAL_PARTICIPANTS = 4; @Test // FIXME - Improve or delete.. - public void testCooperationCaseOne() throws InterruptedException { + public void testCooperationCaseOne() { final ActorTestKit testKit = ActorTestKit.create(); TestProbe testProbe = - testKit.createTestProbe("TestProbe"); + testKit.createTestProbe("TestProbe", ParticipantMessage.class); + var potRoom = PotRoom.create(TOTAL_PARTICIPANTS, 1); ActorRef chatRoomTest = - testKit.spawn(PotRoom.create(3, 1), "potRoom"); + testKit.spawn(potRoom, "potRoom"); + + BehaviorTestKit test = BehaviorTestKit.create(potRoom); ActorRef p1 = testKit.spawn(Participant.create(INITIAL_COINS, PICARO), "PICARO-1"); @@ -54,12 +48,12 @@ public class PotQuickStartTest { chatRoomTest.tell(new PotRoomProtocol.EnterPot(p1)); chatRoomTest.tell(new PotRoomProtocol.EnterPot(p2)); chatRoomTest.tell(new PotRoomProtocol.EnterPot(p3)); - //chatRoomTest.tell(new PotRoomProtocol.EnterPot(testProbe.ref())); + chatRoomTest.tell(new PotRoomProtocol.EnterPot(testProbe.ref())); //Session started - testProbe.expectMessageClass(SessionEnded.class, Duration.ofSeconds(20)); - + testProbe.expectMessageClass(ParticipantProtocol.SessionGranted.class, Duration.ofSeconds(20)); + testProbe.expectMessageClass(ParticipantProtocol.SessionStarted.class, Duration.ofSeconds(20)); }