From a00ae5006c3b19688283fcf69fd9bb7ff2c82b45 Mon Sep 17 00:00:00 2001 From: Yaroslav Klymko Date: Mon, 31 Aug 2015 08:01:27 +0300 Subject: [PATCH] fix Fix JournalSpec: swap AtomicWrite(Seq) with Seq(AtomicWrite) --- .../persistence/journal/JournalSpec.scala | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala index 90c3c320c2..8bb124a4cf 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala @@ -56,24 +56,24 @@ abstract class JournalSpec(config: Config) extends PluginSpec(config) { ReplayedMessage(PersistentImpl(s"a-${snr}", snr, pid, "", deleted, Actor.noSender, writerUuid)) def writeMessages(fromSnr: Int, toSnr: Int, pid: String, sender: ActorRef, writerUuid: String): Unit = { + + def persistentRepr(sequenceNr: Long) = PersistentRepr( + payload = s"a-$sequenceNr", sequenceNr = sequenceNr, persistenceId = pid, + sender = sender, writerUuid = writerUuid) + val msgs = - if (supportsAtomicPersistAllOfSeveralEvents) - (fromSnr to toSnr).map { i ⇒ - AtomicWrite(PersistentRepr(payload = s"a-$i", sequenceNr = i, persistenceId = pid, sender = sender, - writerUuid = writerUuid)) - } - else + if (supportsAtomicPersistAllOfSeveralEvents) { (fromSnr to toSnr - 1).map { i ⇒ if (i == toSnr - 1) - AtomicWrite(List( - PersistentRepr(payload = s"a-$i", sequenceNr = i, persistenceId = pid, sender = sender, - writerUuid = writerUuid), - PersistentRepr(payload = s"a-${i + 1}", sequenceNr = i + 1, persistenceId = pid, sender = sender, - writerUuid = writerUuid))) + AtomicWrite(List(persistentRepr(i), persistentRepr(i + 1))) else - AtomicWrite(PersistentRepr(payload = s"a-${i}", sequenceNr = i, persistenceId = pid, sender = sender, - writerUuid = writerUuid)) + AtomicWrite(persistentRepr(i)) } + } else { + (fromSnr to toSnr).map { i ⇒ + AtomicWrite(PersistentRepr(persistentRepr(i))) + } + } val probe = TestProbe()