From 34a8bd9c168eafe04e4e1cd2db9e016f734bd94b Mon Sep 17 00:00:00 2001 From: Ron Sigal Date: Thu, 18 Feb 2016 11:31:22 -0500 Subject: [PATCH] RESTEASY-1251: Fixed two tests that were broken by Response.getEntity() following Response.readEntity(). --- .../interceptors/PriorityExecutionTest.java | 1 + .../producers/TestDefaultNumberWriter.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/interceptors/PriorityExecutionTest.java b/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/interceptors/PriorityExecutionTest.java index 6fb6d0d6827..9e7443551c8 100644 --- a/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/interceptors/PriorityExecutionTest.java +++ b/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/interceptors/PriorityExecutionTest.java @@ -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()); diff --git a/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/producers/TestDefaultNumberWriter.java b/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/producers/TestDefaultNumberWriter.java index 27fe78c3a7c..745a4d2ff16 100644 --- a/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/producers/TestDefaultNumberWriter.java +++ b/jaxrs/resteasy-jaxrs-testsuite/src/test/java/org/jboss/resteasy/test/nextgen/producers/TestDefaultNumberWriter.java @@ -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; @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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());