lib/jruby-1.1rc2.jar lib/spring-2.5.2.jar @@ -14,8 +14,4 @@ public abstract class AbstractSerializableManagedMap extends ManagedMap implemen public AbstractSerializableManagedMap(int initialCapacity) { super(initialCapacity); } - - public AbstractSerializableManagedMap(Map targetMap) { - super(targetMap); - } } src/main/java/springy/context/AbstractSerializableManagedMap.java @@ -96,8 +96,8 @@ public class RuntimeSpringyContext extends AbstractSpringyApplicationContext JRubyHelper.addGlobal(runtime, "bean_factory", beanFactory); try { - runtime.evalScript(new StringReader(springy), "(springy-parse-prepare-fragment)"); - runtime.evalScript(new StringReader(ctxt), contextResource.getDescription() ); + runtime.executeScript( springy, "(springy-parse-prepare-fragment)"); + runtime.executeScript( ctxt, contextResource.getDescription() ); } catch (RaiseException rex) { System.err.println(rex.getException().toString()); @@ -142,7 +142,7 @@ public class RuntimeSpringyContext extends AbstractSpringyApplicationContext if (!isActive()) refreshBeanFactory(); - RubyArray a = (RubyArray) runtime.evalScript("serialize_context"); + RubyArray a = (RubyArray) runtime.evalScriptlet("serialize_context"); serializedContext = a.get(0).toString(); serializedContextAsDocument = (Document) a.get(1); } src/main/java/springy/context/RuntimeSpringyContext.java @@ -43,7 +43,12 @@ public abstract class AbstractContextSerializationTests extends AbstractContextT protected abstract SpringyApplicationContext doCreateContext(); - protected ConfigurableApplicationContext createContext() throws Exception { + protected ConfigurableApplicationContext createContext(String context) throws Exception + { + return null; + } + + protected ConfigurableApplicationContext createContext() throws Exception { //create a jruby context, serialize it to xml, and recreate context from xml SpringyApplicationContext jrubyCtxt = doCreateContext(); serializedContext = jrubyCtxt.getContextAsXml(); src/test/java/springy/AbstractContextSerializationTests.java @@ -20,6 +20,7 @@ public abstract class AbstractContextTests { protected ConfigurableApplicationContext ctxt; protected abstract ConfigurableApplicationContext createContext() throws Exception; + protected abstract ConfigurableApplicationContext createContext( String context ) throws Exception; public void testGetBeans() throws Exception { assert ctxt != null : getClass().getSimpleName(); src/test/java/springy/AbstractContextTests.java @@ -4,7 +4,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.testng.annotations.Test; -import springy.context.BSFSpringyContext; +import org.jruby.Ruby; +import springy.context.RuntimeSpringyContext; @Test @@ -12,6 +13,6 @@ public class ErrorHandlingTests { @Test(expectedExceptions = BeanDefinitionParsingException.class) public void testErrorHandling() { - ApplicationContext ctxt = new BSFSpringyContext(new ClassPathResource("springy/context-with-errors.rb")); + ApplicationContext ctxt = new RuntimeSpringyContext(Ruby.getDefaultInstance() , new ClassPathResource("springy/context-with-errors.rb")); } } src/test/java/springy/ErrorHandlingTests.java @@ -4,7 +4,9 @@ import springy.context.SpringyApplicationContext; import springy.context.RuntimeSpringyContext; import org.jruby.Ruby; import org.springframework.core.io.ClassPathResource; +import org.testng.annotations.Test; +@Test public class RuntimeSpringyContextSerializationTests extends AbstractContextSerializationTests { protected SpringyApplicationContext doCreateContext() { return new RuntimeSpringyContext(Ruby.getDefaultInstance(), false, getContextResource() ); src/test/java/springy/RuntimeSpringyContextSerializationTests.java @@ -11,9 +11,14 @@ import springy.beans.Bean6; @Test public class RuntimeSpringyContextTests extends SpringyContextTests { - protected ConfigurableApplicationContext createContext() throws Exception { + /** create from a file */ + protected ConfigurableApplicationContext createContext() throws Exception { return new RuntimeSpringyContext(Ruby.getDefaultInstance(), new ClassPathResource("springy/context.rb")); } + /** create directly from a string */ + protected ConfigurableApplicationContext createContext( String context ) throws Exception { + return new RuntimeSpringyContext( Ruby.getDefaultInstance() , context ); + } } src/test/java/springy/RuntimeSpringyContextTests.java @@ -1,10 +1,13 @@ package springy; import springy.context.SpringyApplicationContext; -import springy.context.BSFSpringyContext; +import springy.context.RuntimeSpringyContext; +import org.jruby.Ruby; +import org.testng.annotations.Test; +@Test public class SpringyContextSerializationTests extends AbstractContextSerializationTests{ protected SpringyApplicationContext doCreateContext() { - return new BSFSpringyContext( false, getContextResource()); + return new RuntimeSpringyContext( Ruby.getDefaultInstance() , false, getContextResource()); } } src/test/java/springy/SpringyContextSerializationTests.java @@ -7,9 +7,10 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.annotations.AfterClass; +import org.jruby.Ruby; import springy.beans.Bean1; import springy.beans.Bean4; -import springy.context.BSFSpringyContext; +import springy.context.RuntimeSpringyContext; import java.util.Map; @@ -31,11 +32,18 @@ public class SpringyContextTests extends AbstractContextTests { ctxt.close(); } - protected ConfigurableApplicationContext createContext() throws Exception { - return new BSFSpringyContext(new ClassPathResource("springy/context.rb")); + /** create from a file */ + protected ConfigurableApplicationContext createContext() throws Exception { + return new RuntimeSpringyContext(Ruby.getDefaultInstance(), + new ClassPathResource("springy/context.rb")); } - public void testInlineXml() { + /** create directly from a string */ + protected ConfigurableApplicationContext createContext( String context ) throws Exception { + return new RuntimeSpringyContext( Ruby.getDefaultInstance() , context ); + } + + public void testInlineXml() { Bean1 bean12 = (Bean1) ctxt.getBean("bean1-2"); assert bean12 != null; Bean1 bean13 = (Bean1) ctxt.getBean("bean1-3"); @@ -47,13 +55,13 @@ public class SpringyContextTests extends AbstractContextTests { assertEquals( bean1.something , 22 ); } - public void testErrorWithEmptyListsInCtor() { + public void testErrorWithEmptyListsInCtor() throws Exception { String context = "bean :bean1_emptylist_in_ctor, \"springy.beans.Bean4\" do |b|\n" + " b.new(\"name\", {}, [])\n" + "end"; - BSFSpringyContext ctxt = new BSFSpringyContext(context); + ConfigurableApplicationContext ctxt = createContext(context); Bean4 b4 = (Bean4) ctxt.getBean("bean1_emptylist_in_ctor"); assert b4.getMap().isEmpty(); @@ -71,19 +79,19 @@ public class SpringyContextTests extends AbstractContextTests { } @Test(expectedExceptions = BeanDefinitionParsingException.class) - public void testEnforceInit() { + public void testEnforceInit() throws Exception { String context = "bean :bean1, \"springy.beans.Bean1\", :init_method=\"jjlkjkl\""; - BSFSpringyContext ctxt = new BSFSpringyContext(context); + ConfigurableApplicationContext ctxt = createContext(context); } - public void testBeanWithoutBlock() { + public void testBeanWithoutBlock() throws Exception { String context = "bean :a_bean, \"springy.beans.Bean1\""; - BSFSpringyContext ctxt = new BSFSpringyContext(context); + ConfigurableApplicationContext ctxt = createContext(context); } - public void testResourceExists() { + public void testResourceExists() throws Exception { String context = "bean :bean1, 'springy.beans.Bean1' if resource_exists?('/springy/a_map.yml')"; - BSFSpringyContext ctxt = new BSFSpringyContext(context); + ConfigurableApplicationContext ctxt = createContext(context); assert ctxt.getBean("bean1") instanceof Bean1; } src/test/java/springy/SpringyContextTests.java @@ -29,4 +29,10 @@ public class XmlContextTests extends AbstractContextTests { protected ConfigurableApplicationContext createContext() { return new ClassPathXmlApplicationContext(new String[]{"springy/context.xml"}, true); } + + + protected ConfigurableApplicationContext createContext(String context) throws Exception + { + return null; + } } src/test/java/springy/XmlContextTests.java @@ -60,10 +60,17 @@ bean :bean4, "springy.beans.Bean4" do } end +map = yaml( "/springy/a_map.yml" ) + bean :bean4_yaml, "springy.beans.Bean4" do |b| - b.new("Steve", yaml("/springy/a_map.yml")) + b.new("Steve", map ) end +## EVIL this fails for some reason, tho creating the map in two, as above works +#bean :bean4_yaml, "springy.beans.Bean4" do |b| +# b.new("Steve", yaml( "/springy/a_map.yml" ) ) +#end + bean :bean5, "springy.beans.Bean5", :scope=>'prototype', :init_method=>'myInit', :destroy_method=>'myDestroy', :dependency_check=>'simple', :lazy_init=>true, :abstract=>true, :autowire=>'byType' # aliasing src/test/resources/springy/context.rb lib/jruby-1.0.jar lib/spring-2.0.6.jar src/main/java/springy/context/BSFSpringyContext.java 9146c220ad1802ed43cbecd2ba2dea03e9cb3c6d Craig McMillan craig@trampolinesystems.com http://github.com/jberkel/springy/commit/3b4b158647f9cc8dd70148ce2bac59ae9323c785 3b4b158647f9cc8dd70148ce2bac59ae9323c785 2008-03-18T14:54:20-07:00 2008-03-18T14:54:20-07:00 upgrade to spring 2.5.2 and jruby 1.1rc2 git-svn-id: http://svn.trampolinesystems.com/springy/trunk@12444 7bcaa5c2-c9d6-0310-8dd4-ca458a8cac41 65a00898a80606073d66d9b4d30c6fb0d5a8bbbb Craig McMillan craig@trampolinesystems.com