raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' of git://github.com/jboner/akka

Browse source
This commit is contained in:
Hiram Chirino 2010-07-23 19:04:26 -04:00
commit e4c980b8f1
38 changed files with 62 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-core/src/test/scala/Messages.scala
View file

@ -7,9 +7,9 @@ package se.scalablesolutions.akka
import se.scalablesolutions.akka.serialization.Serializable
import sbinary._
import sbinary.Operations._
import sbinary.DefaultProtocol._
sealed abstract class TestMessage
case object Ping extends TestMessage
case object Pong extends TestMessage
case object OneWay extends TestMessage

1
akka-core/src/test/scala/ActiveObjectContextSpec.scala → akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala
View file

@ -5,7 +5,6 @@
package se.scalablesolutions.akka.actor
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner

2
akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala → akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala
View file

@ -8,7 +8,6 @@ import com.google.inject.AbstractModule
import com.google.inject.Scopes
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
@ -18,7 +17,6 @@ import se.scalablesolutions.akka.config.Config
import se.scalablesolutions.akka.config.ActiveObjectConfigurator
import se.scalablesolutions.akka.config.JavaConfig._
import se.scalablesolutions.akka.dispatch._
import se.scalablesolutions.akka.dispatch.FutureTimeoutException
@RunWith(classOf[JUnitRunner])
class ActiveObjectGuiceConfiguratorSpec extends

0
akka-core/src/test/scala/ActiveObjectLifecycleSpec.scala → akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala
View file

0
akka-core/src/test/scala/ActorFireForgetRequestReplySpec.scala → akka-core/src/test/scala/actor/ActorFireForgetRequestReplySpec.scala
View file

2
akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala → akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala
View file

@ -4,7 +4,7 @@ import org.scalatest.Suite
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.matchers.MustMatchers
import org.junit.{Before, After, Test}
import org.junit.Test
import java.util.concurrent.{ CountDownLatch, TimeUnit }
@RunWith(classOf[JUnitRunner])

0
akka-core/src/test/scala/ActorRegistrySpec.scala → akka-core/src/test/scala/actor/ActorRegistrySpec.scala
View file

4
akka-core/src/test/scala/AgentSpec.scala → akka-core/src/test/scala/actor/AgentSpec.scala
View file

@ -1,10 +1,6 @@
package se.scalablesolutions.akka.actor
import se.scalablesolutions.akka.actor.Actor.transactor
import se.scalablesolutions.akka.stm.Transaction.Global.atomic
import se.scalablesolutions.akka.util.Logging
import Actor._
import org.scalatest.Suite
import org.scalatest.junit.JUnitRunner
import org.scalatest.matchers.MustMatchers

0
akka-core/src/test/scala/Bench.scala → akka-core/src/test/scala/actor/Bench.scala
View file

3
akka-core/src/test/scala/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala → akka-core/src/test/scala/actor/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala
View file

@ -5,17 +5,14 @@
package se.scalablesolutions.akka.actor
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import se.scalablesolutions.akka.config.Config
import se.scalablesolutions.akka.config._
import se.scalablesolutions.akka.config.ActiveObjectConfigurator
import se.scalablesolutions.akka.config.JavaConfig._
import se.scalablesolutions.akka.actor._
@RunWith(classOf[JUnitRunner])
class DeclarativelySupervisedNestedTransactionalActiveObjectSpec extends

3
akka-core/src/test/scala/DeclarativelySupervisedTransactionalActiveObjectSpec.scala → akka-core/src/test/scala/actor/DeclarativelySupervisedTransactionalActiveObjectSpec.scala
View file

@ -5,17 +5,14 @@
package se.scalablesolutions.akka.actor
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import se.scalablesolutions.akka.config.Config
import se.scalablesolutions.akka.config._
import se.scalablesolutions.akka.config.ActiveObjectConfigurator
import se.scalablesolutions.akka.config.JavaConfig._
import se.scalablesolutions.akka.actor._
@RunWith(classOf[JUnitRunner])
class DeclarativelySupervisedTransactionalActiveObjectSpec extends

