Commit graph

73 commits

Author SHA1 Message Date
Peter Vlugter
0057acdd81 Some more quietening of tests 2011-08-05 18:41:54 +12:00
Derek Williams
8db226f663 Merge branch 'master' into derekjw-1054
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
2011-08-02 11:21:48 -06:00
Roland
acdc521b4f clean up test output some more
- filter out expected debug messages
- rename EventFilter.apply(f: Event => Boolean) to EventFilter.custom to
  allow type inference on provided function literal (does not work with
  overloading)
- add filterException[T] { ... }
2011-07-30 22:29:12 +02:00
Derek Williams
50bb14d9c3 Test output cleaned up in akka-actor-tests and akka-testkit 2011-07-29 15:22:11 -06:00
Derek Williams
02aeec6b57 Simpler method for filtering EventHandler during testing 2011-07-28 12:13:27 -06:00
Derek Williams
da987138dd Partial fix for ticket #1054: execute callbacks in dispatcher 2011-07-26 22:23:16 -06:00
Derek Williams
6d343b01f0 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
2011-07-26 12:50:09 -06:00
Peter Vlugter
f406cd98e0 Add abstract method for dispatcher name 2011-07-25 13:53:25 +12: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
Viktor Klang
3bc7db0dde Closing ticket #1030, removing lots of warnings 2011-07-19 19:28:46 +02:00
Roland
892c6e056c improve scaladoc of TestKit.expectMsgAllOf 2011-07-16 21:30:08 -04:00
Derek Williams
50dcdd411c Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
2011-07-15 11:31:24 -06:00
Viktor Klang
9d71be7778 Updating copyright section to Typesafe Inc. etc 2011-07-14 16:03:08 +02:00
Viktor Klang
e9f498a1df Unbreaking the build, adding missing file to checkin, I apologize for the inconvenience 2011-07-14 11:26:38 +02:00
Derek Williams
34ca784846 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-07-11 13:02:42 -06:00
Jonas Bonér
0b1ee758f5 1. Implemented replication through transaction log, e.g. logging all messages and replaying them after actor migration
2. Added first replication test (out of many)
3. Improved ScalaDoc
4. Enhanced the remote protocol with replication info

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-07-08 08:28:13 +02:00
Roland
5de2ca7aa5 remove Actor.preRestart(cause: Throwable)
- adapt all internal uses (all tests green)
- start migration guide for 2.0 with this change
2011-07-03 22:19:34 +02:00
Roland
e7f3945776 add TestKit.expectMsgType
- plus docs
- and replace softTimeout hack with better solution
2011-06-26 17:40:30 +02:00
Derek Williams
878b8c147b Merge branch 'master' into wip-derekjw
Conflicts:
	project/build/AkkaProject.scala
2011-06-23 13:31:14 -06: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
Derek Williams
d1b8b475fa Silence some more noisy tests 2011-06-20 15:11:32 -06:00
Derek Williams
23dcb5d1fe Merge branch 'master' into wip-derekjw 2011-06-19 14:49:50 -06:00
Roland
db2d296b81 ActorRef.start() returns this.type 2011-06-19 22:20:42 +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
b1533cb3d8 add TestFSMRef 2011-06-19 21:25:09 +02:00
Roland
39e41c6596 change all actor logging to use Actor, not ActorRef as source instance 2011-06-19 21:07:49 +02:00
Derek Williams
2c11662448 Improved TestEventListener 2011-06-19 12:06:20 -06: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
Derek Williams
bdb163bd2b Test for null Event message 2011-06-18 16:41:40 -06:00
Derek Williams
da5a442728 Nothing to see here... move along... 2011-06-17 22:56:30 -07:00
Derek Williams
a5bb34add5 Filter based on message in TestEventListener 2011-06-17 21:00:35 -06:00
Derek Williams
9bd9a3544e Merge branch 'master' into wip-derekjw 2011-06-17 16:46:36 -06:00
Derek Williams
6b73e0982a Added TestEventListener 2011-06-17 16:45:36 -06: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
ca592ef1b4 Merge branch 'master' of github.com:jboner/akka
Conflicts:
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
	akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
	akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
	akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
2011-06-14 00:19:54 +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
Viktor Klang
9c1a50ba2c Refactoring the use of !! to ?+.get for Akka internal code 2011-06-13 15:29:35 +02:00
Viktor Klang
fa0478bc32 Replacing !!! with ? 2011-06-13 13:43:21 +02:00
Viktor Klang
634e47043c Merge with master 2011-06-11 20:07:23 +02:00
Jonas Bonér
7dbc5ac958 Merged with master 2011-06-10 08:41:10 +02:00
Viktor Klang
417fcc779d Adding support for mailboxIsEmpty on MessageDispatcher and removing getMailboxSize and mailboxSize from ActorRef, use actorref.dispatcher.mailboxSize(actorref) and actorref.dispatcher.mailboxIsEmpty(actorref) 2011-06-07 13:23:24 -05:00
Jonas Bonér
04efc440d6 1. Made LocalActorRef aware of replication
2. Added configuration for transaction log replication
3. Added replication schemes WriteThrough and WriteBehind
4. Refactored serializer creation and lookup in Actor.scala
5. Extended network protocol with replication strategy
6. Added BookKeeper management to tests
7. Improved logging and error messages
8. Removed ReplicatedActorRef
9. Added snapshot management to TransactionLog

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-06-07 11:10:29 -07:00
Viktor Klang
f9d0b188af Removing ActorRef.isDefinedAt and Future.empty and moving Future.channel to Promise, renaming future to promise for the channel 2011-06-04 12:42:06 -07:00
Roland
4809b63fda fix bad move of CallingThreadDispatcherModelSpec 2011-05-19 23:08:39 +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
Jonas Bonér
2655d44ee9 Merged wip-2.0 branch with latest master 2011-05-16 12:32:00 +02:00