Skip to content

Commit 8818460

Browse files
committed
Fix submission fsm test
1 parent 826d6cb commit 8818460

File tree

5 files changed

+36
-4
lines changed

5 files changed

+36
-4
lines changed

persistence-model/src/main/scala/hmda/persistence/model/HmdaActor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait HmdaActor extends Actor with ActorLogging {
66

77
override def preStart(): Unit = {
88
log.info(s"Actor started at ${self.path}")
9-
log.info("Thread name for actor: " + Thread.currentThread().getName)
9+
//log.info("Thread name for actor: " + Thread.currentThread().getName)
1010
}
1111

1212
override def postStop(): Unit = {

persistence/src/main/scala/hmda/persistence/HmdaSupervisor.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ class HmdaSupervisor(validationStats: ActorRef) extends HmdaSupervisorActor {
8181

8282
private def createSubmissions(name: String, institutionId: String, period: String): ActorRef = {
8383
val sId = s"$name-$institutionId-$period"
84-
val actor = context.actorOf(SubmissionPersistence
85-
.props(institutionId, period)
86-
.withDispatcher("persistence-dispatcher"), sId)
84+
val actor = context.actorOf(SubmissionPersistence.props(institutionId, period).withDispatcher("persistence-dispatcher"), sId)
8785
supervise(actor, sId)
8886
}
8987

persistence/src/main/scala/hmda/persistence/institutions/SubmissionPersistence.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class SubmissionPersistence(institutionId: String, period: String) extends HmdaP
6868
val newSubmission = Submission(submissionId, Created, System.currentTimeMillis(), 0L)
6969
persist(SubmissionCreated(newSubmission)) { e =>
7070
updateState(e)
71+
log.debug(s"Submission Created with Submission Id: ${submissionId.toString}")
7172
sender() ! Some(newSubmission)
7273
}
7374

persistence/src/test/resources/application.conf

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,20 @@ akka.test.single-expect-default = 10s
1515
hmda {
1616
isDemo = false
1717
}
18+
19+
persistence-dispatcher {
20+
type = Dispatcher
21+
executor = "fork-join-executor"
22+
fork-join-executor {
23+
# Min number of threads to cap factor-based parallelism number to
24+
parallelism-min = 2
25+
# Parallelism (threads) ... ceil(available processors * factor)
26+
parallelism-factor = 2.0
27+
# Max number of threads to cap factor-based parallelism number to
28+
parallelism-max = 10
29+
}
30+
# Throughput defines the maximum number of messages to be
31+
# processed per actor before the thread jumps to the next actor.
32+
# Set to 1 for as fair as possible.
33+
throughput = 100
34+
}

persistence/src/test/scala/hmda/persistence/processing/SubmissionFSMSpec.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ import akka.actor.ActorRef
44
import akka.testkit.TestProbe
55
import hmda.model.fi.{ Submission, SubmissionId }
66
import hmda.persistence.HmdaSupervisor
7+
import hmda.persistence.institutions.SubmissionPersistence
8+
import hmda.persistence.institutions.SubmissionPersistence.CreateSubmission
79
import hmda.persistence.messages.CommonMessages.GetState
810
import hmda.persistence.model.ActorSpec
911
import hmda.persistence.processing.ProcessingMessages._
1012
import hmda.persistence.processing.SubmissionFSM._
1113
import hmda.validation.ValidationStats
1214

15+
import scala.concurrent.Await
16+
import scala.concurrent.duration._
17+
import akka.pattern.ask
18+
import akka.util.Timeout
19+
1320
class SubmissionFSMSpec extends ActorSpec {
1421

1522
val probe = TestProbe()
@@ -19,6 +26,15 @@ class SubmissionFSMSpec extends ActorSpec {
1926
val validationStats = ValidationStats.createValidationStats(system)
2027
val supervisor = HmdaSupervisor.createSupervisor(system, validationStats)
2128

29+
val duration = 5.seconds
30+
implicit val timeout = Timeout(duration)
31+
32+
override def beforeAll(): Unit = {
33+
super.beforeAll()
34+
val submissionPersistence = system.actorOf(SubmissionPersistence.props(submissionId.institutionId, submissionId.period))
35+
Await.result(submissionPersistence ? CreateSubmission, duration)
36+
}
37+
2238
"Submission Finite State Machine" must {
2339
"transition through states" in {
2440
val fsm = actorRef()

0 commit comments

Comments
 (0)