diff --git a/akka-spring/akka-spring-test-java/pom.xml b/akka-spring/akka-spring-test-java/pom.xml old mode 100755 new mode 100644 diff --git a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/Bar.java b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/Bar.java index fc3392250a..7e21aaea8f 100644 --- a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/Bar.java +++ b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/Bar.java @@ -2,9 +2,9 @@ package se.scalablesolutions.akka.spring.foo; public class Bar implements IBar { - @Override - public String getBar() { - return "bar"; - } + @Override + public String getBar() { + return "bar"; + } } diff --git a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/IBar.java b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/IBar.java index 66f91ee464..d462d0b09b 100644 --- a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/IBar.java +++ b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/IBar.java @@ -1,7 +1,7 @@ package se.scalablesolutions.akka.spring.foo; public interface IBar { - - String getBar(); + + String getBar(); } diff --git a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/MyPojo.java b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/MyPojo.java index 2d1f032cf8..1269f43f62 100644 --- a/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/MyPojo.java +++ b/akka-spring/akka-spring-test-java/src/main/java/se/scalablesolutions/akka/spring/foo/MyPojo.java @@ -1,33 +1,33 @@ package se.scalablesolutions.akka.spring.foo; public class MyPojo { - - private String foo; - private String bar; - - - public MyPojo() { - this.foo = "foo"; - this.bar = "bar"; - } + + private String foo; + private String bar; + + + public MyPojo() { + this.foo = "foo"; + this.bar = "bar"; + } - public String getFoo() { - return foo; - } + public String getFoo() { + return foo; + } - public String getBar() { - return bar; - } - - public void preRestart() { - System.out.println("pre restart"); - } - - public void postRestart() { - System.out.println("post restart"); - } + public String getBar() { + return bar; + } + + public void preRestart() { + System.out.println("pre restart"); + } + + public void postRestart() { + System.out.println("post restart"); + } public String longRunning() { try { diff --git a/akka-spring/akka-spring-test-java/src/main/resources/se/scalablesolutions/akka/spring/foo/test-config.xml b/akka-spring/akka-spring-test-java/src/main/resources/se/scalablesolutions/akka/spring/foo/test-config.xml index aa45e3aa4e..0b35ade59f 100644 --- a/akka-spring/akka-spring-test-java/src/main/resources/se/scalablesolutions/akka/spring/foo/test-config.xml +++ b/akka-spring/akka-spring-test-java/src/main/resources/se/scalablesolutions/akka/spring/foo/test-config.xml @@ -7,7 +7,7 @@ http://www.akkasource.org/schema/akka file:////Users/michaelkober/akka/akka-spring/src/main/resources/se/scalablesolutions/akka/spring/akka.xsd"> - @@ -15,62 +15,62 @@ + target="se.scalablesolutions.akka.spring.foo.MyPojo" + timeout="1000"/> + target="se.scalablesolutions.akka.spring.foo.MyPojo" + timeout="10000"/> - + target="se.scalablesolutions.akka.spring.foo.MyPojo" + timeout="2000" + transactional="true"/> + - - + target="se.scalablesolutions.akka.spring.foo.MyPojo" + timeout="2000" + transactional="true"> + + + target="se.scalablesolutions.akka.spring.foo.MyPojo" + timeout="2000" + transactional="true"> - - + + - + - - - java.io.IOException - java.lang.NullPointerException - - - - - - - - - + + + java.io.IOException + java.lang.NullPointerException + + + + + + + + + - - - java.lang.Exception - - - - - + + + java.lang.Exception + + + + + \ No newline at end of file diff --git a/akka-spring/akka-spring-test-java/src/test/java/se/scalablesolutions/akka/spring/SpringConfigurationTest.java b/akka-spring/akka-spring-test-java/src/test/java/se/scalablesolutions/akka/spring/SpringConfigurationTest.java index 5737b8da30..cd5490d1d4 100644 --- a/akka-spring/akka-spring-test-java/src/test/java/se/scalablesolutions/akka/spring/SpringConfigurationTest.java +++ b/akka-spring/akka-spring-test-java/src/test/java/se/scalablesolutions/akka/spring/SpringConfigurationTest.java @@ -38,47 +38,47 @@ public class SpringConfigurationTest { * can be used as a top level element. */ @Test - public void testParse() throws Exception { + public void testParse() throws Exception { final Resource CONTEXT = new ClassPathResource("se/scalablesolutions/akka/spring/foo/test-config.xml"); - DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); - reader.loadBeanDefinitions(CONTEXT); - assertTrue(beanFactory.containsBeanDefinition("simple-active-object")); - assertTrue(beanFactory.containsBeanDefinition("remote-active-object")); - assertTrue(beanFactory.containsBeanDefinition("supervision1")); - } - - @Test - public void testSimpleActiveObject() { - MyPojo myPojo = (MyPojo) context.getBean("simple-active-object"); + DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); + XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory); + reader.loadBeanDefinitions(CONTEXT); + assertTrue(beanFactory.containsBeanDefinition("simple-active-object")); + assertTrue(beanFactory.containsBeanDefinition("remote-active-object")); + assertTrue(beanFactory.containsBeanDefinition("supervision1")); + } + + @Test + public void testSimpleActiveObject() { + MyPojo myPojo = (MyPojo) context.getBean("simple-active-object"); String msg = myPojo.getFoo(); msg += myPojo.getBar(); assertEquals("wrong invocation order", "foobar", msg); - } + } @Test(expected=FutureTimeoutException.class) - public void testSimpleActiveObject_Timeout() { - MyPojo myPojo = (MyPojo) context.getBean("simple-active-object"); + public void testSimpleActiveObject_Timeout() { + MyPojo myPojo = (MyPojo) context.getBean("simple-active-object"); myPojo.longRunning(); - } + } @Test - public void testSimpleActiveObject_NoTimeout() { - MyPojo myPojo = (MyPojo) context.getBean("simple-active-object-long-timeout"); + public void testSimpleActiveObject_NoTimeout() { + MyPojo myPojo = (MyPojo) context.getBean("simple-active-object-long-timeout"); String msg = myPojo.longRunning(); assertEquals("this took long", msg); - } + } - @Test - public void testTransactionalActiveObject() { - MyPojo myPojo = (MyPojo) context.getBean("transactional-active-object"); + @Test + public void testTransactionalActiveObject() { + MyPojo myPojo = (MyPojo) context.getBean("transactional-active-object"); String msg = myPojo.getFoo(); msg += myPojo.getBar(); assertEquals("wrong invocation order", "foobar", msg); - } - - @Test - public void testRemoteActiveObject() { + } + + @Test + public void testRemoteActiveObject() { new Thread(new Runnable() { public void run() { RemoteNode.start(); @@ -87,22 +87,22 @@ public class SpringConfigurationTest { try { Thread.currentThread().sleep(1000); } catch (Exception e) {} Config.config(); - MyPojo myPojo = (MyPojo) context.getBean("remote-active-object"); + MyPojo myPojo = (MyPojo) context.getBean("remote-active-object"); assertEquals("foo", myPojo.getFoo()); - } - - @Test - public void testSupervision() { - // get ActiveObjectConfigurator bean from spring context - ActiveObjectConfigurator myConfigurator = (ActiveObjectConfigurator) context.getBean("supervision1"); + } + + @Test + public void testSupervision() { + // get ActiveObjectConfigurator bean from spring context + ActiveObjectConfigurator myConfigurator = (ActiveObjectConfigurator) context.getBean("supervision1"); // get ActiveObjects - Foo foo = myConfigurator.getInstance(Foo.class); - assertNotNull(foo); + Foo foo = myConfigurator.getInstance(Foo.class); + assertNotNull(foo); IBar bar = myConfigurator.getInstance(IBar.class); assertNotNull(bar); MyPojo pojo = myConfigurator.getInstance(MyPojo.class); assertNotNull(pojo); - } + } @Test public void testTransactionalState() { @@ -116,5 +116,5 @@ public class SpringConfigurationTest { assertEquals("some vector state", stateful.getVectorState()); assertEquals("some ref state", stateful.getRefState()); } - + } diff --git a/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala index a445d92cba..19fe23e5c9 100644 --- a/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala +++ b/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala @@ -36,15 +36,15 @@ class ActiveObjectBeanDefinitionParserTest extends Spec with ShouldMatchers { private def createTestElement : Element = { val xml = dom(xml).getDocumentElement } private def createTestElement2 : Element = { val xml = dom(xml).getDocumentElement } diff --git a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala index e5677113af..af79ecf5df 100644 --- a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala +++ b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala @@ -67,27 +67,27 @@ class SupervisionBeanDefinitionParserTest extends Spec with ShouldMatchers { private def createActiveObjectElement : Element = { val xml = dom(xml).getDocumentElement } private def createSupervisorElement : Element = { val xml = - - - java.io.IOException - java.lang.NullPointerException - - - - - - - - - + + + java.io.IOException + java.lang.NullPointerException + + + + + + + + + dom(xml).getDocumentElement } @@ -95,26 +95,26 @@ class SupervisionBeanDefinitionParserTest extends Spec with ShouldMatchers { private def createSupervisorMissingAttribute : Element = { val xml = - - - java.io.IOException - - - - - + + + java.io.IOException + + + + + dom(xml).getDocumentElement } private def createSupervisorMissingElement : Element = { val xml = - - - - - - + + + + + + dom(xml).getDocumentElement }