integration tests fixed, bumped jetty version

Author: Juraj Veverka

jetty-servlet4-http2/README.md

@@ -33,9 +33,26 @@ See also attached postman [file](docs/jetty-http2.postman_collection.json).
 ## TODO
 Http2 stream full-duplex communication is not fully implemented for MassageService.
 
-## Build and Run - Java 11
-Build from commandline: ```gradle clean installDist distZip```
-Run server: ```./build/install/jetty-servlet4-http2/bin/jetty-servlet4-http2```
+## Build and Run 
+Build from commandline: 
+```
+gradle clean build installDist distZip
+```
+
+Run server: 
+```
+./build/install/jetty-servlet4-http2/bin/jetty-servlet4-http2
+```
 
-### UnitTesting
-First start server manually, than start unit integration tests.
+### Run Integration Tests
+Integration tests in this demo are designed to run as http client against running server instance.
+It is expected that server runs on localhost, ports 8080 for http and 8443 for https.
+Follow this procedure to run integration tests:
+1. Start server manually in new terminal window.
+```
+./build/install/jetty-servlet4-http2/bin/jetty-servlet4-http2
+```
+2. Start unit integration tests in new terminal window.
+```
+gradle clean test -Dtest.profile=integration
+```

jetty-servlet4-http2/build.gradle

@@ -6,17 +6,29 @@ mainClassName = 'itx.examples.jetty.server.Main'
 
 applicationDefaultJvmArgs = ["-Xms64M", "-Xmx64M" ]
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 10
+targetCompatibility = 10
 
-def jettyVersion = '9.4.11.v20180605'
+def jettyVersion = '9.4.12.RC2'
 def jerseyVersion = '2.27'
 def slf4jVersion = '1.8.0-beta2'
 
 repositories {
    mavenCentral()
 }
 
+test {
+   useTestNG()
+   //testLogging.showStandardStreams = true
+   testLogging {
+      events "passed", "skipped", "failed"
+   }
+
+   if (System.properties['test.profile'] != 'integration') {
+      exclude '**/*ITTest*'
+   }
+}
+
 dependencies {
    compile "org.eclipse.jetty:jetty-server:${jettyVersion}"
    compile "org.eclipse.jetty:jetty-servlet:${jettyVersion}"

jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http11/EchoServiceTest.java renamed to jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http11/EchoServiceITTest.java

@@ -8,7 +8,7 @@
 
 import java.security.KeyStore;
 
-public class EchoServiceTest {
+public class EchoServiceITTest {
 
     @Test
     public void echoTestHttp() throws Exception {

jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http11/SystemInfoTest.java renamed to jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http11/SystemInfoITTest.java

@@ -9,7 +9,7 @@
 
 import java.security.KeyStore;
 
-public class SystemInfoTest {
+public class SystemInfoITTest {
 
     @Test
     public void getSystemInfoTestHttp() {

jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http20/EchoServiceTest.java renamed to jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http20/EchoServiceITTest.java

@@ -9,7 +9,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class EchoServiceTest {
+public class EchoServiceITTest {
 
     @Test
     public void echoTest() throws Exception {

jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http20/SystemInfoTest.java renamed to jetty-servlet4-http2/src/test/java/itx/examples/jetty/tests/http20/SystemInfoITTest.java

@@ -8,7 +8,7 @@
 
 import java.security.KeyStore;
 
-public class SystemInfoTest {
+public class SystemInfoITTest {
 
     @Test
     public void getSystemInfoTest() throws Exception {