Merged latest master, fighting missing deps

This commit is contained in:
Viktor Klang 2010-03-23 00:29:18 +01:00
commit e571161866
197 changed files with 6479 additions and 3748 deletions

View file

@ -1,4 +1,4 @@
package se.scalablesolutions.akka.state
package se.scalablesolutions.akka.persistence.redis
import junit.framework.TestCase
@ -29,6 +29,7 @@ case object LogSize
class AccountActor extends Transactor {
private lazy val accountState = RedisStorage.newMap
private lazy val txnLog = RedisStorage.newVector
//timeout = 5000
def receive = {
// check balance
@ -86,6 +87,7 @@ class AccountActor extends Transactor {
}
@serializable class PersistentFailerActor extends Transactor {
// timeout = 5000
def receive = {
case "Failure" =>
throw new RuntimeException("expected")
@ -140,7 +142,7 @@ class RedisPersistentActorSpec extends TestCase {
bactor.start
bactor !! Credit("a-123", 5000)
assertEquals(BigInt(5000), (bactor !! Balance("a-123")).get)
assertEquals(BigInt(5000), (bactor !! (Balance("a-123"), 5000)).get)
val failer = new PersistentFailerActor
failer.start
@ -149,7 +151,7 @@ class RedisPersistentActorSpec extends TestCase {
fail("should throw exception")
} catch { case e: RuntimeException => {}}
assertEquals(BigInt(5000), (bactor !! Balance("a-123")).get)
assertEquals(BigInt(5000), (bactor !! (Balance("a-123"), 5000)).get)
// should not count the failed one
val c: Integer = (bactor !! LogSize).get