svn commit: r1307960 - in /tapestry/tapestry5/branches/5.3: build.gradle plastic/build.gradle plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy

[hl...@apache.org]

Author: hlship
Date: Sun Apr  1 00:34:55 2012
New Revision: 1307960

URL: http://svn.apache.org/viewvc?rev=1307960&view=rev
Log:
Upgrade to version 0.6 of Spock framework, 1.8.6 of Groovy

Modified:
    tapestry/tapestry5/branches/5.3/build.gradle
    tapestry/tapestry5/branches/5.3/plastic/build.gradle
    tapestry/tapestry5/branches/5.3/plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy

Modified: tapestry/tapestry5/branches/5.3/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/build.gradle?rev=1307960&r1=1307959&r2=1307960&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/build.gradle Sun Apr  1 00:34:55 2012
@@ -141,7 +141,7 @@ subprojects {
   }
 
   dependencies {
-    groovy "org.codehaus.groovy:groovy-all:1.7.4"
+    groovy "org.codehaus.groovy:groovy-all:1.8.6"
 
     deployerJars "org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6"
   }

Modified: tapestry/tapestry5/branches/5.3/plastic/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/plastic/build.gradle?rev=1307960&r1=1307959&r2=1307960&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/plastic/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/plastic/build.gradle Sun Apr  1 00:34:55 2012
@@ -2,7 +2,7 @@ description = "Plastic core framework"
 
 dependencies {
     
-	testCompile "org.spockframework:spock-core:0.5-groovy-1.7"    
+	testCompile "org.spockframework:spock-core:0.6-groovy-1.8"
 }
 
 // Add the source directory for the imported/repackaged ASM 3.3.1 code

Modified: tapestry/tapestry5/branches/5.3/plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy?rev=1307960&r1=1307959&r2=1307960&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy (original)
+++ tapestry/tapestry5/branches/5.3/plastic/src/test/groovy/org/apache/tapestry5/internal/plastic/PlasticUtilsTests.groovy Sun Apr  1 00:34:55 2012
@@ -1,4 +1,4 @@
-// Copyright 2011 The Apache Software Foundation
+// Copyright 2011, 2012 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@ import org.apache.tapestry5.plastic.Plas
 import spock.lang.Specification
 import spock.lang.Unroll
 
+@Unroll
 class PlasticUtilsTests extends Specification
 {
-    def "toDescriptor handles primitive, object and array types"()
+    def "Class name #className should convert to descriptor #desc"()
     {
         expect:
         PlasticInternalUtils.toDescriptor(className) == desc
@@ -35,7 +36,7 @@ class PlasticUtilsTests extends Specific
         "java.lang.Long[][]" | "[[Ljava/lang/Long;"
     }
 
-    def "descriptorToClassName for proper description"()
+    def "Descriptor #descriptor as class name should be #className"()
     {
         expect:
         PlasticInternalUtils.objectDescriptorToClassName(descriptor) == className
@@ -45,8 +46,7 @@ class PlasticUtilsTests extends Specific
         'Lfoo/bar/Baz$Biff;' | 'foo.bar.Baz$Biff'
     }
 
-    @Unroll("toClass '#javaName' should be #expectedClass")
-    def "toClass tests"()
+    def "toClass('#javaName') should be #expectedClass"()
     {
         expect:
 
@@ -74,8 +74,7 @@ class PlasticUtilsTests extends Specific
         e.message == "Input 'I' is not an object descriptor."
     }
 
-    @Unroll("#featureName[field '#fieldName' should convert to property '#propertyName']")
-    def "conversion of field name to property name"()
+    def "Field '#fieldName' should convert to property '#propertyName'"()
     {
         expect:
 
@@ -115,8 +114,7 @@ class PlasticUtilsTests extends Specific
         thrown(IllegalArgumentException)
     }
 
-    @Unroll("#featureName['#input' should  capitalize to '#output']")
-    def "capitalize strings"()
+    def "capitalize('#input') should be '#output'"()
     {
         expect:
 
@@ -133,8 +131,7 @@ class PlasticUtilsTests extends Specific
         "goodbye" | "Goodbye"
     }
 
-    @Unroll("toWrapperType #primitiveType should be #wrapperType")
-    def "primitive type to wrapper type"()
+    def "toWrapperType #primitiveType should be #wrapperType"()
     {
         expect:
 
@@ -149,8 +146,7 @@ class PlasticUtilsTests extends Specific
         int[].class   | int[].class
     }
 
-    @Unroll("isPrimitive(#name) == #expected")
-    def "isPrimitive tests"()
+    def "isPrimitive #name should be #expected"()
     {
         expect: