root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Removed TestGroup.LONG_RUNNING marker from Groovy and JRuby tests

This commit is contained in:
Juergen Hoeller 2014-01-13 22:13:42 +01:00
parent 6b0d88721c
commit bd87ff7f92
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
View File

@ -64,11 +64,6 @@ import static org.mockito.BDDMockito.*;
@SuppressWarnings("resource") @SuppressWarnings("resource")
public class GroovyScriptFactoryTests { public class GroovyScriptFactoryTests {
@Before
public void setUp() {
Assume.group(TestGroup.LONG_RUNNING);
}
@Test @Test
public void testStaticScript() throws Exception { public void testStaticScript() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass()); ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
@ -412,8 +407,6 @@ public class GroovyScriptFactoryTests {
@Test @Test
public void testAnonymousScriptDetected() throws Exception { public void testAnonymousScriptDetected() throws Exception {
Assume.group(TestGroup.LONG_RUNNING);
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
Map<?, Messenger> beans = ctx.getBeansOfType(Messenger.class); Map<?, Messenger> beans = ctx.getBeansOfType(Messenger.class);
assertEquals(4, beans.size()); assertEquals(4, beans.size());
@ -491,6 +484,7 @@ public class GroovyScriptFactoryTests {
assertEquals("test", result); assertEquals("test", result);
} }
public static class TestCustomizer implements GroovyObjectCustomizer { public static class TestCustomizer implements GroovyObjectCustomizer {
@Override @Override

12
spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
View File

@ -18,11 +18,10 @@ package org.springframework.scripting.jruby;
import java.util.Map; import java.util.Map;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.AopUtils;
import org.springframework.aop.target.dynamic.Refreshable; import org.springframework.aop.target.dynamic.Refreshable;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
@ -31,8 +30,7 @@ import org.springframework.scripting.ConfigurableMessenger;
import org.springframework.scripting.Messenger; import org.springframework.scripting.Messenger;
import org.springframework.scripting.ScriptCompilationException; import org.springframework.scripting.ScriptCompilationException;
import org.springframework.scripting.TestBeanAwareMessenger; import org.springframework.scripting.TestBeanAwareMessenger;
import org.springframework.tests.Assume; import org.springframework.tests.sample.beans.TestBean;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -50,10 +48,6 @@ public class JRubyScriptFactoryTests {
"end\n" + "end\n" +
"RubyBar.new"; "RubyBar.new";
@Before
public void setUp() {
Assume.group(TestGroup.LONG_RUNNING);
}
@Test @Test
public void testStaticScript() throws Exception { public void testStaticScript() throws Exception {
@ -291,7 +285,7 @@ public class JRubyScriptFactoryTests {
} }
@Test @Test
public void testAOP() throws Exception { public void testAop() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass()); ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass());
Messenger messenger = (Messenger) ctx.getBean("messenger"); Messenger messenger = (Messenger) ctx.getBean("messenger");
assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage()); assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage());