Changeset 1658

Timestamp:

Mar 22, 2011, 4:33:49 PM (12 years ago)

Author:

t.w.abma@…

Message:

• importer wizard webtest working
• native file input HTML element didn't work inside AjaxFlow, so used hidden importfile variable
• added check for development or test environment in configuration file
• added webtestfiles folder to web-apps containing Excel files to test

Location:

trunk

Files:

• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (5 diffs)
• grails-app/views/importer/pages/_page_one.gsp (modified) (1 diff)
• test/webtest/gscf/ImportWizardWebTests.groovy (copied) (copied from trunk/test/webtest/gscf/CreateStudyWebTests.groovy) (3 diffs)
• web-app/webtestfiles (added)
• web-app/webtestfiles/NTC_Experiment_test4.xls (added)

trunk/grails-app/conf/Config.groovy

@@ -133 +133 @@
 // Otherwise, it should be given as an absolute path (e.g. '/home/user/sequences')
 // The directory should be writable by the webserver user
-uploads.uploadDir = (new File("/tmp")?.canWrite()) ? "/tmp" : "fileuploads"
+if (GrailsUtil.Environment.current == Environment.TEST) {
+    uploads.uploadDir = "webtestfiles"
+} else
+if (GrailsUtil.Environment.current == Environment.DEVELOPMENT) {
+    uploads.uploadDir = (new File("/tmp")?.canWrite()) ? "/tmp" : "fileuploads"    
+}

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -6 +6 @@
 import org.codehaus.groovy.grails.plugins.web.taglib.ValidationTagLib
 import grails.plugins.springsecurity.Secured
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
+import grails.util.GrailsUtil
+
 
 /**
@@ -123 +126 @@
                                 // that string
                                 flash.importer_params.importfile = params.importfile.replace('existing*', '')
-                flash.importer_params.importfile = new XmlSlurper().parseText(flash.importer_params.importfile[flash.importer_params.importfile.indexOf('<pre')..-1]).toString()
+                //flash.importer_params.importfile = new XmlSlurper().parseText(flash.importer_params.importfile[flash.importer_params.importfile.indexOf('<pre')..-1]).toString()
 
                                 success()
@@ -130 +133 @@
                         on("next") {
                                 flash.wizardErrors = [:]
+
                                 flash.importer_params = params
-                                flash.importer_params.importfile = params.importfile.replace('existing*', '')
-                flash.importer_params.importfile = new XmlSlurper().parseText(flash.importer_params.importfile[flash.importer_params.importfile.indexOf('<pre')..-1]).toString()
+                                flash.importer_params.importfile = params.importfile.replace('existing*', '')                
+                //flash.importer_params.importfile = new XmlSlurper().parseText(flash.importer_params.importfile[flash.importer_params.importfile.indexOf('<pre')..-1]).toString()
 
                                 if (params.entity) {
@@ -266 +270 @@
 
                                 // Always delete the uploaded file in the save step to be sure it doesn't reside there anymore
-                                fileService.delete(flow.importer_importedfile)
+                                if (GrailsUtil.environment != "test") fileService.delete(flow.importer_importedfile)
 
                                 // Save all entities
@@ -340 +344 @@
          * @returns boolean true if correctly validated, otherwise false
          */
