Simplified tests using "expect" blocks

Author: magneticflux-

src/test/groovy/com/github/magneticflux/rss/namespaces/standard/elements/CategoryTest.groovy

@@ -8,17 +8,11 @@ class CategoryTest extends PersisterSpecification {
 	@Unroll
 	def 'category  #object read/write'() {
 
-		when: 'the object is written to XML'
-		def output = persister.write(object)
+		expect: 'the output XML equals the given XML'
+		persister.write(object) == xml
 
-		then: 'the output XML equals the given XML'
-		output == xml
-
-		when: 'the XML is read to an object'
-		def input = persister.read(Category, xml)
-
-		then: 'the input object equals the given object'
-		input == object
+		and: 'the input object equals the given object'
+		persister.read(Category, xml) == object
 
 		where:
 		domain       | text       | xml

src/test/groovy/com/github/magneticflux/rss/namespaces/standard/elements/CloudTest.groovy

@@ -7,17 +7,11 @@ class CloudTest extends PersisterSpecification {
 	@Unroll
 	def 'cloud #object read/write'() {
 
-		when: 'the object is written to XML'
-		def output = persister.write(object)
+		expect: 'the output XML equals the given XML'
+		persister.write(object) == xml
 
-		then: 'the output XML equals the given XML'
-		output == xml
-
-		when: 'the XML is read to an object'
-		def input = persister.read(Cloud, xml)
-
-		then: 'the input object equals the given object'
-		input == object
+		and: 'the input object equals the given object'
+		persister.read(Cloud, xml) == object
 
 		where:
 		domain       | path       | port | protocol       | registerProcedure       | xml

src/test/groovy/com/github/magneticflux/rss/namespaces/standard/elements/EnclosureTest.groovy

@@ -7,17 +7,11 @@ class EnclosureTest extends PersisterSpecification {
 	@Unroll
 	def 'enclosure #object read/write'() {
 
-		when: 'the object is written to XML'
-		def output = persister.write(object)
+		expect: 'the output XML equals the given XML'
+		persister.write(object) == xml
 
-		then: 'the output XML equals the given XML'
-		output == xml
-
-		when: 'the XML is read to an object'
-		def input = persister.read(Enclosure, xml)
-
-		then: 'the input object equals the given object'
-		input == object
+		and: 'the input object equals the given object'
+		persister.read(Enclosure, xml) == object
 
 		where:
 		url                              | length | type       | xml