From ba7801c5dccc7272734929db721a062a3075ed00 Mon Sep 17 00:00:00 2001 From: rossputin Date: Wed, 8 Sep 2010 21:27:50 +0100 Subject: [PATCH] minor edits to scala test specs descriptors, fix up comments --- akka-spring/src/main/scala/ActorFactoryBean.scala | 2 +- akka-spring/src/test/scala/ActorFactoryBeanTest.scala | 6 +++--- .../src/test/scala/UntypedActorSpringFeatureTest.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-spring/src/main/scala/ActorFactoryBean.scala b/akka-spring/src/main/scala/ActorFactoryBean.scala index 11d5274a70..ee4b370b4f 100644 --- a/akka-spring/src/main/scala/ActorFactoryBean.scala +++ b/akka-spring/src/main/scala/ActorFactoryBean.scala @@ -55,7 +55,7 @@ class ActorFactoryBean extends AbstractFactoryBean[AnyRef] with Logging with App @BeanProperty var property: PropertyEntries = _ @BeanProperty var applicationContext: ApplicationContext = _ - // Holds info about if deps has been set or not. Depends on + // Holds info about if deps have been set or not. Depends on // if interface is specified or not. We must set deps on // target instance if interface is specified var hasSetDependecies = false diff --git a/akka-spring/src/test/scala/ActorFactoryBeanTest.scala b/akka-spring/src/test/scala/ActorFactoryBeanTest.scala index f765cc3307..13c6203929 100644 --- a/akka-spring/src/test/scala/ActorFactoryBeanTest.scala +++ b/akka-spring/src/test/scala/ActorFactoryBeanTest.scala @@ -34,7 +34,7 @@ class ActorFactoryBeanTest extends Spec with ShouldMatchers with BeforeAndAfterA assert(bean.isRemote) } - it("should create an typed actor with dispatcher if dispatcher is set") { + it("should create a typed actor with dispatcher if dispatcher is set") { val props = new DispatcherProperties() props.dispatcherType = "executor-based-event-driven" bean.setDispatcher(props); @@ -60,12 +60,12 @@ class ActorFactoryBeanTest extends Spec with ShouldMatchers with BeforeAndAfterA bean.setProperty(entries) assert(classOf[PojoInf].isAssignableFrom(bean.getObjectType)) - // Check that we have injected the depencency correctly + // Check that we have injected the dependency correctly val target = bean.createInstance.asInstanceOf[PojoInf] assert(target.getStringFromVal === entry.value) } - it("should create an application context and verify dependency injection for tryped") { + it("should create an application context and verify dependency injection for typed") { var ctx = new ClassPathXmlApplicationContext("appContext.xml"); val ta = ctx.getBean("typedActor").asInstanceOf[PojoInf]; assert(ta.isInitInvoked) diff --git a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala index cf7d8d9805..11246cdc91 100644 --- a/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala +++ b/akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala @@ -24,7 +24,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext class UntypedActorSpringFeatureTest extends FeatureSpec with ShouldMatchers { feature("parse Spring application context") { - scenario("get a untyped actor") { + scenario("get an untyped actor") { val context = new ClassPathXmlApplicationContext("/untyped-actor-config.xml") val myactor = context.getBean("simple-untyped-actor").asInstanceOf[ActorRef] assert(myactor.getActorClassName() === "se.scalablesolutions.akka.spring.foo.PingActor")