Commit graph

41 commits

Author SHA1 Message Date
Roland
d55f02e6c1 merge master into parental-supervision, fixing up resulting breakage 2011-10-21 15:11:43 +02:00
Roland
25f436d521 add TestKit.fishForMessage 2011-10-20 13:43:24 +02:00
Roland
d3837b9fc3 Introduce parental supervision, BUT TESTS ARE STILL FAILING
- every actor is now supervised, where the root of the tree is
  app.guardian, which has its supervisor field set to a special ActorRef
  obtained from provider.theOneWhoWalksTheBubblesOfSpaceTime (this name
  is meant to indicate that this ref is outside of the universe, cf.
  Michio Kaku)
- changed all tests to obtain specially supervised children (i.e. not
  top-level) via (supervisor ? Props).as[ActorRef].get
- add private[akka] ScalaActorRef.sendSystemMessage for sending
  Supervise()
- everything routing or remote is broken wrt. supervision, as that was
  not “properly” implemented to begin with, will be tackled after
  app/supervision/eventbus/AkkaSpec are stabilized enough
2011-10-19 17:18:50 +02:00
Viktor Klang
77dc9e9c35 #1299 - Removing reply and tryReply, preparing the way for 'sender ! response' 2011-10-19 16:59:47 +02:00
Viktor Klang
7a6508973f Adding extra output to give more hope in reproducing weird test failure that only happens in Jenkins 2011-10-18 12:40:44 +02:00
Roland
9e8091459b rename application to app everywhere to make it consistent 2011-10-13 14:23:44 +02:00
Roland
85b7accfd4 make EventHandler non-global
- add Logging trait for nicer interface
- add EventHandlerLogging class for offering the nice interface from
  app.log
- add eventHandler instance to app and use that for all internal logging
  (this means that some places (dispatchers, remoting) were infiltrated
  by app just to do logging, but I think we'll need app in there soon
  enough for other reasons)
2011-10-13 13:21:59 +02:00
Peter Vlugter
e25ee9f0e2 Fix remote main compile and testkit tests 2011-10-12 15:36:10 +02:00
Roland
93b1ef3703 make akka-actor-tests compile again 2011-10-11 16:05:48 +02:00
Roland
2599de0381 Scalariform & add AkkaSpec 2011-10-10 11:22:01 +02:00
Peter Vlugter
3aadcd7645 Update stm module to work with AkkaApplication 2011-10-07 15:22:36 +02:00
Roland
2381ec54d0 introduce AkkaApplication
- remove global Config
- pull everything which depended on it into new AkkaApplication
- leave EventHandler alone for the moment: that evil sucker gets his
  very own AkkaApplication("akka-reference.conf") until we have settled
  on an acceptable logging API without globals
- make akka-actor and akka-testkit compile
- TestKit uses implicit AkkaApplication passing for maximum convenience
- Actor object nearly completely removed, actor creation possible via
  ActorRefFactory interface which is implemented by AkkaApplication and
  ActorContext
- serialization of ActorRef is probably broken, and so is the reflective
  RemoteSupport (now needs AkkaApplication constructor arg)
- everything else is still broken, including akka-actor-tests, so this
  is of course all not runtime-tested
2011-10-06 21:19:46 +02:00
Viktor Klang
a12ee36151 Merge commit 2011-09-29 13:11:35 +02:00
Roland
fd78af410c add () after side-effecting TestKit methods, fixes #1234 2011-09-28 12:59:51 +02:00
Viktor Klang
24d9a4d143 Merging with master 2011-09-27 18:02:57 +02:00
Peter Vlugter
7b1cdb4457 Remove SelfActorRef and use ActorContext to access state in ActorInstance. See #1202
- removed SelfActorRef
- added an ActorContext interface that provides a view into ActorInstance
- the ActorInstance (as ActorContext) gets injected into the Actor
- moved self methods like sender and reply directly to the Actor
2011-09-19 12:03:15 +02:00
Roland
c1d9b49935 improve failure messages in case of expectMsg... timeout
- always include the (set of) expected message(s)
- only thing missing is in case of expectMsgPF: cannot print PF code
2011-09-16 10:59:12 +02:00
Viktor Klang
bbb79d8e0d Start removed but cluster is broken 2011-09-08 11:02:17 +02:00
Viktor Klang
c7d58c600b Adding initial support for Props 2011-08-26 17:25:18 +02:00
Roland
42769599aa Merge branch 'ticket955'
Conflicts:
	akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala
	akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
	akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
