Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit eb092a6

Browse files
committed
Splitting e2e module.
Change-Id: I910ba86130cf8954c540ed5002850ce6532e243c
1 parent c4ba2da commit eb092a6

File tree

738 files changed

+1112
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

738 files changed

+1112
-355
lines changed

etc/config/copyright-exclude

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ build.readme
5959
/tests/e2e/server/mvc/MvcEncodingTest/FreemarkerResource.ftl
6060
/tests/e2e/server/mvc/MvcEncodingTest/MustacheResource.mustache
6161
/test/resources/org/glassfish/jersey/server/config/jaxrs-components
62-
/tests/e2e/src/test/resources/org/glassfish/jersey/tests/e2e/entity/xxe.txt
62+
/tests/e2e-entity/src/test/resources/org/glassfish/jersey/tests/e2e/entity/xxe.txt
6363
/core-server/src/main/java/com/sun/research/ws/wadl
6464
/core-common/src/main/java/org/glassfish/jersey/internal/jsr166
6565
/tests/performance/etc/data/MEASUREMENT_DATA

tests/e2e-client/pom.xml

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
http://glassfish.java.net/public/CDDL+GPL_1_1.html
14+
or packager/legal/LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at packager/legal/LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
42+
-->
43+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44+
<modelVersion>4.0.0</modelVersion>
45+
46+
<parent>
47+
<groupId>org.glassfish.jersey.tests</groupId>
48+
<artifactId>project</artifactId>
49+
<version>2.26-SNAPSHOT</version>
50+
</parent>
51+
52+
<artifactId>e2e-client</artifactId>
53+
<packaging>jar</packaging>
54+
<name>jersey-tests-e2e</name>
55+
56+
<description>Jersey E2E Client tests</description>
57+
58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-surefire-plugin</artifactId>
63+
<configuration>
64+
<forkCount>1</forkCount>
65+
<reuseForks>false</reuseForks>
66+
<enableAssertions>false</enableAssertions>
67+
</configuration>
68+
</plugin>
69+
</plugins>
70+
</build>
71+
72+
<dependencies>
73+
<dependency>
74+
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
75+
<artifactId>jersey-test-framework-provider-bundle</artifactId>
76+
<type>pom</type>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>javax.annotation</groupId>
81+
<artifactId>javax.annotation-api</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.glassfish.jersey.ext</groupId>
86+
<artifactId>jersey-mvc</artifactId>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.glassfish.jersey.ext</groupId>
91+
<artifactId>jersey-mvc-freemarker</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.glassfish.jersey.ext</groupId>
96+
<artifactId>jersey-mvc-mustache</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.glassfish.jersey.media</groupId>
101+
<artifactId>jersey-media-json-jackson</artifactId>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.glassfish.jersey.media</groupId>
106+
<artifactId>jersey-media-json-jackson1</artifactId>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.glassfish.jersey.media</groupId>
111+
<artifactId>jersey-media-json-jettison</artifactId>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.glassfish.jersey.media</groupId>
116+
<artifactId>jersey-media-moxy</artifactId>
117+
<scope>test</scope>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.glassfish.jersey.media</groupId>
121+
<artifactId>jersey-media-json-processing</artifactId>
122+
<scope>test</scope>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.glassfish.jersey.ext</groupId>
126+
<artifactId>jersey-bean-validation</artifactId>
127+
<scope>test</scope>
128+
</dependency>
129+
<dependency>
130+
<groupId>org.glassfish.jersey.ext</groupId>
131+
<artifactId>jersey-entity-filtering</artifactId>
132+
<scope>test</scope>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.glassfish.jersey.ext</groupId>
136+
<artifactId>jersey-mvc-bean-validation</artifactId>
137+
<scope>test</scope>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.glassfish.jersey.media</groupId>
141+
<artifactId>jersey-media-sse</artifactId>
142+
<scope>test</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.glassfish.jersey.media</groupId>
146+
<artifactId>jersey-media-multipart</artifactId>
147+
<scope>test</scope>
148+
</dependency>
149+
<dependency>
150+
<groupId>org.glassfish.jersey.connectors</groupId>
151+
<artifactId>jersey-apache-connector</artifactId>
152+
<scope>test</scope>
153+
</dependency>
154+
<dependency>
155+
<groupId>org.glassfish.jersey.connectors</groupId>
156+
<artifactId>jersey-grizzly-connector</artifactId>
157+
<scope>test</scope>
158+
</dependency>
159+
<dependency>
160+
<groupId>org.glassfish.jersey.connectors</groupId>
161+
<artifactId>jersey-jetty-connector</artifactId>
162+
<scope>test</scope>
163+
</dependency>
164+
<dependency>
165+
<groupId>org.glassfish.jersey.security</groupId>
166+
<artifactId>oauth1-signature</artifactId>
167+
<version>${project.version}</version>
168+
<scope>test</scope>
169+
</dependency>
170+
<dependency>
171+
<groupId>org.glassfish.jersey.security</groupId>
172+
<artifactId>oauth1-client</artifactId>
173+
<version>${project.version}</version>
174+
<scope>test</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.glassfish.jersey.security</groupId>
178+
<artifactId>oauth1-server</artifactId>
179+
<version>${project.version}</version>
180+
<scope>test</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.glassfish.jersey.security</groupId>
184+
<artifactId>oauth2-client</artifactId>
185+
<version>${project.version}</version>
186+
<scope>test</scope>
187+
</dependency>
188+
189+
<dependency>
190+
<groupId>com.google.guava</groupId>
191+
<artifactId>guava</artifactId>
192+
<version>${guava.version}</version>
193+
<scope>test</scope>
194+
</dependency>
195+
196+
<dependency>
197+
<groupId>org.glassfish.jersey.test-framework</groupId>
198+
<artifactId>jersey-test-framework-util</artifactId>
199+
<scope>test</scope>
200+
</dependency>
201+
202+
<dependency>
203+
<groupId>org.hamcrest</groupId>
204+
<artifactId>hamcrest-library</artifactId>
205+
<scope>test</scope>
206+
</dependency>
207+
208+
<dependency>
209+
<groupId>xmlunit</groupId>
210+
<artifactId>xmlunit</artifactId>
211+
<scope>test</scope>
212+
</dependency>
213+
</dependencies>
214+
215+
<profiles>
216+
<profile>
217+
<id>xdk</id>
218+
<properties>
219+
<!-- do not use security manager for xdk -->
220+
<surefire.security.argline />
221+
</properties>
222+
</profile>
223+
<profile>
224+
<id>sonar</id>
225+
<build>
226+
<pluginManagement>
227+
<plugins>
228+
<plugin>
229+
<groupId>org.apache.maven.plugins</groupId>
230+
<artifactId>maven-surefire-plugin</artifactId>
231+
<configuration>
232+
<!-- disable JaCoCo listener because it's not working with <forkMode>always</fork> (<reuseForks>false</reuseForks> respectively)
233+
https://jira.sonarsource.com/browse/SONARJAVA-728 (https://github.com/SonarSource/sonar-java/pull/324) -->
234+
<properties combine.self="override" />
235+
</configuration>
236+
</plugin>
237+
</plugins>
238+
</pluginManagement>
239+
</build>
240+
</profile>
241+
242+
</profiles>
243+
244+
</project>

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/AbortResponseClientTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/AbortResponseClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/BufferingTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BufferingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/CancelFutureClientTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/CancelFutureClientTest.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -40,25 +40,23 @@
4040

