diff --git a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java index 71f16e9..7767f82 100644 --- a/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java +++ b/cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java @@ -2,9 +2,11 @@ import static org.jboss.shrinkwrap.api.ShrinkWrap.create; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import javax.inject.Inject; +import org.hamcrest.Matchers; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -13,13 +15,13 @@ import org.junit.runner.RunWith; /** - * + * * @author Arjan Tijms * */ @RunWith(Arquillian.class) public class DynamicBeanTest { - + @Deployment public static WebArchive deploy() { return create(WebArchive.class) @@ -35,6 +37,7 @@ public static WebArchive deploy() { @Test public void test() { + assertThat("myBean", myBean, Matchers.notNullValue()); assertEquals("Hi!", myBean.sayHi()); } } diff --git a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java index ae5511a..26b1b4a 100644 --- a/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java +++ b/jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java @@ -2,9 +2,11 @@ import static org.jboss.shrinkwrap.api.ShrinkWrap.create; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import javax.inject.Inject; +import org.hamcrest.Matchers; import org.javaee8.jpa.dynamic.tx.ApplicationInit; import org.javaee8.jpa.dynamic.tx.Employee; import org.javaee8.jpa.dynamic.tx.EmployeeService; @@ -41,11 +43,12 @@ public static WebArchive createDeployment() { public void testPersist() throws Exception { Employee employee = new Employee(); employee.setName("reza"); - + + assertThat("employeeService", employeeService, Matchers.notNullValue()); employeeService.persist(employee); - + Employee persistedEmployee = employeeService.getById(employee.getId()); - + assertEquals("reza", persistedEmployee.getName()); } diff --git a/pom.xml b/pom.xml index b5c5823..37a691b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ ${skipTests} ${skipTests} - - 5.182 - 5.182 - 4.1.1 - 9.0.10 + 5.183 + 5.183 + 5.0 + 9.0.12 @@ -44,19 +44,19 @@ false - - - - payara-milestones - Payara Milestones - https://raw.github.com/payara/Payara_PatchedProjects/master - - true - - - false - - + + + + payara-milestones + Payara Milestones + https://raw.github.com/payara/Payara_PatchedProjects/master + + true + + + false + + ossrh @@ -96,7 +96,7 @@ - test-utils @@ -111,33 +111,33 @@ json-p - - - - org.jboss.arquillian - arquillian-bom - 1.3.0.Final - import - pom - - - org.jboss.arquillian.container - arquillian-container-test-api - 1.3.0.Final - - - com.h2database - h2 - 1.4.196 - - - fish.payara.arquillian - payara-client-ee8 - 1.0.Beta3-m1 - test - - - + + + + org.jboss.arquillian + arquillian-bom + 1.4.1.Final + import + pom + + + org.jboss.arquillian.container + arquillian-container-test-api + 1.4.1.Final + + + com.h2database + h2 + 1.4.197 + + + fish.payara.arquillian + payara-client-ee8 + 1.0.Beta3 + test + + + @@ -348,20 +348,20 @@ true - - - fish.payara.arquillian - payara-client-ee8 - - - - - fish.payara.arquillian - arquillian-payara-server-4-managed - 1.0.Beta3-m1 - test - - + + + fish.payara.arquillian + payara-client-ee8 + + + + + fish.payara.arquillian + arquillian-payara-server-4-managed + 1.0.Beta3-m3 + test + + @@ -448,7 +448,7 @@ org.glassfish.jersey.core jersey-client - 2.25 + 2.27 test @@ -477,16 +477,16 @@ payara-remote - - fish.payara.arquillian - payara-client-ee8 - + + fish.payara.arquillian + payara-client-ee8 + fish.payara.arquillian arquillian-payara-server-4-remote - 1.0.Beta3-m1 + 1.0.Beta3-m3 test @@ -519,12 +519,12 @@ fish.payara.arquillian payara-client-ee8 - + fish.payara.arquillian - arquillian-payara-micro-5-managed - 1.0.Beta3-m2 + arquillian-payara-micro-5-managed + 1.0.Beta3-m4 test @@ -568,7 +568,7 @@ - + @@ -604,13 +604,13 @@ org.glassfish.jersey.core jersey-client - 2.4 + 2.7 test org.jboss.arquillian.container arquillian-glassfish-embedded-3.1 - 1.0.0.CR4 + 1.0.2 test @@ -652,7 +652,7 @@ org.glassfish.jersey.core jersey-client - 2.4 + 2.7 test @@ -670,7 +670,7 @@ org.jboss.arquillian.container arquillian-glassfish-remote-3.1 - 1.0.0.CR4 + 1.0.2 test @@ -717,7 +717,7 @@ org.jboss.arquillian.container arquillian-tomcat-remote-7 - 1.0.1.Final + 1.1.0.Final test @@ -777,7 +777,7 @@ org.jboss.arquillian.container arquillian-tomcat-managed-7 - 1.0.1.Final + 1.1.0.Final test diff --git a/servlet/http2/pom.xml b/servlet/http2/pom.xml index a7e1f85..c2a96b1 100644 --- a/servlet/http2/pom.xml +++ b/servlet/http2/pom.xml @@ -14,7 +14,7 @@ Java EE 8 Samples: Servlet - http2 - 9.4.8.v20171121 + 9.4.11.v20180605 diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java index b3577ec..a1bd551 100644 --- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java +++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/Http2Test.java @@ -1,20 +1,19 @@ package org.javaee8.servlet.http2; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; import java.io.File; -import java.net.URISyntaxException; +import java.net.URI; import java.net.URL; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; import org.glassfish.jersey.client.ClientConfig; +import org.hamcrest.Matchers; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; @@ -25,40 +24,25 @@ import org.junit.Test; import org.junit.runner.RunWith; + +/** + * Test for the HTTP/2 and the JAX-RS client + */ @RunWith(Arquillian.class) public class Http2Test { + @ArquillianResource + private URL basicUrl; private Client jaxrsClient; + @Deployment public static WebArchive createDeployment() { - return create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2") + final WebArchive war = create(WebArchive.class).addPackages(true, "org.javaee8.servlet.http2") .addAsWebResource(new File("src/main/webapp/images/payara-logo.jpg"), "images/payara-logo.jpg") .addAsWebInfResource(new File("src/main/webapp/WEB-INF/web.xml")); - } - - @Test - @RunAsClient - public void testHttp2ControlGroup() - throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException { - testUrl("https://http2.akamai.com/"); - } - - @Test - @RunAsClient - public void testServerHttp2(@ArquillianResource URL url) - throws InterruptedException, ExecutionException, TimeoutException, URISyntaxException { - Response response = testUrl(url.toURI().toString()); - assertEquals( - "Request wasn't over HTTP/2." - + " Either the wrong servlet was returned, or the server doesn't support HTTP/2.", - response.getHeaderString("protocol"), "HTTP/2"); - } - - private Response testUrl(String url) { - Response response = jaxrsClient.target(url).request().get(); - assertNotNull(response); - return response; + System.out.println("War file content: \n" + war.toString(true)); + return war; } @Before @@ -73,4 +57,37 @@ public void cleanUp() throws Exception { jaxrsClient.close(); } + + /** + * This test runs against the public website supporting HTTP/2 + * + * @throws Exception + */ + @Test(timeout = 10000L) + @RunAsClient + public void testHttp2ControlGroup() throws Exception { + Response response = testUri(new URI("https://http2.akamai.com/")); + assertThat("myproto header", response.getHeaderString("myproto"), Matchers.equalTo("h2")); + } + + /** + * This test runs against our private website supporting HTTP/2 + * + * @throws Exception + */ + @Test(timeout = 10000L) + @RunAsClient + public void testServerHttp2() throws Exception { + Response response = testUri(basicUrl.toURI()); + // the header 'protocol' is set in the Servlet class. + assertThat( + "Request wasn't over HTTP/2. Either the wrong servlet was returned, or the server doesn't support HTTP/2.", + response.getHeaderString("protocol"), Matchers.equalTo("HTTP/2")); + } + + private Response testUri(URI uri) { + Response response = jaxrsClient.target(uri).request().get(); + assertNotNull("response", response); + return response; + } } diff --git a/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java index d7e89b8..05858a2 100644 --- a/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java +++ b/servlet/http2/src/test/java/org/javaee8/servlet/http2/JettyConnector.java @@ -167,13 +167,11 @@ private Session createSession(String host, int port, boolean secure) { client.connect(new InetSocketAddress(host, port), new ServerSessionListener.Adapter(), sessionPromise); } - Session session = null; try { - session = sessionPromise.get(5, TimeUnit.SECONDS); + return sessionPromise.get(5, TimeUnit.SECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - e.printStackTrace(); + throw new IllegalStateException("Cloud not get a session.", e); } - return session; } -} \ No newline at end of file +}