Merge pull request #81 from hauner/groovy-3

Groovy 3

Author: hauner

.github/workflows/ci.yaml

@@ -19,4 +19,16 @@ jobs:
       with:
         java-version: 11.0.2
     - name: build
-      run: ./gradlew build
+      run: ./gradlew build --stacktrace
+    - name: archive artifacts
+      uses: actions/upload-artifact@v1
+      if: success()
+      with:
+        name: artifacts
+        path: build/libs
+    - name: archive test results
+      uses: actions/upload-artifact@v1
+      if: always()
+      with:
+        name: test results
+        path: build/reports

build.gradle

@@ -26,29 +26,37 @@ ext {
 repositories {
     mavenCentral()
     jcenter()
+    maven {
+        url "https://oss.sonatype.org/content/repositories/snapshots"
+    }
     maven {
         url  "https://dl.bintray.com/hauner/openapi-generatr"
     }
 }
 
+test {
+    useJUnitPlatform()
+}
+
 testSets {
     testInt
 }
 
 check.dependsOn testInt
 
 dependencies {
-    implementation 'org.codehaus.groovy:groovy:2.5.4'
+    implementation 'org.codehaus.groovy:groovy:3.0.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
     implementation 'io.swagger.parser.v3:swagger-parser:2.0.17'
     implementation 'com.google.googlejavaformat:google-java-format:1.7'
     compileOnly "com.github.hauner.openapi:openapi-generatr-api:$generatrApiVersion"
 
-    testImplementation 'net.bytebuddy:byte-buddy:1.9.13'
-    testImplementation ('org.spockframework:spock-core:1.3-groovy-2.5') {
-        // avoid conflicts with explicit groovy version
-        exclude group: 'org.codehaus.groovy'
+    testImplementation ('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
+        exclude group: 'org.codehaus.groovy' // avoid conflicts with explicit groovy version
     }
+    testImplementation 'org.spockframework:spock-junit4:2.0-M2-groovy-3.0'
+    testImplementation 'net.bytebuddy:byte-buddy:1.9.13'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 
     testIntImplementation "com.github.hauner.openapi:openapi-generatr-api:$generatrApiVersion"
     testIntImplementation 'io.github.java-diff-utils:java-diff-utils:4.5'

src/test/groovy/com/github/hauner/openapi/spring/converter/ApiConverterErrorSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original authors
+ * Copyright 2019-2020 the original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,28 @@
 
 package com.github.hauner.openapi.spring.converter
 
-import com.github.hauner.openapi.spring.model.Api
-import com.github.hauner.openapi.spring.support.Sl4jMockRule
-import org.junit.Rule
-import org.slf4j.Logger
+import ch.qos.logback.classic.Level
+import ch.qos.logback.classic.spi.ILoggingEvent
+import ch.qos.logback.core.read.ListAppender
 import spock.lang.Specification
+import spock.lang.Subject
 
 import static com.github.hauner.openapi.spring.support.OpenApiParser.parse
 
 class ApiConverterErrorSpec extends Specification {
 
-    def log = Mock Logger
-    @Rule Sl4jMockRule rule = new Sl4jMockRule(ApiConverter, log)
+    @Subject
+    def converter
+
+    def appender
+
+    void setup() {
+        converter = new ApiConverter ()
+
+        appender = new ListAppender<ILoggingEvent> ()
+        appender.start ()
+        converter.log.addAppender (appender)
+    }
 
     void "logs error when datatype conversion fails" () {
         def openApi = parse ("""\
@@ -48,12 +58,12 @@ paths:
                 type: unknown
 """)
         when:
-        log.isErrorEnabled () >> true
-        Api api = new ApiConverter ().convert (openApi)
+        converter.convert (openApi)
 
         then:
         notThrown (UnknownDataTypeException)
-        1 * log.error (*_)
+        appender.list.size () == 1
+        appender.list.first ().level == Level.ERROR
     }
 
 }

src/testInt/resources/logback-test.xml

@@ -0,0 +1 @@
+<configuration />