Merge commit

This commit is contained in:
Viktor Klang 2011-09-29 13:11:35 +02:00
commit a12ee36151
57 changed files with 596 additions and 275 deletions

View file

@ -119,7 +119,7 @@ trait TestKitLight {
* Stop test actor. Should be done at the end of the test unless relying on
* test actor timeout.
*/
def stopTestActor { testActor.stop() }
def stopTestActor() { testActor.stop() }
/**
* Set test actor timeout. By default, the test actor shuts itself down
@ -144,7 +144,7 @@ trait TestKitLight {
/**
* Stop ignoring messages in the test actor.
*/
def ignoreNoMsg { testActor ! TestActor.SetIgnore(None) }
def ignoreNoMsg() { testActor ! TestActor.SetIgnore(None) }
/**
* Obtain current time (`System.nanoTime`) as Duration.
@ -431,7 +431,7 @@ trait TestKitLight {
/**
* Same as `expectNoMsg(remaining)`, but correctly treating the timeFactor.
*/
def expectNoMsg { expectNoMsg_internal(remaining) }
def expectNoMsg() { expectNoMsg_internal(remaining) }
/**
* Assert that no message is received for the specified time.