0
akka-core/src/test/scala/ForwardActorSpec.scala → akka-core/src/test/scala/actor/ForwardActorSpec.scala
View file

0
akka-core/src/test/scala/FutureSpec.scala → akka-core/src/test/scala/actor/FutureSpec.scala
View file

4
akka-core/src/test/scala/ReceiveTimeoutSpec.scala → akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala
View file

@ -3,9 +3,9 @@ package se.scalablesolutions.akka.actor
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import Actor._
import java.util.concurrent.TimeUnit
import org.multiverse.api.latches.StandardLatch
import Actor._
class ReceiveTimeoutSpec extends JUnitSuite {
@ -74,4 +74,4 @@ class ReceiveTimeoutSpec extends JUnitSuite {
assert(timeoutLatch.tryAwait(1, TimeUnit.SECONDS) == false)
}
}
}

2
akka-core/src/test/scala/SchedulerSpec.scala → akka-core/src/test/scala/actor/SchedulerSpec.scala
View file

@ -84,4 +84,4 @@ class SchedulerSpec extends JUnitSuite {
// should be enough time for the ping countdown to recover and reach 6 pings
assert(pingLatch.await(4, TimeUnit.SECONDS))
}
}
}

0
akka-core/src/test/scala/SupervisorHierarchySpec.scala → akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala
View file

1
akka-core/src/test/scala/SupervisorSpec.scala → akka-core/src/test/scala/actor/SupervisorSpec.scala
View file

@ -6,7 +6,6 @@ package se.scalablesolutions.akka.actor
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.config.OneForOneStrategy
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.{OneWay, Die, Ping}
import Actor._

0
akka-core/src/test/scala/TransactorSpec.scala → akka-core/src/test/scala/actor/TransactorSpec.scala
View file

3
akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorSpec.scala → akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala
View file

