Fix startup test server

Author: Nickolay Savchenko

example-client/build.gradle

@@ -45,14 +45,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:28.0.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.6'
-    compile 'com.android.support:recyclerview-v7:28.0.0'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile project(':lib')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'org.java-websocket:Java-WebSocket:1.3.6'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation project(':lib')
 }

lib/build.gradle

@@ -9,6 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
     }
 }
 
@@ -19,6 +20,7 @@ repositories {
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'groovyx.android'
 
 group='com.github.NaikSoftware'
 
@@ -43,20 +45,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 
 dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
     // Supported transports
-    compileOnly 'org.java-websocket:Java-WebSocket:1.3.6'
-    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'org.java-websocket:Java-WebSocket:1.3.6'
+    api 'com.squareup.okhttp3:okhttp:3.10.0'
 
     implementation 'com.android.support:support-annotations:28.0.0'
 
+    testImplementation "com.andrewreitz:spock-android:2.0.0"
     testImplementation 'org.testcontainers:testcontainers:1.8.0'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
-    testImplementation 'org.spockframework:spock-spring:1.1-groovy-2.4'
+    testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
+    testImplementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 
 task sourcesJar(type: Jar) {

lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy

@@ -1,25 +1,37 @@
 package ua.naiksoftware.stomp
 
+import com.andrewreitz.spock.android.AndroidSpecification
+import groovy.util.logging.Slf4j
 import org.testcontainers.containers.BindMode
 import org.testcontainers.containers.GenericContainer
+import org.testcontainers.containers.output.OutputFrame
 import org.testcontainers.containers.wait.strategy.Wait
 import spock.lang.Shared
 import spock.lang.Specification
 
-class Configuration extends Specification implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+import java.util.function.Consumer
+
+class Configuration extends AndroidSpecification {
 
     @Shared
     static GenericContainer testServer = setupServer()
 
-    GenericContainer setupServer() {
+    static GenericContainer setupServer() {
 
-        new ProcessBuilder('./gradlew bootJar')
+        def projectRoot = new File('../')
+        new ProcessBuilder(['./gradlew', 'test-server:bootJar'])
+                .directory(projectRoot)
                 .start().waitForProcessOutput(System.out as Appendable, System.err as Appendable)
 
-        return new GenericContainer('openjdk:8-jre-alpine')
-                .withClasspathResourceMapping('./build/artifacts/test-server-1.0.jar', '/app.jar', BindMode.READ_ONLY)
+        def testServerPath = new File(projectRoot.getAbsoluteFile().getParentFile().getParent(),
+                'test-server/build/artifacts/test-server-1.0.jar').path
+        testServer = new GenericContainer('openjdk:8-jre-alpine')
+                .withFileSystemBind(testServerPath, '/app.jar', BindMode.READ_ONLY)
                 .withCommand('java -jar /app.jar')
-                .waitingFor(Wait.forHttp('/health'))
+                .withLogConsumer({ frame -> println frame.utf8String })
+//                .waitingFor(Wait.forHttp('/health'))
                 .withExposedPorts(80)
+        testServer.start()
+        return testServer
     }
 }

lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy

@@ -1,20 +1,40 @@
 package ua.naiksoftware.stomp
 
+import groovy.util.logging.Log4j
+import groovy.util.logging.Slf4j
+import io.reactivex.Flowable
+import io.reactivex.annotations.NonNull
+import io.reactivex.functions.Predicate
+import io.reactivex.subscribers.TestSubscriber
+import org.testcontainers.containers.GenericContainer
+import spock.lang.Shared
 import ua.naiksoftware.stomp.Configuration
 import ua.naiksoftware.stomp.Stomp
 
+import java.util.concurrent.TimeUnit
+
 class ConnectionTests extends Configuration {
 
-    def "connection must be recreated when reconnect"() {
+    def "connection must be opened"() {
         given:
-        def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP, 'localhost/websocket')
+        def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP,
+                'http://' + Configuration.testServer.getContainerIpAddress()
+                        + ':' + Configuration.testServer.getMappedPort(80) + '/websocket')
         client.connect()
+        def testSubscriber = new TestSubscriber<LifecycleEvent>()
 
         when:
-        client.disconnect()
+        client.lifecycle().subscribe(testSubscriber)
 
         then:
-        client.isConnected() == false
-        client.isConnecting() == false
+        testSubscriber.awaitCount(1).assertValue((Predicate) { event ->
+            if (event.exception) {
+                event.exception.printStackTrace()
+            }
+            assert event.type == LifecycleEvent.Type.OPENED
+        })
+
+//        cleanup:
+//        client.disconnect()
     }
 }

test-server/build.gradle

@@ -30,6 +30,7 @@ repositories {
 dependencies {
     compile 'org.springframework.boot:spring-boot-starter-websocket'
     compile 'org.springframework.boot:spring-boot-starter-web'
+    compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'org.codehaus.groovy:groovy-all:2.4.15'
 }
 
@@ -40,6 +41,6 @@ dependencyManagement {
 }
 
 bootJar {
-    destinationDir = new File("./build/artifacts")
+    destinationDir = project.file("build/artifacts")
 }
 

test-server/src/main/resources/application.properties

@@ -1,3 +1,5 @@
+server.port=80
+
 spring.jackson.deserialization.accept_empty_string_as_null_object=true
 spring.jackson.property-naming-strategy=CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES
 spring.jackson.serialization.write_char_arrays_as_json_arrays=true