Changeset 1487

Timestamp:

Feb 3, 2011, 10:51:16 AM (9 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

Files:

• grails-app/views/advancedQuery/index.gsp (modified) (1 diff)
• src/groovy/dbnp/query/Search.groovy (modified) (2 diffs)
• src/groovy/dbnp/query/StudySearch.groovy (modified) (1 diff)
• test/unit/dbnp/query/StudySearchTests.groovy (modified) (5 diffs)
• web-app/css/default_style.css (modified) (1 diff)

trunk/grails-app/views/advancedQuery/index.gsp

@@ -40 +40 @@
 
 <g:if test="${flash.error}">
-        <div class="error">
+        <div class="errormessage">
                 ${flash.error.toString().encodeAsHTML()}
         </div>

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 ) {

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

@@ -5 +5 @@
 import org.dbnp.gdt.AssayModule
 import org.codehaus.groovy.grails.commons.ApplicationHolder
+import dbnp.authentication.*;
 
 /**
@@ -33 +34 @@
                 ]
                 def assays = [ new Assay( name: 'Assay 1', parent: studies[0], samples: [samples[0]] ), new Assay( name: 'Assay 2', parent: studies[1], samples: [samples[1]] ) ]
+
+                def users = [ new SecUser( username: "abc" ) ];
                 
                 mockDomain( Study, studies );
@@ -42 +45 @@
 
         mockDomain( AssayModule );
+                mockDomain( SecUser, users )
+                mockDomain( SecUserSecRole )
+                mockDomain( SecRole )
                 
                 subjects.each { it.parent.addToSubjects( it ); }
@@ -49 +55 @@
                 samples.each { it.parent.addToSamples( it ); }
                 assays.each { it.parent.addToAssays( it ); }
+                studies.each {
+                        it.owner = users[0]
+                }
 
         // some mocks to make sure test doesn't break on finding 'moduleCommunicationService'
-        ApplicationHolder.metaClass.static.getApplication = { [getMainContext: { [getBean: {a -> null}] }] }
+        ApplicationHolder.metaClass.static.getApplication = { [getMainContext: 
+                        { [getBean:
+                                { what ->
+                                        if( what == "authenticationService" )
+                                                return [getLoggedInUser: { return users[0]; } ]
+                                        else if( what == "moduleCommunicationService" )
+                                                return null
+                                 }
+                        ] }
+                ] }
                 
     }
@@ -70 +88 @@
 
                 // Search without criteria
-                studySearch.setCriteria( );
+                studySearch.setCriteria();
                 studySearch.execute();
                 

trunk/web-app/css/default_style.css

@@ -196 +196 @@
 }
 
-/* DISABLED as this is conflicting with other error styles,
-   please rename this in your stuff before enabling again, or
-   move it into a separate css file and/or div element */
-#content .disabledEerror {
+#content .errormessage {
         border: 1px solid #f99; /* #006dba; */
         margin-bottom: 10px;