Commit graph

54 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Derek Williams
846d63aa92 Merge branch 'master' into delimited-continuations
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/dispatch/Future.scala
	project/build/AkkaProject.scala
2011-04-30 08:59:45 -06:00
Viktor Klang
c2486cd52c Fixing ticket 808 2011-04-29 17:15:00 +02:00
Patrik Nordwall
6576cd51e9 Scala style fixes, added parens for side effecting shutdown methods 2011-04-29 10:20:16 +02:00
Derek Williams
485013a353 Dispatcher executed Future will be cleaned up even after expiring 2011-04-27 20:45:39 -06:00
Jonas Bonér
fb008632cb All tests passing except akka-remote 2011-04-27 15:00:41 +02:00
Jonas Bonér
2e7c76dd98 Rebased from master 2011-04-27 00:38:10 +02:00
Roland
df9be27718 test exception reception on TestActorRef.apply() 2011-04-21 21:59:12 +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
b6446f50dd proxy isDefinedAt/apply through TestActorRef 2011-04-21 21:31:24 +02:00
Roland Kuhn
9c539e96fe add TestActorRef
- add adaptation of ActorRefSpec test suite
- add some more specific tests
2011-04-16 22:20:04 +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
Patrik Nordwall
d4510831f3 fixed warnings, error -> sys.error 2011-04-08 14:43:15 +02:00
patriknw
0abf51d878 moved tests from akka-actor to new module akka-actor-tests to fix circular dependencies between testkit and akka-actor 2011-04-06 07:45:42 +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
03ae6100cd document CTD adaption of ActorModelSpec 2011-03-27 10:25:01 +02:00
Jonas Bonér
711e62fc3f Moved EventHandler to 'akka.event' plus added 'error' method without exception param 2011-03-23 15:12:09 +01:00
Roland Kuhn
52e5e35e50 Merge branch 'wip-CallingThreadDispatcher'
Conflicts:
	akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
	project/build/AkkaProject.scala
both resolved by "union" approach

- change wavesOfActors test for CTD: scheduling SHUTDOWN 10000 times does not
  work so well...
- add executeFuture with trivial implementation, TBC
2011-03-17 22:18:39 +01:00