Changeset 1487 for trunk/src/groovy/dbnp

Timestamp:

Feb 3, 2011, 10:51:16 AM (10 years ago)

Author:

robert@…

Message:

• Fixed StudySearch? unit tests (#303)
• Changed css error message to class="errormessage" in order to avoid breaking the study wizard (see r1485)

Location:

trunk/src/groovy/dbnp/query

Files:

• Search.groovy (modified) (2 diffs)
• StudySearch.groovy (modified) (1 diff)

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

@@ -49 +49 @@
         public void setResultFields( Map r ) { resultFields = r; }
 
+        public Search() {
+                def ctx = ApplicationHolder.getApplication().getMainContext();
+                def authenticationService = ctx.getBean("authenticationService");
+                def sessionUser = authenticationService?.getLoggedInUser();
+
+                if( sessionUser )
+                        this.user = sessionUser;
+                else
+                        this.user = null
+        }
+        
         /**
          * Returns the number of results found by this search
@@ -215 +226 @@
                         return [];
                         
-                // Determine the moduleCommunicationService
-                def ctx = (ApplicationContext)ApplicationHolder.getApplication().getMainContext();
+                // Determine the moduleCommunicationService. Because this object
+                // is mocked in the tests, it can't be converted to a ApplicationContext object
+                def ctx = ApplicationHolder.getApplication().getMainContext();
                 def moduleCommunicationService = ctx.getBean("moduleCommunicationService");
                         

trunk/src/groovy/dbnp/query/StudySearch.groovy

@@ -67 +67 @@
 
                 def studies = Study.list().findAll { it.canRead( this.user ) };
-                
+
                 // If no criteria are found, return all studies
                 if( !criteria || criteria.size() == 0 ) {