Fixes for broken integrations test

Author: nickdos

build.gradle

@@ -67,26 +67,36 @@ dependencies {
     compile "org.grails:grails-core"
     compile "org.springframework.boot:spring-boot-starter-actuator"
     compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-dependencies"
-    compile 'org.grails:grails-logging'
     compile "org.grails:grails-web-boot"
+    compile "org.grails:grails-logging"
+    compile "org.grails:grails-plugin-rest"
+    compile "org.grails:grails-plugin-databinding"
+    compile "org.grails:grails-plugin-i18n"
+    compile "org.grails:grails-plugin-services"
+    compile "org.grails:grails-plugin-url-mappings"
+    compile "org.grails:grails-plugin-interceptors"
     compile "org.grails.plugins:cache"
+    compile "org.grails.plugins:async"
     compile "org.grails.plugins:scaffolding"
+    compile "org.grails.plugins:events"
     compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.1.3.Final"
-    compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
+    compile "org.hibernate:hibernate-core:5.1.16.Final"
+    compile "org.hibernate:hibernate-ehcache:5.1.16.Final"
+    compile "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
+    runtime "org.glassfish.web:el-impl:2.1.2-b03"
+    runtime "com.h2database:h2"
+    runtime "org.apache.tomcat:tomcat-jdbc"
+    runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.15.1"
+
     //compile "org.grails.plugins:grails-plugin-converters" // only needed for grails 3.3
-    testCompile "org.grails:grails-plugin-testing"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.grails:grails-test-mixins:3.3.0"
+    //testCompile "org.grails:grails-plugin-testing"
     testCompile "org.grails:grails-gorm-testing-support"
+    testCompile "org.grails.plugins:geb"
     testCompile "org.grails:grails-web-testing-support"
-    testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
-    testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
-    
+    testCompile "org.grails:grails-test-mixins:3.3.0"
+
     // Grails plugin dependencies
     runtime "org.grails.plugins:ala-bootstrap3:3.0.1", noCache
     compile "org.grails.plugins:ala-ws-security-plugin:2.0", noCache
@@ -113,17 +123,17 @@ dependencies {
     runtime 'org.hamcrest:hamcrest-core:1.3'
     runtime 'org.hamcrest:hamcrest-library:1.3'
     runtime 'xalan:xalan:2.7.2'
-    runtime 'org.apache.httpcomponents:httpcore:4.2.2'
-    runtime 'org.apache.httpcomponents:httpclient:4.2.2'
-    runtime 'org.apache.httpcomponents:httpcore:4.2.2'
-    runtime 'org.apache.httpcomponents:httpclient:4.2.2'
+    //runtime 'org.apache.httpcomponents:httpcore:4.2.2'
+    //runtime 'org.apache.httpcomponents:httpclient:4.2.2'
     compile 'com.jayway.jsonpath:json-path:0.5.6'
     compile 'com.jayway.jsonpath:json-path-assert:0.5.6'
 }
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
     addResources = true
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
 }
 
 

grails-app/services/au/org/ala/alerts/DiffService.groovy

@@ -21,8 +21,6 @@ class DiffService {
 
     static transactional = true
 
-    def serviceMethod() {}
-
     Boolean hasChangedJsonDiff(QueryResult queryResult) {
         if (queryResult.lastResult != null && queryResult.previousResult != null) {
             String last = decompressZipped(queryResult.lastResult)
@@ -123,7 +121,7 @@ class DiffService {
         records
     }
 
-    def String decompressZipped(byte[] zipped) {
+    String decompressZipped(byte[] zipped) {
         if (zipped) {
             GZIPInputStream input = new GZIPInputStream(new ByteArrayInputStream(zipped))
             StringBuffer sb = new StringBuffer()

src/integration-test/groovy/au/org/ala/alerts/DiffServiceSpec.groovy

@@ -14,7 +14,7 @@
 package au.org.ala.alerts
 
 import grails.test.mixin.integration.Integration
-import grails.transaction.*
+import grails.gorm.transactions.*
 import org.springframework.beans.factory.annotation.Autowired
 import spock.lang.*