Update grails tests, tweak domain classes to pass

tests in 1.3.7
rundeck · Nov 2, 2011 · 77f0877 · 77f0877
1 parent 57af972
commit 77f0877
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/rundeckapp/grails-app/domain/ScheduledExecution.groovy b/rundeckapp/grails-app/domain/ScheduledExecution.groovy
@@ -34,7 +34,7 @@ class ScheduledExecution extends ExecutionContext {
     static constraints = {
         workflow(nullable:true)
         options(nullable:true)
-        jobName(blank:false)
+        jobName(blank:false,nullable:false)
         groupPath(nullable:true)
         nextExecution(nullable:true)
         nodeKeepgoing(nullable:true)
@@ -74,7 +74,7 @@ class ScheduledExecution extends ExecutionContext {
 
     static mapping = {
         def config = ConfigurationHolder.config
-        if (config.rundeck.v14.rdbsupport == 'true') {
+        if (config?.rundeck?.v14?.rdbsupport == 'true') {
             user column: "rduser"
             argString type: 'text'
             nodeIncludeName type: 'text'

diff --git a/rundeckapp/grails-app/domain/User.groovy b/rundeckapp/grails-app/domain/User.groovy
@@ -11,7 +11,7 @@ class User {
 
     static mapping = {
         def config = ConfigurationHolder.config
-        if (config.rundeck.v14.rdbsupport == 'true') {
+        if (config?.rundeck?.v14?.rdbsupport == 'true') {
             table "rduser"
         }
     }

diff --git a/rundeckapp/test/integration/ScheduledExecValidationTests.groovy b/rundeckapp/test/integration/ScheduledExecValidationTests.groovy
@@ -905,6 +905,11 @@ public class ScheduledExecValidationTests extends GrailsUnitTestCase{
 
             def params=[:]
             def results=sec._dovalidate(params)
+            if (results.scheduledExecution.errors.hasErrors()) {
+                results.scheduledExecution.errors.allErrors.each {
+                    System.err.println(it);
+                }
+            }
             assertTrue(results.failed)
             assertNotNull(results.scheduledExecution)
             assertTrue(results.scheduledExecution instanceof ScheduledExecution)
@@ -913,6 +918,8 @@ public class ScheduledExecValidationTests extends GrailsUnitTestCase{
             assertNotNull(execution.errors)
             assertTrue(execution.errors.hasErrors())
             assertTrue(execution.errors.hasFieldErrors('project'))
+            assertTrue(execution.errors.hasFieldErrors('workflow'))
+            assertFalse(!!execution.jobName)
             assertTrue(execution.errors.hasFieldErrors('jobName'))
             assertFalse(execution.errors.hasFieldErrors('name'))
             assertFalse(execution.errors.hasFieldErrors('type'))

diff --git a/rundeckapp/test/unit/ExecutionServiceTests.groovy b/rundeckapp/test/unit/ExecutionServiceTests.groovy
@@ -1,6 +1,7 @@
 import java.util.logging.LogRecord
 import java.text.SimpleDateFormat
 import grails.test.GrailsUnitTestCase
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 class ExecutionServiceTests extends GrailsUnitTestCase {
 
@@ -580,6 +581,8 @@ class ExecutionServiceTests extends GrailsUnitTestCase {
     void testCreateContext(){
         mockDomain(Execution)
         mockDomain(User)
+        ConfigurationHolder.metaClass.getConfig = {-> [:] }
+
         def testService = new ExecutionService()
         def frameworkService = new FrameworkService()
         testService.frameworkService = frameworkService

diff --git a/rundeckapp/test/unit/JobsXMLCodecTests.groovy b/rundeckapp/test/unit/JobsXMLCodecTests.groovy
@@ -2174,9 +2174,9 @@ class JobsXMLCodecTests extends GroovyTestCase {
             assertEquals "incorrect nodefilters include os-arch",'x86,sparc',doc.job[0].nodefilters[0].include[0].'os-arch'[0].text()
             assertEquals "incorrect nodefilters include os-version",1,doc.job[0].nodefilters[0].include[0].'os-version'.size()
             assertEquals "incorrect nodefilters include os-version",'4\\..*',doc.job[0].nodefilters[0].include[0].'os-version'[0].text()
-            def tname=doc.job[0].nodefilters[0].include[0].find{it.name=='name'}.text()
+            def tname=doc.job[0].nodefilters[0].include[0].'name'[0].text()
             assertEquals "incorrect nodefilters include name",'mynode',tname
-            assertEquals "incorrect nodefilters include name",1,doc.job[0].nodefilters[0].include[0].findAll{it.name=='name'}.size()
+            assertEquals "incorrect nodefilters include name",1,doc.job[0].nodefilters[0].include[0].'name'.size()
 
 
         //set node dispatch to true, and assert 'exclude' nodefilters are generated
@@ -2223,8 +2223,8 @@ class JobsXMLCodecTests extends GroovyTestCase {
             assertEquals "incorrect nodefilters exclude os-arch",'x86,sparc',doc.job[0].nodefilters[0].exclude[0].'os-arch'[0].text()
             assertEquals "incorrect nodefilters exclude os-version",1,doc.job[0].nodefilters[0].exclude[0].'os-version'.size()
             assertEquals "incorrect nodefilters exclude os-version",'4\\..*',doc.job[0].nodefilters[0].exclude[0].'os-version'[0].text()
-            assertEquals "incorrect nodefilters exclude name",1,doc.job[0].nodefilters[0].exclude[0].findAll{it.name=='name'}.size()
-            assertEquals "incorrect nodefilters exclude name",'mynode',doc.job[0].nodefilters[0].exclude[0].find{it.name=='name'}.text()
+            assertEquals "incorrect nodefilters exclude name",1,doc.job[0].nodefilters[0].exclude[0].'name'.size()
+            assertEquals "incorrect nodefilters exclude name",'mynode',doc.job[0].nodefilters[0].exclude[0].'name'[0].text()
 
 
         //set node dispatch to true, and assert both 'include' and 'exclude' nodefilters are generated
@@ -2278,8 +2278,8 @@ class JobsXMLCodecTests extends GroovyTestCase {
             assertEquals "incorrect nodefilters exclude os-arch",'x86,sparc',doc.job[0].nodefilters[0].exclude[0].'os-arch'[0].text()
             assertEquals "incorrect nodefilters exclude os-version",1,doc.job[0].nodefilters[0].exclude[0].'os-version'.size()
             assertEquals "incorrect nodefilters exclude os-version",'4\\..*',doc.job[0].nodefilters[0].exclude[0].'os-version'[0].text()
-            assertEquals "incorrect nodefilters exclude name",1,doc.job[0].nodefilters[0].exclude[0].findAll{it.name=='name'}.size()
-            assertEquals "incorrect nodefilters exclude name",'mynode',doc.job[0].nodefilters[0].exclude[0].find{it.name=='name'}.text()
+            assertEquals "incorrect nodefilters exclude name",1,doc.job[0].nodefilters[0].exclude[0].'name'.size()
+            assertEquals "incorrect nodefilters exclude name",'mynode',doc.job[0].nodefilters[0].exclude[0].'name'[0].text()
 
             assertEquals "missing nodefilters include",1,doc.job[0].nodefilters[0].include.size()
             assertEquals "incorrect number of nodefilters include elements",7,doc.job[0].nodefilters[0].include[0].children().size()
@@ -2295,8 +2295,8 @@ class JobsXMLCodecTests extends GroovyTestCase {
             assertEquals "incorrect nodefilters include os-arch",'686',doc.job[0].nodefilters[0].include[0].'os-arch'[0].text()
             assertEquals "incorrect nodefilters include os-version",1,doc.job[0].nodefilters[0].include[0].'os-version'.size()
             assertEquals "incorrect nodefilters include os-version",'10\\..*',doc.job[0].nodefilters[0].include[0].'os-version'[0].text()
-            assertEquals "incorrect nodefilters include name",1,doc.job[0].nodefilters[0].include[0].findAll{it.name=='name'}.size()
-            assertEquals "incorrect nodefilters include name",'annode',doc.job[0].nodefilters[0].include[0].find{it.name=='name'}.text()
+            assertEquals "incorrect nodefilters include name",1,doc.job[0].nodefilters[0].include[0].'name'.size()
+            assertEquals "incorrect nodefilters include name",'annode',doc.job[0].nodefilters[0].include[0].'name'[0].text()
 
     }
 

diff --git a/rundeckapp/test/unit/ScheduledExecutionControllerTests.groovy b/rundeckapp/test/unit/ScheduledExecutionControllerTests.groovy
@@ -15,7 +15,7 @@
  */
 import grails.test.GrailsUnitTestCase
 import grails.test.ControllerUnitTestCase
-
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 /*
 * ScheduledExecutionControllerTests.java
@@ -47,6 +47,7 @@ class ScheduledExecutionControllerTests extends ControllerUnitTestCase {
     public void testExpandUrl() {
         mockDomain(ScheduledExecution)
         mockDomain(Option)
+        ConfigurationHolder.metaClass.getConfig = {-> [:] }
         ScheduledExecution se = new ScheduledExecution(jobName: 'blue', groupPath:'some/where',description:'a job',project:'AProject',argString:'-a b -c d',adhocExecution:false)
 
         final Option option = new Option(name: 'test1', enforced: false)