2011-07-19 16:56:44 -04:00
Roland
892c6e056c improve scaladoc of TestKit.expectMsgAllOf 2011-07-16 21:30:08 -04:00
Viktor Klang
9d71be7778 Updating copyright section to Typesafe Inc. etc 2011-07-14 16:03:08 +02:00
Roland
e7f3945776 add TestKit.expectMsgType
- plus docs
- and replace softTimeout hack with better solution
2011-06-26 17:40:30 +02:00
Jonas Bonér
a4980446a0 Merge with upstream master 2011-06-22 10:01:31 +02:00
Jonas Bonér
4d31751793 Fixed clustered management of actor serializer.
Various renames and refactorings.
Changed all internal usages of 'actorOf' to 'localActorOf'.

Signed-off-by: Jonas Bonér <jonasremove@jonasboner.com>
2011-06-22 09:59:00 +02:00
Roland
3d40a0f529 add TestFSMRefSpec and make TestFSMRef better accessible
- add address argument to TestFSMRef factory
- set address of TestKit.testActor to "testActor#" with monotonically
  increasing number #
2011-06-19 21:42:08 +02:00
Roland
39e41c6596 change all actor logging to use Actor, not ActorRef as source instance 2011-06-19 21:07:49 +02:00
Roland
2852e1a763 make available TestKitLight without implicit ActorRef 2011-06-19 17:41:19 +02:00
Roland
1970b96ae5 make TestKit methods return most specific type
document all testkit methods
2011-06-19 17:35:11 +02:00
Roland
f770cfca59 improve usability of TestKit.expectMsgPF
background: PartialFunction literals don't work if they encounter
overload resolution, because scalac then complains about not fully
defined argument types.
2011-06-19 16:50:35 +02:00
Roland
5933780bca TestKit timeouts and awaitCond (from release-1.2)
- move akka.testing from akka-actor-tests to akka-testkit/akka.testkit
- move timeFactor from Testing to Duration and add .dilated method
- add Duration.{min, max}
- add TestKit.awaitCond
- use Duration.dilated on all max Durations in TestKit
- fix up loose ends

Conflicts:

	akka-actor-tests/src/main/scala/akka/testing/Testing.scala
	akka-actor-tests/src/test/scala/akka/actor/actor/ActorRefSpec.scala
	akka-actor-tests/src/test/scala/akka/actor/supervisor/SupervisorSpec.scala
	akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
	akka-actor/src/main/scala/akka/util/Duration.scala
	akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
	akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala
	akka-testkit/src/main/scala/akka/testkit/TestKit.scala
	akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
2011-06-17 22:19:17 +02:00
Roland
7712c20620 unify sender/senderFuture into channel (++)
(squashed merge from the various bits and pieces already part of
release-1.2, everything related to Channel & Future)
2011-06-13 22:36:46 +02:00
Roland
a48f6fdf90 add copyright headers 2011-05-19 21:34:21 +02:00
Jonas Bonér
a7311c83e6 Added Scalariform sbt plugin which formats code on each compile. Also checking in reformatted code 2011-05-18 17:25:30 +02:00
Roland
cb332b2756 make testActor.dispatcher=CallingThreadDispatcher
- it's needed for unit testing, and it does not hurt since testActor
  does not send anything
2011-04-21 21:31:30 +02:00
Roland Kuhn
85daa9f8e2 Merge branch 'master' into wip-testkit 2011-04-15 20:35:55 +02:00
Patrik Nordwall
3c8e375f30 Added parens to stop 2011-04-12 10:53:56 +02:00
Patrik Nordwall
087191f19f Added parens to start 2011-04-12 09:56:17 +02:00
Roland Kuhn
b169f35643 fix error handling in TestKit.within
restore outer deadline in case the code block does throw an exception.
This is done in order to reduce the number of follow-on test failures.
2011-03-27 18:15:40 +02:00
Roland Kuhn
3d28e6ad0f create akka-testkit subproject
- modify AkkaProject.scala
- move CallingThreadDispatcher & Spec and TestKit into akka-testkit
- update FSMTimingSpec accordingly
2011-03-05 14:36:08 +01:00
Roland Kuhn
50b2c14235 create akka-testkit subproject
- modify AkkaProject.scala
- move CallingThreadDispatcher & Spec and TestKit into akka-testkit
- update FSMTimingSpec accordingly
2011-03-05 14:36:08 +01:00
Renamed from akka-actor/src/main/scala/akka/util/TestKit.scala (Browse further)