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

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

Browse source
This commit is contained in:
Viktor Klang 2010-09-09 09:58:21 +02:00
commit 9c1cbfffaf
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-spring/src/main/scala/ActorFactoryBean.scala
View file

@ -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

6
akka-spring/src/test/scala/ActorFactoryBeanTest.scala
View file

@ -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)

2
akka-spring/src/test/scala/UntypedActorSpringFeatureTest.scala
View file

@ -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")