-        boolean fileImportPage(flow, flash, params) {
+        boolean fileImportPage(flow, flash, params) {        
                 def importedfile = fileService.get(params['importfile'])
                 flow.importer_importedfile = params['importfile']
-
-                if (importedfile.exists()) {
+        
+        if (importedfile.exists()) {
                         try {
                                 session.importer_workbook = importerService.getWorkbook(new FileInputStream(importedfile))

trunk/grails-app/views/importer/pages/_page_one.gsp

@@ -22 +22 @@
                 Choose your Excel file to import:
             </td>
-            <td width="100px">
-                <af:fileFieldElement name="importfile" value="${importer_params?.importfile}"/>
+            <td width="100px">          
+        <g:if env="test">
+          <input type="hidden" name="importfile" value="NTC_Experiment_test4.xls"/>
+        </g:if>
+        <g:elseif env="development">
+          <af:fileFieldElement name="importfile" value="${importer_params?.importfile}"/>
+        </g:elseif>
+
             </td>
         </tr>

trunk/test/webtest/gscf/ImportWizardWebTests.groovy

@@ -3 +3 @@
 import org.dbnp.gdt.*
 
-class CreateStudyWebTests extends grails.util.WebTest {
+class ImportWizardWebTests extends grails.util.WebTest {
 
         // Unlike unit tests, functional tests are sometimes sequence dependent.
@@ -10 +10 @@
         // e.g. test001XclassNameXListNewDelete
 
-        void testCreateStudy() {
+        void testImportWizard() {
                 // reset Identity to be able to predict identifiers
                 Identity.resetIdentifier()
@@ -22 +22 @@
                 setInputField(description: "Set password field j_password: useR123!", name: "j_password", value: "useR123!")
                 clickButton "Login"
-                clickLink "Studies"
-
-                clickLink "Create a new study"
-                setSelectField(name: "template", text: "Academic study")
-                setInputField(name: "title", value: "Test create study")
-                setInputField(name: "description", value: "Test study from CreateStudyWebTests.testCreateStudy()")
-                setInputField(name: "code", value: "TESTCREATE")
-                setInputField(name: "startdate", value: "01/01/2011")
-                clickButton "next »"
-
-                // Add 10 human subjects
-                setSelectField(name: "species", text: "Homo sapiens")
-                setSelectField(name: "template", text: "Human")
-                setInputField(name: "addNumber", value: "10")
-                clickButton "Add"
-
-                /* Stub code for testing of the template editor
-                           setSelectField(name: "template", text: "add / modify..")
-                           clickLink "Create new field"
-                           setInputField(name: "name", value: "Second Species")
-                           setSelectField(name: "type", text: "ONTOLOGYTERM")
-                           setSelectField(name: "ontologies", text: "NCBI organismal classification")
-                           clickButton "Save"
-                           clickButton "Close"
-                           setSelectField(name: "subject_793_second_species", text: "add more...")
-                           setInputField(name: "term", value: "rat")
-                           clickLink "Rattus norvegicus (Synonym) from: Rattus norvegicus"
-                           clickButton "Add term"
-                           clickButton "Close"   */
-                clickButton "next »"
-
-                // Add some events, sampling events, and groups
-                setSelectField(name: "eventTemplate", text: "Compound challenge")
-                setSelectField(name: "compound", text: "glucose")
-                clickButton "Add"
-                clickButton "add a new eventgroup"
-                setCheckbox(name: "event_13_group_11") // 51_49
-                setCheckbox(name: "event_13_group_14") // 51_52
-                setRadioButton(description: "Check radio button eventType: sample", name: "eventType", value: "sample")
-                setSelectField(name: "sampleTemplate", text: "Blood extraction")
-                setSelectField(name: "sampletemplate", text: "Human blood sample")
-                clickButton "Add"
-                setSelectField(name: "sampleTemplate", text: "Blood extraction")
-                setSelectField(name: "sampletemplate", text: "Human blood sample")
-                setInputField(name: "starttime", value: "1w")
-                clickButton "Add"
-                setCheckbox(name: "event_16_group_11") // 54_49
-                setCheckbox(name: "event_17_group_14") // 55_52
-                setRadioButton(description: "Check radio button eventType: event", name: "eventType", value: "event")
-                setSelectField(name: "eventTemplate", text: "Compound challenge")
-                setSelectField(name: "compound", text: "glucose")
-                clickButton "Add"
-                setCheckbox(name: "event_18_group_11")  // 56_49
-                setCheckbox(name: "event_18_group_14")  // 56_52
-
-                /* stub to test ontology term widget
-                           setSelectField(name: "event_20_compound", text: "add more...")
-                           setInputField(name: "term", value: "glu")
-                           clickLink "L-glutamic acid (Synonym) from: L-glutamic acid"
-                           clickButton "Add term"
-                           clickButton "Close"
-                           setSelectField(name: "event_1648_compound", text: "L-glutamic acid")
-                           */
-                clickButton "next »"
-
-                // assign subjects to event groups
-                setCheckbox(name: "subject_1_group_11") // 39_49
-                setCheckbox(name: "subject_2_group_11") // 40_49
-                setCheckbox(name: "subject_3_group_11") // 41_49
-                setCheckbox(name: "subject_4_group_14") // 42_52
-                setCheckbox(name: "subject_5_group_14") // 43_52
-                setCheckbox(name: "subject_6_group_14") // 44_52
-                clickButton "next »"
-
-                // accept the generated samples, check if the right names are in place
-                /* For some reason enabling this causes the whole webtest to blow. TODO: find out why...
-           verifyInputField(name: "sample_21_name", value="Subject1_BloodExtraction_Group1_0s")
-           verifyInputField(name: "sample_22_name", value="Subject2_BloodExtraction_Group1_0s")
-           verifyInputField(name: "sample_23_name", value="Subject3_BloodExtraction_Group1_0s")
-           verifyInputField(name: "sample_24_name", value="Subject4_BloodExtraction_Group2_1w")
-           verifyInputField(name: "sample_25_name", value="Subject5_BloodExtraction_Group2_1w")
-           verifyInputField(name: "sample_26_name", value="Subject6_BloodExtraction_Group2_1w")
-
-                   and this doesnt work apparently inside textfields: verifyText(text: "Subject1_BloodExtraction_Group1_0s")
-
-                */
-                clickButton "next »"
-
-
-                setSelectField(name: "template", text: "Clinical chemistry assay")
-                setInputField(name: "name", value: "test assay")
-                clickButton "Add"
-                clickButton "next »"
-
-                setCheckbox(name: "sample_22_assay_25") // 60_63
-                clickButton "next »"
-                clickButton "next »"
-
-                // and we should be done, without exceptions
-                // verifyText(text:'Done')
-                // does not seem to work, also see --> http://grails.1312388.n4.nabble.com/webtest-verifyText-doesn-t-see-AJAX-update-with-easyAjax-td2225674.html
-
-                // and view the study
-                clickLink "view the study"
+        
+        clickLink "Studies"
+        clickLink "Import study data"
+        
+        setSelectField(name: "entity", text: "Study")        
+        clickButton "next »"
+        
+        // Set column properties (TemplateFields)
+        setSelectField(name: "columnproperty.index.0", text: "startDate")
+        setSelectField(name: "columnproperty.index.1", text: "code (IDENTIFIER)")
+        setSelectField(name: "columnproperty.index.15", text: "title")
+        setSelectField(name: "columnproperty.index.16", text: "description")
+        clickButton "next »"
+        
+        // Validate and store
+        clickButton "next »"
+        
+        
         }