From 543737a9330ed419371b27a89faf54dd605056c5 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 21 Jun 2012 16:09:14 +0200 Subject: [PATCH] Updating to scalatest 2.10.0-M4-x-B2 and adding feature imports --- .../akka/actor/ActorConfigurationVerificationSpec.scala | 2 ++ .../src/test/scala/akka/actor/ActorLifeCycleSpec.scala | 2 ++ .../src/test/scala/akka/actor/ActorLookupSpec.scala | 2 ++ .../src/test/scala/akka/actor/ActorRefSpec.scala | 2 ++ .../src/test/scala/akka/actor/ActorSystemSpec.scala | 2 ++ .../test/scala/akka/actor/ActorWithBoundedStashSpec.scala | 2 ++ .../src/test/scala/akka/actor/ActorWithStashSpec.scala | 2 ++ .../src/test/scala/akka/actor/ConsistencySpec.scala | 2 ++ .../src/test/scala/akka/actor/DeathWatchSpec.scala | 2 ++ .../src/test/scala/akka/actor/DeployerSpec.scala | 2 ++ .../src/test/scala/akka/actor/FSMActorSpec.scala | 2 ++ .../src/test/scala/akka/actor/FSMTimingSpec.scala | 2 ++ .../src/test/scala/akka/actor/FSMTransitionSpec.scala | 2 ++ .../src/test/scala/akka/actor/ForwardActorSpec.scala | 2 ++ akka-actor-tests/src/test/scala/akka/actor/IOActor.scala | 2 ++ .../test/scala/akka/actor/LocalActorRefProviderSpec.scala | 2 ++ .../src/test/scala/akka/actor/ReceiveTimeoutSpec.scala | 2 ++ .../src/test/scala/akka/actor/RestartStrategySpec.scala | 2 ++ .../src/test/scala/akka/actor/SchedulerSpec.scala | 2 ++ .../src/test/scala/akka/actor/SupervisorHierarchySpec.scala | 2 ++ .../src/test/scala/akka/actor/SupervisorMiscSpec.scala | 2 ++ .../src/test/scala/akka/actor/SupervisorSpec.scala | 2 ++ .../src/test/scala/akka/actor/SupervisorTreeSpec.scala | 2 ++ .../src/test/scala/akka/actor/Ticket669Spec.scala | 2 ++ .../src/test/scala/akka/actor/TypedActorSpec.scala | 5 +++-- .../src/test/scala/akka/actor/dispatch/ActorModelSpec.scala | 2 ++ .../test/scala/akka/actor/dispatch/DispatcherActorSpec.scala | 2 ++ .../src/test/scala/akka/actor/dispatch/DispatchersSpec.scala | 2 ++ akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala | 2 ++ .../src/test/scala/akka/dataflow/Future2Actor.scala | 2 ++ .../src/test/scala/akka/dispatch/FutureSpec.scala | 2 ++ .../src/test/scala/akka/dispatch/MailboxConfigSpec.scala | 2 ++ .../test/scala/akka/dispatch/PriorityDispatcherSpec.scala | 2 ++ .../src/test/scala/akka/event/EventBusSpec.scala | 2 ++ .../src/test/scala/akka/event/EventStreamSpec.scala | 2 ++ .../src/test/scala/akka/event/LoggingReceiveSpec.scala | 2 ++ akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala | 2 ++ .../src/test/scala/akka/pattern/CircuitBreakerSpec.scala | 3 ++- .../src/test/scala/akka/pattern/PatternSpec.scala | 2 ++ .../akka/performance/trading/system/TradingSystem.scala | 4 +++- .../test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala | 2 ++ .../src/test/scala/akka/routing/ResizerSpec.scala | 2 ++ .../src/test/scala/akka/routing/RoutingSpec.scala | 2 ++ .../src/test/scala/akka/serialization/SerializeSpec.scala | 2 ++ .../main/scala/akka/testkit/CallingThreadDispatcher.scala | 2 ++ .../src/main/scala/akka/testkit/TestEventListener.scala | 2 ++ akka-testkit/src/main/scala/akka/testkit/TestKit.scala | 2 ++ akka-testkit/src/main/scala/akka/testkit/package.scala | 2 ++ akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala | 2 ++ .../src/test/scala/akka/testkit/TestActorRefSpec.scala | 2 ++ project/AkkaBuild.scala | 2 +- 51 files changed, 103 insertions(+), 5 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala index 5752bd7806..e501e4e246 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala index d87aaaaee6..3e89a1aae2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import org.scalatest.BeforeAndAfterEach import org.scalatest.matchers.MustMatchers diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala index 299cc16679..810e5568e6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ import akka.dispatch.Await diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala index 3056dc9e95..4b92e47a70 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import org.scalatest.WordSpec import org.scalatest.matchers.MustMatchers diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala index 7ae79fea34..be731e4f86 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import org.scalatest.junit.JUnitSuite import com.typesafe.config.ConfigFactory diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala index 33283b18cf..8a4a37dda2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala index 524913b01d..ec282e3817 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala index 6f8639f4a4..04de42a6a4 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala @@ -1,5 +1,7 @@ package akka.actor +import language.postfixOps + import akka.testkit.AkkaSpec import akka.dispatch.UnboundedMailbox import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala index 97eec5be01..725b1a0822 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ import java.util.concurrent.atomic._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala index 9b1c0b0bef..5f231c45f2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala index cc98a23f1f..f76e9eb634 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import akka.testkit._ import TestEvent.Mute diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala index df47c801bb..0d49cfbf3c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.Duration import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala index 691be63a0b..c247e667d2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ import akka.util.Duration diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala index 2566e5a955..d4e254ee6f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ import Actor._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala index b337455ac2..e9c9e3942c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.util.{ ByteString, Duration, Deadline } import akka.util.duration._ import scala.util.continuations._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala index 5ebd8ff565..90909ea6eb 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ import akka.util.Timeout diff --git a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala index 09fe9c103f..4d505ffe0d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala index 8d114bc396..3adaf612af 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import java.lang.Thread.sleep import org.scalatest.BeforeAndAfterAll import akka.dispatch.Await diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala index c67bcb44af..3720b03a38 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala @@ -1,5 +1,7 @@ package akka.actor +import language.postfixOps + import org.scalatest.BeforeAndAfterEach import akka.util.duration._ import java.util.concurrent.{ CountDownLatch, ConcurrentLinkedQueue, TimeUnit } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala index 62752d8052..9df82038b8 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import akka.testkit._ import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.dispatch.Await diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala index 197e749d2e..7560519b44 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import akka.testkit.{ filterEvents, EventFilter } import akka.dispatch.{ PinnedDispatcher, Dispatchers, Await } import java.util.concurrent.{ TimeUnit, CountDownLatch } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala index 3db5b5b5dc..5431bb65c2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala @@ -4,6 +4,8 @@ package akka.actor +import language.postfixOps + import org.scalatest.BeforeAndAfterEach import akka.util.duration._ import akka.{ Die, Ping } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala index b84cce002c..691e8e2922 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import org.scalatest.WordSpec import org.scalatest.matchers.MustMatchers import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala index 285b63c2c7..1247da6189 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala @@ -3,6 +3,8 @@ */ package akka.actor +import language.postfixOps + import java.util.concurrent.{ CountDownLatch, TimeUnit } import akka.actor._ import org.scalatest.BeforeAndAfterAll diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index b7a5a8f64b..bbe62f6bec 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -1,8 +1,9 @@ -package akka.actor - /** * Copyright (C) 2009-2012 Typesafe Inc. */ +package akka.actor + +import language.postfixOps import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import akka.util.Duration diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index 4d83c85b82..73ff1197fd 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor.dispatch +import language.postfixOps + import org.scalatest.Assertions._ import akka.testkit._ import akka.dispatch._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala index 4b3dd4a5b3..9ee0bdd331 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala @@ -1,5 +1,7 @@ package akka.actor.dispatch +import language.postfixOps + import java.util.concurrent.{ CountDownLatch, TimeUnit } import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger } import akka.testkit.{ filterEvents, EventFilter, AkkaSpec } diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala index 03c5f21711..25b336153d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala @@ -3,6 +3,8 @@ */ package akka.actor.dispatch +import language.postfixOps + import java.util.concurrent.{ CountDownLatch, TimeUnit } import scala.reflect.{ Manifest } import akka.dispatch._ diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala index d24b2c4806..6f53392508 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -4,6 +4,8 @@ package akka.config +import language.postfixOps + import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import scala.collection.JavaConverters._ diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala index a850bae739..f3838236d4 100644 --- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala +++ b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala @@ -3,6 +3,8 @@ */ package akka.dataflow +import language.postfixOps + import akka.actor.{ Actor, Props } import akka.dispatch.{ Future, Await } import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala index 11f616bf6c..6b2f091d2e 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala @@ -1,5 +1,7 @@ package akka.dispatch +import language.postfixOps + import org.scalatest.BeforeAndAfterAll import org.scalatest.prop.Checkers import org.scalacheck._ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala index 4f2d61de65..64a07188e2 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala @@ -1,5 +1,7 @@ package akka.dispatch +import language.postfixOps + import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import java.util.concurrent.{ TimeUnit, BlockingQueue } import java.util.concurrent.ConcurrentLinkedQueue diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala index a9855fef7d..a3a456a403 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -1,5 +1,7 @@ package akka.dispatch +import language.postfixOps + import akka.actor.{ Props, LocalActorRef, Actor } import akka.testkit.AkkaSpec import akka.pattern.ask diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index b1cc485982..ae3614eaea 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -4,6 +4,8 @@ package akka.event +import language.postfixOps + import org.scalatest.BeforeAndAfterEach import akka.testkit._ import akka.util.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala index d1846860f3..fd4a930dc3 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala @@ -3,6 +3,8 @@ */ package akka.event +import language.postfixOps + import akka.testkit.AkkaSpec import akka.util.duration._ import akka.actor.{ Actor, ActorRef, ActorSystemImpl, ActorSystem, Props, UnhandledMessage } diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala index 787f29f93a..bfe26219a0 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala @@ -3,6 +3,8 @@ */ package akka.event +import language.postfixOps + import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import akka.util.duration._ import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala index f3c36665e8..ec25dd6cd5 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala @@ -3,6 +3,8 @@ */ package akka.pattern +import language.postfixOps + import akka.testkit.AkkaSpec import akka.util.duration._ import akka.testkit.DefaultTimeout diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala index 2c2a07ee3f..4a609c5d11 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala @@ -1,10 +1,11 @@ - /** * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.pattern +import language.postfixOps + import akka.util.duration._ import akka.testkit._ import org.scalatest.BeforeAndAfter diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala index 68e6d40824..cbd63b1cad 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala @@ -4,6 +4,8 @@ package akka.pattern +import language.postfixOps + import akka.testkit.AkkaSpec import akka.actor.Props import akka.actor.Actor diff --git a/akka-actor-tests/src/test/scala/akka/performance/trading/system/TradingSystem.scala b/akka-actor-tests/src/test/scala/akka/performance/trading/system/TradingSystem.scala index 1adb2ecbc7..be0cd105a0 100644 --- a/akka-actor-tests/src/test/scala/akka/performance/trading/system/TradingSystem.scala +++ b/akka-actor-tests/src/test/scala/akka/performance/trading/system/TradingSystem.scala @@ -1,5 +1,7 @@ package akka.performance.trading.system +import language.postfixOps + import akka.performance.trading.domain.Orderbook import akka.performance.trading.domain.OrderbookRepository import akka.actor.Actor._ @@ -44,7 +46,7 @@ class AkkaTradingSystem(val system: ActorSystem) extends TradingSystem { def matchingEngineDispatcher: Option[String] = Some("benchmark.trading-dispatcher") override val orderbooksGroupedByMatchingEngine: List[List[Orderbook]] = - for (groupOfSymbols: List[String] ← OrderbookRepository.orderbookSymbolsGroupedByMatchingEngine) + for (groupOfSymbols ← OrderbookRepository.orderbookSymbolsGroupedByMatchingEngine) yield groupOfSymbols map (s ⇒ Orderbook(s, false, system)) var matchingEngineForOrderbook: Map[String, ActorRef] = Map() diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala index 5bedc8fc33..d16bf3e3a7 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala @@ -3,6 +3,8 @@ */ package akka.routing +import language.postfixOps + import java.util.concurrent.atomic.AtomicInteger import org.junit.runner.RunWith diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala index 0a87273d61..92521d33b9 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala @@ -3,6 +3,8 @@ */ package akka.routing +import language.postfixOps + import akka.actor.Actor import akka.testkit._ import akka.actor.Props diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala index 35631924cf..82361d27dd 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala @@ -3,6 +3,8 @@ */ package akka.routing +import language.postfixOps + import java.util.concurrent.atomic.AtomicInteger import akka.actor._ import scala.collection.mutable.LinkedList diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index 82cd6e0e06..8085b920f3 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -4,6 +4,8 @@ package akka.serialization +import language.postfixOps + import akka.testkit.{ AkkaSpec, EventFilter } import akka.actor._ import java.io._ diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala index 592bf3bd36..56938f1791 100644 --- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala +++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala @@ -3,6 +3,8 @@ */ package akka.testkit +import language.postfixOps + import java.lang.ref.WeakReference import java.util.concurrent.locks.ReentrantLock import java.util.LinkedList diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index fac3739d15..ba396e604a 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -3,6 +3,8 @@ */ package akka.testkit +import language.existentials + import scala.util.matching.Regex import akka.actor.{ DeadLetter, ActorSystem, Terminated, UnhandledMessage } import akka.dispatch.{ SystemMessage, Terminate } diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index b3c1626536..f98820f5ca 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -3,6 +3,8 @@ */ package akka.testkit +import language.postfixOps + import akka.actor._ import Actor._ import akka.util.Duration diff --git a/akka-testkit/src/main/scala/akka/testkit/package.scala b/akka-testkit/src/main/scala/akka/testkit/package.scala index 6f7bf965ca..117d225730 100644 --- a/akka-testkit/src/main/scala/akka/testkit/package.scala +++ b/akka-testkit/src/main/scala/akka/testkit/package.scala @@ -1,5 +1,7 @@ package akka +import language.implicitConversions + import akka.actor.ActorSystem import akka.util.Duration import java.util.concurrent.TimeUnit.MILLISECONDS diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index 424c913662..0c04747b72 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -3,6 +3,8 @@ */ package akka.testkit +import language.{ postfixOps, reflectiveCalls } + import org.scalatest.{ WordSpec, BeforeAndAfterAll, Tag } import org.scalatest.matchers.MustMatchers import akka.actor.ActorSystem diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala index 492c44408c..921a56561a 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala @@ -3,6 +3,8 @@ */ package akka.testkit +import language.{ postfixOps, reflectiveCalls } + import org.scalatest.matchers.MustMatchers import org.scalatest.{ BeforeAndAfterEach, WordSpec } import akka.actor._ diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 786f4dd1dd..473c2b51a8 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -494,7 +494,7 @@ object Dependency { val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0 val logback = "ch.qos.logback" % "logback-classic" % "1.0.4" % "test" // EPL 1.0 / LGPL 2.1 val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT - val scalatest = "org.scalatest" %% "scalatest" % "1.9-2.10.0-M4-B1" % "test" // ApacheV2 + val scalatest = "org.scalatest" %% "scalatest" % "1.9-2.10.0-M4-B2" % "test" // ApacheV2 val scalacheck = "org.scalacheck" %% "scalacheck" % "1.10.0-b1" % "test" // New BSD val specs2 = "org.specs2" %% "specs2" % "1.11" % "test" // Modified BSD / ApacheV2 }