more fixes for the failing tests

git-svn-id: https://svn.codehaus.org/grails/trunk@5257 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

test/commons/org/codehaus/groovy/grails/commons/test/AbstractGrailsMockTests.java

@@ -22,6 +22,8 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.support.MockApplicationContext;
+import org.codehaus.groovy.grails.plugins.PluginMetaManager;
+import org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager;
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.io.Resource;
@@ -54,6 +56,7 @@ protected final void setUp() throws Exception {
 
         System.out.println("Setting up test");
         ctx = new MockApplicationContext();
+        ctx.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
         ctx.registerMockBean(GrailsRuntimeConfigurator.CLASS_LOADER_BEAN, gcl);
         onSetUp();
         ga = new DefaultGrailsApplication(gcl.getLoadedClasses(),gcl);

test/groovy/org/codehaus/groovy/grails/commons/GrailsPluginManagerTests.groovy

@@ -7,7 +7,8 @@ import org.codehaus.groovy.grails.commons.test.AbstractGrailsMockTests;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.web.servlet.i18n.CookieLocaleResolver;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver
+import org.springframework.core.io.Resource;
 
 
 public class GrailsPluginManagerTests extends AbstractGrailsMockTests {
@@ -94,6 +95,7 @@ public class GrailsPluginManagerTests extends AbstractGrailsMockTests {
 
 		def parent = createMockApplicationContext()
 		parent.registerMockBean("grailsApplication", ga)
+        parent.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
 
 		def springConfig = new org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration(parent)
 		springConfig.servletContext = createMockServletContext()
@@ -111,6 +113,7 @@ public class GrailsPluginManagerTests extends AbstractGrailsMockTests {
 
 		def parent = createMockApplicationContext()
 		parent.registerMockBean("grailsApplication", ga)
+		parent.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
 		def springConfig = new org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration(parent)
 		springConfig.servletContext = createMockServletContext()
 

test/groovy/org/codehaus/groovy/grails/plugins/scaffolding/ScaffoldingGrailsPluginTests.groovy

@@ -4,6 +4,7 @@ import org.codehaus.groovy.grails.commons.test.*
 import org.codehaus.groovy.grails.commons.*
 import org.codehaus.groovy.grails.commons.spring.*
 import org.codehaus.groovy.grails.plugins.*
+import org.springframework.core.io.Resource
 
 class ScaffoldingPluginTests extends AbstractGrailsMockTests {
 
@@ -32,6 +33,7 @@ class TestController {
 
 		def mockManager = new MockGrailsPluginManager()
 		ctx.registerMockBean("manager", mockManager )
+        ctx.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
 
 		def dependantPluginClasses = []
 		dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.CoreGrailsPlugin")			

test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/ControllersDynamicMethodsTests.groovy

@@ -11,6 +11,7 @@ import org.codehaus.groovy.grails.web.servlet.*
 import org.springframework.mock.web.*
 import org.springframework.validation.*
 import org.springframework.web.servlet.*
+import org.springframework.core.io.Resource
 
 class ControllersDynamicMethodsTests extends AbstractGrailsMockTests {
 
@@ -39,6 +40,7 @@ class ControllersDynamicMethodsTests extends AbstractGrailsMockTests {
         GroovySystem.metaClassRegistry.metaClassCreationHandle = new ExpandoMetaClassCreationHandle();
 		def mockManager = new MockGrailsPluginManager(ga)
 		ctx.registerMockBean("manager", mockManager )
+        ctx.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
 
 		def dependantPluginClasses = []
 		dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.CoreGrailsPlugin")					

test/persistence/org/codehaus/groovy/grails/orm/hibernate/HibernateCriteriaBuilderTests.java

@@ -8,6 +8,8 @@
 import org.codehaus.groovy.grails.commons.GrailsDomainClass;
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.support.MockApplicationContext;
+import org.codehaus.groovy.grails.plugins.PluginMetaManager;
+import org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager;
 import org.codehaus.groovy.runtime.InvokerInvocationException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -17,6 +19,7 @@
 import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.core.io.Resource;
 
 import java.util.List;
 
@@ -87,6 +90,7 @@ protected void onSetUp() throws Exception {
         MockApplicationContext parent = new MockApplicationContext();
         parent.registerMockBean(GrailsApplication.APPLICATION_ID, grailsApplication);
         parent.registerMockBean("messageSource", new StaticMessageSource());
+        parent.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
         GrailsRuntimeConfigurator configurator = new GrailsRuntimeConfigurator(grailsApplication,parent);
         ApplicationContext appCtx = configurator.configure( new MockServletContext( ));
         this.sessionFactory = (SessionFactory)appCtx.getBean("sessionFactory");

test/persistence/org/codehaus/groovy/grails/orm/hibernate/HibernateMappedClassTests.java

@@ -7,6 +7,8 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.plugins.support.aware.GrailsApplicationAware;
+import org.codehaus.groovy.grails.plugins.PluginMetaManager;
+import org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager;
 import org.codehaus.groovy.grails.support.MockApplicationContext;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.hibernate.Session;
@@ -17,6 +19,7 @@
 import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.core.io.Resource;
 
 /**
 
@@ -57,6 +60,7 @@ protected void onSetUp() throws Exception {
         MockApplicationContext parent = new MockApplicationContext();
         parent.registerMockBean(GrailsApplication.APPLICATION_ID, grailsApplication);
         parent.registerMockBean("messageSource", new StaticMessageSource());
+        parent.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
         GrailsRuntimeConfigurator configurator = new GrailsRuntimeConfigurator(grailsApplication,parent);
         ApplicationContext appCtx = configurator.configure( new MockServletContext( ));
         this.sessionFactory = (SessionFactory)appCtx.getBean("sessionFactory");

test/persistence/org/codehaus/groovy/grails/orm/hibernate/PersistentMethodTests.java

@@ -9,6 +9,8 @@
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.orm.hibernate.metaclass.FindByPersistentMethod;
 import org.codehaus.groovy.grails.support.MockApplicationContext;
+import org.codehaus.groovy.grails.plugins.PluginMetaManager;
+import org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager;
 import org.codehaus.groovy.runtime.InvokerInvocationException;
 import org.hibernate.SessionFactory;
 import org.springframework.context.ApplicationContext;
@@ -18,6 +20,7 @@
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.validation.Errors;
+import org.springframework.core.io.Resource;
 
 import java.util.*;
 
@@ -88,6 +91,7 @@ protected void onSetUp() throws Exception {
         MockApplicationContext parent = new MockApplicationContext();
         parent.registerMockBean(GrailsApplication.APPLICATION_ID, grailsApplication);
         parent.registerMockBean("messageSource", new StaticMessageSource());
+        parent.registerMockBean(PluginMetaManager.BEAN_ID, new DefaultPluginMetaManager(new Resource[0]));
         GrailsRuntimeConfigurator configurator = new GrailsRuntimeConfigurator(grailsApplication,parent);
         ApplicationContext appCtx = configurator.configure( new MockServletContext( ));
         this.sessionFactory = (SessionFactory)appCtx.getBean("sessionFactory");

test/web/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerTests.java

@@ -22,13 +22,16 @@
 import org.codehaus.groovy.grails.commons.*;
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.commons.spring.GrailsWebApplicationContext;
+import org.codehaus.groovy.grails.plugins.DefaultPluginMetaManager;
+import org.codehaus.groovy.grails.plugins.PluginMetaManager;
 import org.codehaus.groovy.grails.web.servlet.GrailsApplicationAttributes;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.Resource;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
@@ -137,7 +140,10 @@ protected void setUp() throws Exception {
 
 		BeanDefinition grailsApplicationBean = new RootBeanDefinition(DefaultGrailsApplication.class,args,propValues);
 		localContext.registerBeanDefinition( "grailsApplication", grailsApplicationBean );
-		this.localContext.refresh();
+        ConstructorArgumentValues conArgs = new ConstructorArgumentValues();
+        conArgs.addGenericArgumentValue(new Resource[0]);
+        localContext.registerBeanDefinition(PluginMetaManager.BEAN_ID, new RootBeanDefinition(DefaultPluginMetaManager.class,conArgs,null));
+        this.localContext.refresh();
 
 		this.grailsApplication = (GrailsApplication)localContext.getBean("grailsApplication");
         ApplicationHolder.setApplication(grailsApplication);