Skip to content

Issue 20 Updates, more stable tests #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 3, 2018
Merged

Issue 20 Updates, more stable tests #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7582ff2
Issue #20 Don't hide exceptions to the test, null is ugly
dmatej Jul 30, 2018
fb73414
Issue #20 Updated jetty
dmatej Jul 30, 2018
8acfbc6
Issue #20 Updated jersey-client to 2.7
dmatej Jul 30, 2018
ad609b5
Issue #20 Added asserts for injected beans
dmatej Jul 30, 2018
2bd3c87
Issue #20 More stable Http2Test, cleanup
dmatej Jul 30, 2018
2daa798
Issue #20 Updated dependencies to current
dmatej Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand All @@ -35,6 +37,7 @@ public static WebArchive deploy() {

@Test
public void test() {
assertThat("myBean", myBean, Matchers.notNullValue());
assertEquals("Hi!", myBean.sayHi());
}
}
9 changes: 6 additions & 3 deletions jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}

Expand Down
152 changes: 76 additions & 76 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<skipJSF>${skipTests}</skipJSF>
<skipJACC>${skipTests}</skipJACC>

<!-- Application Server versions (these are downloaded and installed
<!-- Application Server versions (these are downloaded and installed
in these versions by Maven for the CI profiles) -->
<payara.version>5.182</payara.version>
<payara.micro.version>5.182</payara.micro.version>
<glassfish.version>4.1.1</glassfish.version>
<tomcat.version>9.0.10</tomcat.version>
<payara.version>5.183</payara.version>
<payara.micro.version>5.183</payara.micro.version>
<glassfish.version>5.0</glassfish.version>
<tomcat.version>9.0.12</tomcat.version>
</properties>

<repositories>
Expand All @@ -44,19 +44,19 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>payara-milestones</id>
<name>Payara Milestones</name>
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repository>

<repository>
<id>payara-milestones</id>
<name>Payara Milestones</name>
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>ossrh</id>
Expand Down Expand Up @@ -96,7 +96,7 @@
</repositories>


<!-- The Java EE 8 specs that this project is providing samples for.
<!-- The Java EE 8 specs that this project is providing samples for.
Each spec is represented by one module. "test-utils" is a helper module. -->
<modules>
<module>test-utils</module>
Expand All @@ -111,33 +111,33 @@
<module>json-p</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.3.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
<version>1.3.0.Final</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.196</version>
</dependency>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
<version>1.0.Beta3-m1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.4.1.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
<version>1.4.1.Final</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.197</version>
</dependency>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
<version>1.0.Beta3</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>


<dependencies>
Expand Down Expand Up @@ -348,20 +348,20 @@
<activeByDefault>true</activeByDefault>
</activation>

<dependencies>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
</dependency>
<!-- The actual Arquillian connector -->
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>arquillian-payara-server-4-managed</artifactId>
<version>1.0.Beta3-m1</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
</dependency>

<!-- The actual Arquillian connector -->
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>arquillian-payara-server-4-managed</artifactId>
<version>1.0.Beta3-m3</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down Expand Up @@ -448,7 +448,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25</version>
<version>2.27</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -477,16 +477,16 @@
<id>payara-remote</id>

<dependencies>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
</dependency>
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
</dependency>

<!-- The actual Arquillian connector -->
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>arquillian-payara-server-4-remote</artifactId>
<version>1.0.Beta3-m1</version>
<version>1.0.Beta3-m3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -519,12 +519,12 @@
<groupId>fish.payara.arquillian</groupId>
<artifactId>payara-client-ee8</artifactId>
</dependency>

<!-- The Arquillian connector -->
<dependency>
<groupId>fish.payara.arquillian</groupId>
<artifactId>arquillian-payara-micro-5-managed</artifactId>
<version>1.0.Beta3-m2</version>
<artifactId>arquillian-payara-micro-5-managed</artifactId>
<version>1.0.Beta3-m4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -568,7 +568,7 @@
</plugins>
</build>
</profile>




Expand Down Expand Up @@ -604,13 +604,13 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.4</version>
<version>2.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
<version>1.0.0.CR4</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -652,7 +652,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.4</version>
<version>2.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -670,7 +670,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
<version>1.0.0.CR4</version>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -717,7 +717,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-remote-7</artifactId>
<version>1.0.1.Final</version>
<version>1.1.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -777,7 +777,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-managed-7</artifactId>
<version>1.0.1.Final</version>
<version>1.1.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion servlet/http2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Java EE 8 Samples: Servlet - http2</name>

<properties>
<jetty-version>9.4.8.v20171121</jetty-version>
<jetty-version>9.4.11.v20180605</jetty-version>
</properties>

<dependencies>
Expand Down
Loading