Skip to content

Commit adff40a

Browse files
arjantijmsarjantijms
authored
Merge pull request #32 from dmatej/issue-20-more-stable-test
Issue 20 Updates, more stable tests
2 parents 8f67b5a + 2daa798 commit adff40a

File tree

6 files changed

+137
-116
lines changed

6 files changed

+137
-116
lines changed

‎cdi/dynamic-bean/src/test/java/org/javaee8/cdi/dynamic/bean/DynamicBeanTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
44
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertThat;
56

67
import javax.inject.Inject;
78

9+
import org.hamcrest.Matchers;
810
import org.jboss.arquillian.container.test.api.Deployment;
911
import org.jboss.arquillian.junit.Arquillian;
1012
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -13,13 +15,13 @@
1315
import org.junit.runner.RunWith;
1416

1517
/**
16-
*
18+
*
1719
* @author Arjan Tijms
1820
*
1921
*/
2022
@RunWith(Arquillian.class)
2123
public class DynamicBeanTest {
22-
24+
2325
@Deployment
2426
public static WebArchive deploy() {
2527
return create(WebArchive.class)
@@ -35,6 +37,7 @@ public static WebArchive deploy() {
3537

3638
@Test
3739
public void test() {
40+
assertThat("myBean", myBean, Matchers.notNullValue());
3841
assertEquals("Hi!", myBean.sayHi());
3942
}
4043
}

‎jpa/dynamic-tx/src/test/java/org/javaee8/jpa/dynamic/tx/DynamicTXTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
44
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertThat;
56

67
import javax.inject.Inject;
78

9+
import org.hamcrest.Matchers;
810
import org.javaee8.jpa.dynamic.tx.ApplicationInit;
911
import org.javaee8.jpa.dynamic.tx.Employee;
1012
import org.javaee8.jpa.dynamic.tx.EmployeeService;
@@ -41,11 +43,12 @@ public static WebArchive createDeployment() {
4143
public void testPersist() throws Exception {
4244
Employee employee = new Employee();
4345
employee.setName("reza");
44-
46+
47+
assertThat("employeeService", employeeService, Matchers.notNullValue());
4548
employeeService.persist(employee);
46-
49+
4750
Employee persistedEmployee = employeeService.getById(employee.getId());
48-
51+
4952
assertEquals("reza", persistedEmployee.getName());
5053
}
5154

‎pom.xml

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<skipJSF>${skipTests}</skipJSF>
2424
<skipJACC>${skipTests}</skipJACC>
2525

26-
<!-- Application Server versions (these are downloaded and installed
26+
<!-- Application Server versions (these are downloaded and installed
2727
in these versions by Maven for the CI profiles) -->
28-
<payara.version>5.182</payara.version>
29-
<payara.micro.version>5.182</payara.micro.version>
30-
<glassfish.version>4.1.1</glassfish.version>
31-
<tomcat.version>9.0.10</tomcat.version>
28+
<payara.version>5.183</payara.version>
29+
<payara.micro.version>5.183</payara.micro.version>
30+
<glassfish.version>5.0</glassfish.version>
31+
<tomcat.version>9.0.12</tomcat.version>
3232
</properties>
3333

3434
<repositories>
@@ -44,19 +44,19 @@
4444
<snapshots>
4545
<enabled>false</enabled>
4646
</snapshots>
47-
</repository>
48-
49-
<repository>
50-
<id>payara-milestones</id>
51-
<name>Payara Milestones</name>
52-
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
53-
<releases>
54-
<enabled>true</enabled>
55-
</releases>
56-
<snapshots>
57-
<enabled>false</enabled>
58-
</snapshots>
59-
</repository>
47+
</repository>
48+
49+
<repository>
50+
<id>payara-milestones</id>
51+
<name>Payara Milestones</name>
52+
<url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
53+
<releases>
54+
<enabled>true</enabled>
55+
</releases>
56+
<snapshots>
57+
<enabled>false</enabled>
58+
</snapshots>
59+
</repository>
6060

6161
<repository>
6262
<id>ossrh</id>
@@ -96,7 +96,7 @@
9696
</repositories>
9797

9898

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

114-
<dependencyManagement>
115-
<dependencies>
116-
<dependency>
117-
<groupId>org.jboss.arquillian</groupId>
118-
<artifactId>arquillian-bom</artifactId>
119-
<version>1.3.0.Final</version>
120-
<scope>import</scope>
121-
<type>pom</type>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.jboss.arquillian.container</groupId>
125-
<artifactId>arquillian-container-test-api</artifactId>
126-
<version>1.3.0.Final</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>com.h2database</groupId>
130-
<artifactId>h2</artifactId>
131-
<version>1.4.196</version>
132-
</dependency>
133-
<dependency>
134-
<groupId>fish.payara.arquillian</groupId>
135-
<artifactId>payara-client-ee8</artifactId>
136-
<version>1.0.Beta3-m1</version>
137-
<scope>test</scope>
138-
</dependency>
139-
</dependencies>
140-
</dependencyManagement>
114+
<dependencyManagement>
115+
<dependencies>
116+
<dependency>
117+
<groupId>org.jboss.arquillian</groupId>
118+
<artifactId>arquillian-bom</artifactId>
119+
<version>1.4.1.Final</version>
120+
<scope>import</scope>
121+
<type>pom</type>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.jboss.arquillian.container</groupId>
125+
<artifactId>arquillian-container-test-api</artifactId>
126+
<version>1.4.1.Final</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>com.h2database</groupId>
130+
<artifactId>h2</artifactId>
131+
<version>1.4.197</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>fish.payara.arquillian</groupId>
135+
<artifactId>payara-client-ee8</artifactId>
136+
<version>1.0.Beta3</version>
137+
<scope>test</scope>
138+
</dependency>
139+
</dependencies>
140+
</dependencyManagement>
141141

142142

143143
<dependencies>
@@ -348,20 +348,20 @@
348348
<activeByDefault>true</activeByDefault>
349349
</activation>
350350

351-
<dependencies>
352-
<dependency>
353-
<groupId>fish.payara.arquillian</groupId>
354-
<artifactId>payara-client-ee8</artifactId>
355-
</dependency>
356-
357-
<!-- The actual Arquillian connector -->
358-
<dependency>
359-
<groupId>fish.payara.arquillian</groupId>
360-
<artifactId>arquillian-payara-server-4-managed</artifactId>
361-
<version>1.0.Beta3-m1</version>
362-
<scope>test</scope>
363-
</dependency>
364-
</dependencies>
351+
<dependencies>
352+
<dependency>
353+
<groupId>fish.payara.arquillian</groupId>
354+
<artifactId>payara-client-ee8</artifactId>
355+
</dependency>
356+
357+
<!-- The actual Arquillian connector -->
358+
<dependency>
359+
<groupId>fish.payara.arquillian</groupId>
360+
<artifactId>arquillian-payara-server-4-managed</artifactId>
361+
<version>1.0.Beta3-m3</version>
362+
<scope>test</scope>
363+
</dependency>
364+
</dependencies>
365365

366366
<build>
367367
<plugins>
@@ -448,7 +448,7 @@
448448
<dependency>
449449
<groupId>org.glassfish.jersey.core</groupId>
450450
<artifactId>jersey-client</artifactId>
451-
<version>2.25</version>
451+
<version>2.27</version>
452452
<scope>test</scope>
453453
</dependency>
454454

@@ -477,16 +477,16 @@
477477
<id>payara-remote</id>
478478

479479
<dependencies>
480-
<dependency>
481-
<groupId>fish.payara.arquillian</groupId>
482-
<artifactId>payara-client-ee8</artifactId>
483-
</dependency>
480+
<dependency>
481+
<groupId>fish.payara.arquillian</groupId>
482+
<artifactId>payara-client-ee8</artifactId>
483+
</dependency>
484484

485485
<!-- The actual Arquillian connector -->
486486
<dependency>
487487
<groupId>fish.payara.arquillian</groupId>
488488
<artifactId>arquillian-payara-server-4-remote</artifactId>
489-
<version>1.0.Beta3-m1</version>
489+
<version>1.0.Beta3-m3</version>
490490
<scope>test</scope>
491491
</dependency>
492492
</dependencies>
@@ -519,12 +519,12 @@
519519
<groupId>fish.payara.arquillian</groupId>
520520
<artifactId>payara-client-ee8</artifactId>
521521
</dependency>
522-
522+
523523
<!-- The Arquillian connector -->
524524
<dependency>
525525
<groupId>fish.payara.arquillian</groupId>
526-
<artifactId>arquillian-payara-micro-5-managed</artifactId>
527-
<version>1.0.Beta3-m2</version>
526+
<artifactId>arquillian-payara-micro-5-managed</artifactId>
527+
<version>1.0.Beta3-m4</version>
528528
<scope>test</scope>
529529
</dependency>
530530
</dependencies>
@@ -568,7 +568,7 @@
568568
</plugins>
569569
</build>
570570
</profile>
571-
571+
572572

573573

574574

@@ -604,13 +604,13 @@
604604
<dependency>
605605
<groupId>org.glassfish.jersey.core</groupId>
606606
<artifactId>jersey-client</artifactId>
607-
<version>2.4</version>
607+
<version>2.7</version>
608608
<scope>test</scope>
609609
</dependency>
610610
<dependency>
611611
<groupId>org.jboss.arquillian.container</groupId>
612612
<artifactId>arquillian-glassfish-embedded-3.1</artifactId>
613-
<version>1.0.0.CR4</version>
613+
<version>1.0.2</version>
614614
<scope>test</scope>
615615
</dependency>
616616
</dependencies>
@@ -652,7 +652,7 @@
652652
<dependency>
653653
<groupId>org.glassfish.jersey.core</groupId>
654654
<artifactId>jersey-client</artifactId>
655-
<version>2.4</version>
655+
<version>2.7</version>
656656
<scope>test</scope>
657657
</dependency>
658658
<dependency>
@@ -670,7 +670,7 @@
670670
<dependency>
671671
<groupId>org.jboss.arquillian.container</groupId>
672672
<artifactId>arquillian-glassfish-remote-3.1</artifactId>
673-
<version>1.0.0.CR4</version>
673+
<version>1.0.2</version>
674674
<scope>test</scope>
675675
</dependency>
676676
</dependencies>
@@ -717,7 +717,7 @@
717717
<dependency>
718718
<groupId>org.jboss.arquillian.container</groupId>
719719
<artifactId>arquillian-tomcat-remote-7</artifactId>
720-
<version>1.0.1.Final</version>
720+
<version>1.1.0.Final</version>
721721
<scope>test</scope>
722722
</dependency>
723723
</dependencies>
@@ -777,7 +777,7 @@
777777
<dependency>
778778
<groupId>org.jboss.arquillian.container</groupId>
779779
<artifactId>arquillian-tomcat-managed-7</artifactId>
780-
<version>1.0.1.Final</version>
780+
<version>1.1.0.Final</version>
781781
<scope>test</scope>
782782
</dependency>
783783
</dependencies>

‎servlet/http2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<name>Java EE 8 Samples: Servlet - http2</name>
1515

1616
<properties>
17-
<jetty-version>9.4.8.v20171121</jetty-version>
17+
<jetty-version>9.4.11.v20180605</jetty-version>
1818
</properties>
1919

2020
<dependencies>

0 commit comments

Comments
 (0)