Skip to content

Commit

Permalink
Merge pull request #742 from ronsigal/1251-revert
Browse files Browse the repository at this point in the history 
RESTEASY-1251: Backing out changes from RESTEASY-1251.
  • Loading branch information
@liweinan
liweinan committed Feb 19, 2016
2 parents 7572ba4 + 34a8bd9 commit 92c5017
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 115 deletions.
2 changes: 1 addition & 1 deletion ...esteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ else if (bufferedEntity == null)
{
try
{
releaseConnection();
close();
}
catch (Exception ignored)
{
Expand Down
113 changes: 0 additions & 113 deletions ...sy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/client/entity/TestGetEntity.java
View file

This file was deleted.

1 change: 1 addition & 0 deletions ...ite/src/test/java/org/jboss/resteasy/test/nextgen/interceptors/PriorityExecutionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ public void testPriority() throws Exception
client.register(ClientRequestFilterMax.class);

Response response = client.target(generateURL("/test")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("test", response.getEntity());
Expand Down
15 changes: 14 additions & 1 deletion ...uite/src/test/java/org/jboss/resteasy/test/nextgen/producers/TestDefaultNumberWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.jboss.resteasy.test.EmbeddedContainer;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

import junit.framework.Assert;
Expand Down Expand Up @@ -130,6 +129,7 @@ public void testByte() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Byte")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -141,6 +141,7 @@ public void testBytePrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/byte")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -152,6 +153,7 @@ public void testDouble() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Double")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123.4", response.getEntity());
Expand All @@ -163,6 +165,7 @@ public void testDoublePrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/double")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123.4", response.getEntity());
Expand All @@ -174,6 +177,7 @@ public void testFloat() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Float")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123.4", response.getEntity());
Expand All @@ -185,6 +189,7 @@ public void testFloatPrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/float")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123.4", response.getEntity());
Expand All @@ -196,6 +201,7 @@ public void testInteger() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Integer")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -207,6 +213,7 @@ public void testIntegerPrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/integer")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -218,6 +225,7 @@ public void testLong() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Long")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -229,6 +237,7 @@ public void testLongPrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/long")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -240,6 +249,7 @@ public void testShort() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/Short")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -251,6 +261,7 @@ public void testShortPrimitive() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/short")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -262,6 +273,7 @@ public void testBigDecimal() throws Exception
{
Client client = ClientBuilder.newClient();
Response response = client.target(generateURL("/test/bigDecimal")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand All @@ -274,6 +286,7 @@ public void testProviderGetsUsed() throws Exception
Client client = ClientBuilder.newClient();
client.register(MyDefaultNumberWriter.class);
Response response = client.target(generateURL("/test/bigDecimal")).request().get();
response.bufferEntity();
System.out.println(response.readEntity(String.class));
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals("123", response.getEntity());
Expand Down

0 comments on commit 92c5017

Please sign in to comment.