Changeset 1478

Timestamp:

Feb 2, 2011, 1:52:01 PM (9 years ago)

Author:

s.h.sikkema@…

Message:

Made StudySearchTests? succeed while still being able to manually inject moduleCommunicationService

Location:

trunk

Files:

• src/groovy/dbnp/query/Search.groovy (modified) (2 diffs)
• test/unit/dbnp/query/StudySearchTests.groovy (modified) (2 diffs)

trunk/src/groovy/dbnp/query/Search.groovy

@@ -42 +42 @@
         public void setResultFields( Map r ) { resultFields = r; }
 
-    def moduleCommunicationService
-
         /**
          * Returns the number of results found by this search
@@ -208 +206 @@
                         return [];
                         
-//              // Determine the moduleCommunicationService
-//              ApplicationContext ctx = (ApplicationContext)ApplicationHolder.getApplication().getMainContext();
-//              def moduleCommunicationService = ctx.getBean("moduleCommunicationService");
+                // Determine the moduleCommunicationService
+                def ctx = ApplicationHolder.getApplication().getMainContext();
+                def moduleCommunicationService = ctx.getBean("moduleCommunicationService");
                         
                 // Loop through all modules and check whether criteria have been given

trunk/test/unit/dbnp/query/StudySearchTests.groovy

@@ -4 +4 @@
 import grails.test.*
 import org.dbnp.gdt.AssayModule
+import org.codehaus.groovy.grails.commons.ApplicationHolder
 
 /**
@@ -48 +49 @@
                 samples.each { it.parent.addToSamples( it ); }
                 assays.each { it.parent.addToAssays( it ); }
+
+        // some mocks to make sure test doesn't break on finding 'moduleCommunicationService'
+        ApplicationHolder.metaClass.static.getApplication = { [getMainContext: { [getBean: {a -> null}] }] }
                 
     }