Added Spock testing framework and unit test for the Category element, updated Gradle to 4.6-rc-2 for better JUnit and JaCoCo support

Author: magneticflux-

build.gradle

@@ -1,107 +1,102 @@
 buildscript {
-    ext.kotlin_version = '1.2.21'
-    ext.spek_version = '1.1.5'
-
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.16"
-        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.1.0'
-    }
+	ext.kotlin_version = '1.2.21'
+	ext.spek_version = '1.1.5'
+
+	repositories { jcenter() }
+	dependencies {
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+		classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.16"
+		classpath 'org.junit.platform:junit-platform-gradle-plugin:1.1.0'
+	}
 }
 
 plugins {
-    id 'java-library'
-    id 'jacoco'
-    id 'maven-publish'
-    id 'com.jfrog.bintray' version '1.8.0'
-    id 'org.shipkit.java' version '2.0.2'
-    id 'com.diffplug.gradle.spotless' version '3.10.0'
-    id 'com.github.ben-manes.versions' version '0.17.0'
+	id 'java-library'
+	id 'jacoco'
+	id 'maven-publish'
+	id 'groovy'
+	id 'com.jfrog.bintray' version '1.8.0'
+	id 'org.shipkit.java' version '2.0.2'
+	id 'com.diffplug.gradle.spotless' version '3.10.0'
+	id 'com.github.ben-manes.versions' version '0.17.0'
 }
 
 apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'org.junit.platform.gradle.plugin'
 
 group 'com.github.magneticflux'
 
 repositories {
-    jcenter()
-    maven { url 'http://dl.bintray.com/jetbrains/spek' }
+	jcenter()
+	maven { url 'http://dl.bintray.com/jetbrains/spek' }
 }
 
-junitPlatform {
-    filters {
-        engines {
-            include 'spek'
-        }
-    }
+test {
+	useJUnitPlatform { includeEngines 'spek', 'junit-vintage' }
 }
 
 publishing {
-    publications {
-        myPublication(MavenPublication) {
-            from components.java
-            //noinspection GroovyAssignabilityCheck
-            artifact sourcesJar
-            //noinspection GroovyAssignabilityCheck
-            artifact dokkaJavadocJar
-        }
-    }
+	publications {
+		myPublication(MavenPublication) {
+			from components.java
+			//noinspection GroovyAssignabilityCheck
+			artifact sourcesJar
+			//noinspection GroovyAssignabilityCheck
+			artifact dokkaJavadocJar
+		}
+	}
 }
 
 dokka {
-    outputFormat = 'javadoc'
-    jdkVersion = 7
-    impliedPlatforms = ["JVM"]
+	outputFormat = 'javadoc'
+	jdkVersion = 7
+	impliedPlatforms = ["JVM"]
 }
 
 task dokkaJavadocJar(type: Jar, dependsOn: dokka) {
-    classifier = 'javadoc'
-    from dokka.outputDirectory
+	classifier = 'javadoc'
+	//noinspection GroovyAssignabilityCheck
+	from dokka.outputDirectory
 }
 
 spotless {
-    kotlin {
-        ktlint('0.14.0')
-    }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+	kotlin { ktlint('0.15.1') }
 
-    api 'org.simpleframework:simple-xml:2.7.1'
-    api 'org.threeten:threetenbp:1.3.6'
+	groovy { greclipse() }
 
-    testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
-    testImplementation "org.jetbrains.spek:spek-api:$spek_version"
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testRuntimeOnly "org.jetbrains.spek:spek-junit-platform-engine:$spek_version"
+	groovyGradle { greclipse() }
 }
 
-jacoco {
-    applyTo junitPlatformTest
-}
-
-junitPlatformTest {
-    jacoco {
-        destinationFile = file("$buildDir/jacoco/test.exec")
-    }
+dependencies {
+	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+	api 'org.simpleframework:simple-xml:2.7.1'
+	api 'org.threeten:threetenbp:1.3.6'
+
+	// Tests
+	testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
+
+	// Spock
+	testImplementation 'org.codehaus.groovy:groovy-all:2.4.13'
+	testImplementation "org.spockframework:spock-core:1.1-groovy-2.4"
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
+	testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.1.0'
+	testCompileOnly 'junit:junit:4.12'
+
+	// Spek
+	testImplementation "org.jetbrains.spek:spek-api:$spek_version"
+	testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+	testRuntimeOnly "org.jetbrains.spek:spek-junit-platform-engine:$spek_version"
 }
 
 jacocoTestReport {
-    executionData junitPlatformTest
-    sourceSets sourceSets.main
-    dependsOn(junitPlatformTest)
-
-    reports {
-        //noinspection GroovyAssignabilityCheck
-        xml {
-            enabled true
-        }
-    }
+	sourceSets sourceSets.main
+	dependsOn test
+
+	reports {
+		//noinspection GroovyAssignabilityCheck
+		xml { enabled true }
+	}
 }
 check.dependsOn(jacocoTestReport)

gradle.properties

@@ -1,2 +1,2 @@
 org.gradle.caching=true
-org.gradle.parallel=true
+org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-rc-2-all.zip

src/main/kotlin/com/github/magneticflux/rss/Converters.kt

@@ -44,7 +44,6 @@ private class InputNodeChildIterator(val rootNode: InputNode) : AbstractIterator
         val next = rootNode.next
         if (next != null)
             setNext(next)
-        else
-            done()
+        else done()
     }
 }

src/main/kotlin/com/github/magneticflux/rss/Transforms.kt

@@ -82,7 +82,6 @@ object URLTransform : Transform<URL> {
     override fun write(value: URL): String {
         return if (value.authority == null)
             value.file
-        else
-            value.toExternalForm()
+        else value.toExternalForm()
     }
 }

src/test/groovy/com/github/magneticflux/rss/PersisterSpecification.groovy

@@ -0,0 +1,9 @@
+package com.github.magneticflux.rss
+
+import spock.lang.Shared
+import spock.lang.Specification
+
+abstract class PersisterSpecification extends Specification {
+	@Shared
+	protected persister = PersistersKt.createRssPersister()
+}

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

@@ -0,0 +1,28 @@
+package com.github.magneticflux.rss.namespaces.standard.elements
+
+import com.github.magneticflux.rss.PersisterSpecification
+import org.codehaus.groovy.runtime.StringBufferWriter
+import spock.lang.Unroll
+
+class CategoryTest extends PersisterSpecification {
+
+	@Unroll
+	def 'category of #object read/write'() {
+		expect:
+
+		def output = new StringBuffer()
+		persister.write(new Category(domain, text), new StringBufferWriter(output))
+		output.toString() == xml
+
+		def input = persister.read(Category, xml)
+		input.domain == domain
+		input.text == text
+
+		where:
+
+		domain       | text       | xml
+		'testDomain' | 'testText' | """<category domain="$domain">$text</category>"""
+		null         | 'testText' | """<category>$text</category>"""
+		object = new Category(domain, text)
+	}
+}