4141
package org.glassfish.jersey.tests.e2e.client;
4242

43-
import org.glassfish.jersey.server.ResourceConfig;
44-
import org.glassfish.jersey.test.JerseyTest;
45-
import org.junit.Test;
43+
import java.util.concurrent.CancellationException;
44+
import java.util.concurrent.CountDownLatch;
45+
import java.util.concurrent.Future;
46+
import java.util.concurrent.TimeUnit;
47+
import java.util.concurrent.TimeoutException;
4648

4749
import javax.ws.rs.GET;
4850
import javax.ws.rs.Path;
4951
import javax.ws.rs.client.InvocationCallback;
5052
import javax.ws.rs.core.Application;
5153
import javax.ws.rs.core.Response;
52-
import java.util.concurrent.CancellationException;
53-
import java.util.concurrent.CountDownLatch;
54-
import java.util.concurrent.Future;
55-
import java.util.concurrent.TimeUnit;
56-
import java.util.concurrent.TimeoutException;
57-
import java.util.concurrent.locks.Condition;
58-
import java.util.concurrent.locks.ReentrantLock;
5954

55+
import org.glassfish.jersey.server.ResourceConfig;
56+
import org.glassfish.jersey.test.JerseyTest;
57+
58+
import org.junit.Test;
6059
import static org.junit.Assert.assertEquals;
61-
import static org.junit.Assert.assertTrue;
6260
import static org.junit.Assert.fail;
6361

6462
/**

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ChunkedInputStreamClosedPrematurelyTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ChunkedInputStreamClosedPrematurelyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientBufferingDisabledTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientBufferingDisabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientDestroyTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientDestroyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientEntityAnnotationTest.java renamed to tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientEntityAnnotationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development

0 commit comments

Comments
 (0)