diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index 1bdd0901bb..99c12ad098 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -64,11 +64,6 @@ import static org.mockito.BDDMockito.*; @SuppressWarnings("resource") public class GroovyScriptFactoryTests { - @Before - public void setUp() { - Assume.group(TestGroup.LONG_RUNNING); - } - @Test public void testStaticScript() throws Exception { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); @@ -412,8 +407,6 @@ public class GroovyScriptFactoryTests { @Test public void testAnonymousScriptDetected() throws Exception { - Assume.group(TestGroup.LONG_RUNNING); - ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); Map beans = ctx.getBeansOfType(Messenger.class); assertEquals(4, beans.size()); @@ -491,6 +484,7 @@ public class GroovyScriptFactoryTests { assertEquals("test", result); } + public static class TestCustomizer implements GroovyObjectCustomizer { @Override diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java index 8d84661dca..0c45266dbf 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java @@ -18,11 +18,10 @@ package org.springframework.scripting.jruby; import java.util.Map; -import org.junit.Before; import org.junit.Test; + import org.springframework.aop.support.AopUtils; import org.springframework.aop.target.dynamic.Refreshable; -import org.springframework.tests.sample.beans.TestBean; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -31,8 +30,7 @@ import org.springframework.scripting.ConfigurableMessenger; import org.springframework.scripting.Messenger; import org.springframework.scripting.ScriptCompilationException; import org.springframework.scripting.TestBeanAwareMessenger; -import org.springframework.tests.Assume; -import org.springframework.tests.TestGroup; +import org.springframework.tests.sample.beans.TestBean; import static org.junit.Assert.*; @@ -50,10 +48,6 @@ public class JRubyScriptFactoryTests { "end\n" + "RubyBar.new"; - @Before - public void setUp() { - Assume.group(TestGroup.LONG_RUNNING); - } @Test public void testStaticScript() throws Exception { @@ -291,7 +285,7 @@ public class JRubyScriptFactoryTests { } @Test - public void testAOP() throws Exception { + public void testAop() throws Exception { ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass()); Messenger messenger = (Messenger) ctx.getBean("messenger"); assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage());