Permalink
Browse files

Merge branch '2.1.x' of github.com:grails/grails-core into 2.1.x

  • Loading branch information...
2 parents f61ab13 + dc0e08d commit bb1588e3ba11911b50e7435255818f2a6cc8a96a @graemerocher graemerocher committed May 18, 2012
@@ -234,7 +234,7 @@ class UrlMappingsUnitTestMixin extends ControllerUnitTestMixin {
paramAssertions.resolveStrategy = Closure.DELEGATE_ONLY
paramAssertions.call()
params.each {name, value ->
- assertEquals("Url mapping '$name' parameter assertion for '$url' failed", value.toString(), mapping.params[name])
+ assertEquals("Url mapping '$name' parameter assertion for '$url' failed", value, mapping.params[name])
}
}
return true
@@ -137,6 +137,24 @@ class UrlMappingsTestMixinTests {
}
}
}
+
+ @Test
+ void testGrails9110() {
+ mockController(UserController)
+ mockUrlMappings(GRAILS9110UrlMappings)
+ shouldFail(ComparisonFailure) {
+ assertForwardUrlMapping("/user", controller:"user", action:"publicProfile") {
+ param1 = "true"
+ }
+ }
+ assertForwardUrlMapping("/user", controller:"user", action:"publicProfile") {
+ boolParam = true
+ strParam = "string"
+ numParam = 123
+ objParam = [test:true]
+ dateParam = new Date(1)
+ }
+ }
}
class AnotherUrlMappings {
@@ -180,3 +198,15 @@ class GRAILS5222UrlMappings {
}
}
}
+
+class GRAILS9110UrlMappings {
+ static mappings = {
+ "/user"(controller:"user", action:"publicProfile") {
+ boolParam = true
+ strParam = "string"
+ numParam = 123
+ objParam = [test:true]
+ dateParam = new Date(1)
+ }
+ }
+}
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.grails.wrapper;
import java.io.BufferedOutputStream;
@@ -18,7 +33,12 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-
+/**
+ * GrailsWrapper class for wrapper
+ *
+ * @author Jeff Brown
+ * @since 2.1
+ */
public class GrailsWrapper {
public static void main(final String[] args) throws Exception{
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.grails.wrapper;
import java.io.BufferedOutputStream;
@@ -9,7 +24,12 @@
import java.net.URL;
import java.net.URLConnection;
-
+/**
+ * RemoteFileHelper class used by {@link GrailsWrapper} for wrapper
+ *
+ * @author Jeff Brown
+ * @since 2.1
+ */
public class RemoteFileHelper {
private static final int CHUNK_SIZE = 20000;
private static final int BUFFER_SIZE = 10000;

0 comments on commit bb1588e

Please sign in to comment.