fixes for failing tests

git-svn-id: https://svn.codehaus.org/grails/trunk@5753 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

.classpath

@@ -33,7 +33,7 @@
 	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/ehcache-1.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
-	<classpathentry kind="lib" path="lib/gant-0.3.3.jar"/>
+	<classpathentry kind="lib" path="lib/gant-0.3.4-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/groovy-all-1.1-rc-1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
 	<classpathentry kind="lib" path="lib/hsqldb-1.8.0.5.jar"/>

src/groovy/org/codehaus/groovy/grails/plugins/web/filters/DefaultGrailsFiltersClass.groovy

@@ -46,11 +46,11 @@ class DefaultGrailsFiltersClass  extends AbstractInjectableGrailsClass implement
 class Loader {
 	def filters = []
 
-	def methodMissing(String name, args) {
+	def methodMissing(String methodName, args) {
         if(args) {
 
             def fc = new FilterConfig(name:methodName)
-            delegate.filters << fc
+            filters << fc
 
             if(args[0] instanceof Closure) {
                 def closure = args[0]

src/web/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingInfo.java

@@ -16,13 +16,11 @@
 
 import groovy.lang.Closure;
 import org.codehaus.groovy.grails.web.mapping.exceptions.UrlMappingException;
-import org.codehaus.groovy.grails.web.servlet.mvc.GrailsParameterMap;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 /**
  * A Class that implements the UrlMappingInfo interface and holds information established from a matched
@@ -39,14 +37,14 @@ public class DefaultUrlMappingInfo implements UrlMappingInfo {
     private Map params = Collections.EMPTY_MAP;
     private Object controllerName;
     private Object actionName;
+    private Object id;
     private static final String ID_PARAM = "id";
-    private String id;
     private UrlMappingData urlData;
     private Object viewName;
 
     private DefaultUrlMappingInfo(Map params, UrlMappingData urlData) {
         this.params = Collections.unmodifiableMap(params);
-        this.id = (String)params.get(ID_PARAM);
+        this.id = params.get(ID_PARAM);
         this.urlData = urlData;
     }
 
@@ -79,9 +77,31 @@ public String toString() {
      * @param dispatchParams The Map instance
      */
     protected void populateParamsForMapping(Map dispatchParams) {
-        for (Iterator j = this.params.keySet().iterator(); j.hasNext();) {
+        Collection keys = this.params.keySet();
+        keys = DefaultGroovyMethods.toList(keys);
+        Collections.sort((List)keys, new Comparator() {
+
+            public int compare(Object leftKey, Object rightKey) {
+                Object leftValue = params.get(leftKey);
+                Object rightValue = params.get(rightKey);
+                boolean leftIsClosure = leftValue instanceof Closure;
+                boolean rightIsClosure = rightValue instanceof Closure;
+                if(leftIsClosure && rightIsClosure) return 0;
+                else if(leftIsClosure && !rightIsClosure) return 1;
+                else if(rightIsClosure && !leftIsClosure) return -1;
+                return 0;
+            }
+        });
+        for (Iterator j = keys.iterator(); j.hasNext();) {
+
             String name = (String) j.next();
-            dispatchParams.put(name, this.params.get(name));
+            Object param = this.params.get(name);
+            if(param instanceof Closure) {
+                param = evaluateNameForValue(param);
+            }
+
+            dispatchParams.put(name, param);
+
         }
     }
 
@@ -108,7 +128,7 @@ public String getViewName() {
     }
 
     public String getId() {
-        return id;
+        return evaluateNameForValue(this.id);
     }
 
     private String evaluateNameForValue(Object value) {

test/groovy/org/codehaus/groovy/grails/validation/ConstraintsBuilderTests.groovy

@@ -2,7 +2,8 @@ package org.codehaus.groovy.grails.validation
 
 import  org.codehaus.groovy.grails.commons.test.*
 import  org.codehaus.groovy.grails.commons.metaclass.*
-import org.springframework.validation.BindException;
+import org.springframework.validation.BindException
+import org.springframework.validation.Errors;
 
 class ConstraintsBuilderTests extends AbstractGrailsMockTests {
 
@@ -46,6 +47,48 @@ class ConstraintsBuilderTests extends AbstractGrailsMockTests {
          assert !errors.hasErrors()
     }
 
+
+    void testURLValidation() {
+        def theClass = ga.getDomainClass("Site")
+
+        def instance = theClass.newInstance()
+        def validator = configureValidator(theClass, instance)
+
+        def errors = validateInstance(instance, validator)
+
+        assert !errors.hasErrors()
+
+        instance.url = new URL("http://grails.org")
+        errors = validateInstance(instance, validator)
+        assert !errors.hasErrors()
+
+        instance.url = new URL("http://localhost:8080/tau_gwi_00/clif/cb/19")
+        errors = validateInstance(instance, validator)
+        assert !errors.hasErrors()
+                      
+    }
+
+    Errors validateInstance(instance, validator) {
+        def errors = new BindException(instance, instance.class.name)
+        validator.validate(instance, errors, true)
+        return errors
+    }
+
+    GrailsDomainClassValidator configureValidator(theClass, instance) {
+        def metaClass = new ExpandoMetaClass(theClass.clazz)
+        def errorsProp = null
+        def setter = { Object obj -> errorsProp = obj }
+        metaClass.setErrors = setter
+        metaClass.initialize()
+        instance.metaClass = metaClass
+        def validator = new GrailsDomainClassValidator()
+
+        validator.domainClass = theClass
+        validator.messageSource = createMessageSource()
+        theClass.validator = validator
+        return validator
+    }
+
     public void onSetUp() {
         gcl.parseClass('''
 class Book {
@@ -58,6 +101,14 @@ class Book {
        totalSales(min:0)
 
     }
+}
+class Site {
+    Long id
+    Long version
+    URL url
+    static constraints = {
+        url(url:true, nullable:true)
+    }
 }
         ''')
     }

test/groovy/org/codehaus/groovy/grails/web/mapping/DynamicActionNameEvaluatingTests.groovy

@@ -12,9 +12,9 @@ mappings {
       action = { "${params.test}" }
   }
   "/$controller/$action?/$id?" {
-      controller = { params.controller }
-      action = { params.action }
-      id = { params.id }
+      ctrl = { params.controller }
+      act = { params.action }
+      identity = { params.id }
   }    
 }
 '''
@@ -84,8 +84,11 @@ mappings {
              assert info
              info.configure(webRequest)
              assertEquals "book", info.controllerName
+             assertEquals "book", webRequest.params.ctrl
              assertEquals "show", info.actionName
+             assertEquals "show", webRequest.params.act
              assertEquals "1", info.id
+             assertEquals "1", webRequest.params.identity             
 
         }