@ -1,9 +1,10 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.Actor
import Actor._
object ExecutorBasedEventDrivenDispatcherActorSpec {

4
akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala → akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
View file

@ -1,10 +1,10 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import se.scalablesolutions.akka.dispatch.Dispatchers
import org.scalatest.matchers.MustMatchers
import java.util.concurrent.CountDownLatch
import se.scalablesolutions.akka.actor.Actor
import Actor._
/**

5
akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala → akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
View file

@ -1,4 +1,4 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import org.scalatest.matchers.MustMatchers
import org.scalatest.junit.JUnitSuite
@ -6,9 +6,10 @@ import org.scalatest.junit.JUnitSuite
import org.junit.Test
import se.scalablesolutions.akka.dispatch.Dispatchers
import Actor._
import java.util.concurrent.{TimeUnit, CountDownLatch}
import se.scalablesolutions.akka.actor.{IllegalActorStateException, Actor}
import Actor._
object ExecutorBasedEventDrivenWorkStealingDispatcherSpec {
val delayableActorDispatcher = Dispatchers.newExecutorBasedEventDrivenWorkStealingDispatcher("pooled-dispatcher")

5
akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala → akka-core/src/test/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala
View file

@ -1,11 +1,12 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import Actor._
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.Actor
import Actor._
object ReactorBasedSingleThreadEventDrivenDispatcherActorSpec {
class TestActor extends Actor {

3
akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala → akka-core/src/test/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala
View file

@ -1,10 +1,11 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.Actor
import Actor._
object ReactorBasedThreadPoolEventDrivenDispatcherActorSpec {

3
akka-core/src/test/scala/ThreadBasedActorSpec.scala → akka-core/src/test/scala/dispatch/ThreadBasedActorSpec.scala
View file

@ -1,10 +1,11 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.dispatch
import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.Actor
import Actor._
object ThreadBasedActorSpec {

0
akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala → akka-core/src/test/scala/dispatch/ThreadBasedDispatcherSpec.scala
View file

5
akka-core/src/test/scala/ClientInitiatedRemoteActorSpec.scala → akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
View file

@ -1,13 +1,12 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.remote
import java.util.concurrent.{CountDownLatch, TimeUnit}
import junit.framework.TestCase
import org.scalatest.junit.JUnitSuite
import org.junit.{Test, Before, After}
import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.{ActorRef, Actor}
import Actor._
case class Send(actor: Actor)

11
akka-core/src/test/scala/RemoteSupervisorSpec.scala → akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala
View file

@ -2,20 +2,17 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.remote
import java.util.concurrent.{LinkedBlockingQueue, TimeUnit, BlockingQueue}
import se.scalablesolutions.akka.serialization.BinaryString
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.config.Config
import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer, RemoteClient}
import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
import se.scalablesolutions.akka.OneWay
import se.scalablesolutions.akka.dispatch.Dispatchers
import Actor._
import org.scalatest.junit.JUnitSuite
import org.junit.Test
import org.junit.{Test, Before, After}
import se.scalablesolutions.akka.actor.{SupervisorFactory, Supervisor, ActorRef, Actor}
import Actor._
object Log {
val messageLog: BlockingQueue[String] = new LinkedBlockingQueue[String]

7
akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala → akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala
View file

@ -2,19 +2,16 @@
* Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
*/
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.remote
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import org.junit.{Test, Before, After}
import se.scalablesolutions.akka.config.Config
import se.scalablesolutions.akka.config.ActiveObjectConfigurator
import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer, RemoteClient}
import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
object RemoteTransactionalActiveObjectSpec {
val HOSTNAME = "localhost"

2
akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala → akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala
View file

@ -1,4 +1,4 @@
package sample
package se.scalablesolutions.akka.actor.remote
import se.scalablesolutions.akka.actor.Actor
import se.scalablesolutions.akka.remote.{RemoteClient, RemoteNode}

16
akka-core/src/test/scala/ServerInitiatedRemoteActorSpec.scala → akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
View file

@ -1,12 +1,12 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.remote
import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite
import org.junit.{Test, Before, After}
import Actor._
import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.{ActorRef, Actor}
import Actor._
object ServerInitiatedRemoteActorSpec {
val HOSTNAME = "localhost"
@ -52,8 +52,6 @@ object ServerInitiatedRemoteActorSpec {
class ServerInitiatedRemoteActorSpec extends JUnitSuite {
import ServerInitiatedRemoteActorSpec._
import se.scalablesolutions.akka.config.Config.config
private val unit = TimeUnit.MILLISECONDS
@Before
@ -84,7 +82,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite {
@Test
def shouldSendWithBang {
val actor = RemoteClient.actorFor(
"se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorUnidirectional",
"se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorUnidirectional",
5000L,
HOSTNAME, PORT)
val result = actor ! "OneWay"
@ -95,7 +93,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite {
@Test
def shouldSendWithBangBangAndGetReply {
val actor = RemoteClient.actorFor(
"se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
"se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
5000L,
HOSTNAME, PORT)
val result = actor !! "Hello"
@ -107,7 +105,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite {
def shouldSendWithBangAndGetReplyThroughSenderRef {
implicit val timeout = 500000000L
val actor = RemoteClient.actorFor(
"se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
"se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
timeout,
HOSTNAME, PORT)
val sender = actorOf[RemoteActorSpecActorAsyncSender]
@ -122,7 +120,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite {
def shouldSendWithBangBangAndReplyWithException {
implicit val timeout = 500000000L
val actor = RemoteClient.actorFor(
"se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
"se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional",
timeout,
HOSTNAME, PORT)
try {

0
akka-core/src/test/scala/ShutdownSpec.scala → akka-core/src/test/scala/remote/ShutdownSpec.scala
View file

10
akka-core/src/test/scala/RoutingSpec.scala → akka-core/src/test/scala/routing/RoutingSpec.scala
View file

@ -1,6 +1,5 @@
package se.scalablesolutions.akka.routing
package se.scalablesolutions.akka.actor.routing
import se.scalablesolutions.akka.config.ScalaConfig._
import se.scalablesolutions.akka.actor.Actor
import se.scalablesolutions.akka.actor.Actor._
import se.scalablesolutions.akka.util.Logging
@ -9,12 +8,11 @@ import org.scalatest.Suite
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.matchers.MustMatchers
import org.junit.{Before, After, Test}
import scala.collection.mutable.HashSet
import org.junit.Test
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.{CountDownLatch, TimeUnit}
import se.scalablesolutions.akka.routing._
@RunWith(classOf[JUnitRunner])
class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers with Logging {
@ -174,4 +172,4 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers
for(a <- List(t1,t2,d1,d2)) a.stop
}
}
}

7
akka-core/src/test/scala/ProtobufActorMessageSerializationSpec.scala → akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala
View file

@ -1,12 +1,11 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.serialization
import java.util.concurrent.{CountDownLatch, TimeUnit}
import java.util.concurrent.TimeUnit
import org.scalatest.junit.JUnitSuite
import org.junit.{Test, Before, After}
import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
import se.scalablesolutions.akka.dispatch.Dispatchers
import se.scalablesolutions.akka.actor.{ProtobufProtocol, Actor}
import ProtobufProtocol.ProtobufPOJO
import Actor._

7
akka-core/src/test/scala/SerializableTypeClassActorSpec.scala → akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
View file

@ -1,16 +1,15 @@
package se.scalablesolutions.akka.actor
package se.scalablesolutions.akka.actor.serialization
import Actor._
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import com.google.protobuf.Message
import se.scalablesolutions.akka.actor._
import ActorSerialization._
import Actor._
@RunWith(classOf[JUnitRunner])
class SerializableTypeClassActorSpec extends

4
akka-core/src/test/scala/SerializerSpec.scala → akka-core/src/test/scala/serialization/SerializerSpec.scala
View file

@ -1,9 +1,7 @@
package se.scalablesolutions.akka.serialization
import junit.framework.TestCase
import org.scalatest.junit.JUnitSuite
import org.junit.{Test, Before, After}
import org.junit.Test
import scala.reflect.BeanInfo

6
akka-core/src/test/scala/RefSpec.scala → akka-core/src/test/scala/stm/RefSpec.scala
View file

@ -5,13 +5,13 @@ import org.scalatest.matchers.ShouldMatchers
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import se.scalablesolutions.akka.actor.Actor._
import se.scalablesolutions.akka.stm.local._
@RunWith(classOf[JUnitRunner])
class RefSpec extends Spec with ShouldMatchers {
describe("A Ref") {
import local._
it("should optionally accept an initial value") {
val emptyRef = Ref[Int]
@ -153,4 +153,4 @@ class RefSpec extends Spec with ShouldMatchers {
optGreater2 should be(None)
}
}
}
}

7
akka-core/src/test/scala/StmSpec.scala → akka-core/src/test/scala/stm/StmSpec.scala
View file

@ -4,7 +4,6 @@ import se.scalablesolutions.akka.actor.{Actor, Transactor}
import Actor._
import org.scalatest.Spec
import org.scalatest.Assertions
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
@ -18,7 +17,7 @@ class StmSpec extends
describe("Local STM") {
it("should be able to do multiple consecutive atomic {..} statements") {
import local._
import se.scalablesolutions.akka.stm.local._
lazy val ref = Ref[Int]()
@ -37,7 +36,7 @@ class StmSpec extends
}
it("should be able to do nested atomic {..} statements") {
import local._
import se.scalablesolutions.akka.stm.local._
lazy val ref = Ref[Int]()
@ -59,7 +58,7 @@ class StmSpec extends
}
it("should roll back failing nested atomic {..} statements") {
import local._
import se.scalablesolutions.akka.stm.local._
lazy val ref = Ref[Int]()

10
akka-core/src/test/scala/tickets/Proof001Spec.scala Normal file
View file

@ -0,0 +1,10 @@
package se.scalablesolutions.akka.actor.tickets
import org.scalatest.junit.JUnitSuite
import org.junit.Test
// Sample ticket spec
class Proof001Spec extends JUnitSuite {
@Test def thisFixesSomeSpecifiedBug = ()
}