From e3979bca1953f60a46ea343fc4ca872771e200f7 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 19 Feb 2011 13:47:04 +0100 Subject: [PATCH] close ClientResponse --- .../sonia/scm/it/AuthenticationITCase.java | 1 + .../test/java/sonia/scm/it/GroupITCase.java | 9 +++++--- .../java/sonia/scm/it/RepositoryITCase.java | 9 ++++++++ .../test/java/sonia/scm/it/UserITCase.java | 22 ++++++++++++------- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java index 88184ca868..38834f7e53 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java @@ -76,6 +76,7 @@ public class AuthenticationITCase extends AbstractITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 401); + response.close(); } /** diff --git a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java index e4a006294c..e80eeb78f5 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java @@ -120,6 +120,7 @@ public class GroupITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); + response.close(); Group other = getGroup("group-d"); @@ -149,6 +150,7 @@ public class GroupITCase extends AbstractAdminITCaseBase response.getEntity(new GenericType>() {} ); + response.close(); assertNotNull(groups); assertFalse(groups.isEmpty()); @@ -182,6 +184,7 @@ public class GroupITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 201); + response.close(); Group other = getGroup(group.getName()); @@ -207,13 +210,12 @@ public class GroupITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); - - + response.close(); wr = createResource(client, "groups/".concat(name)); response = wr.get(ClientResponse.class); - assertNotNull(response); assertTrue(response.getStatus() == 404); + response.close(); } //~--- get methods ---------------------------------------------------------- @@ -235,6 +237,7 @@ public class GroupITCase extends AbstractAdminITCaseBase Group group = response.getEntity(Group.class); + response.close(); assertNotNull(group); assertEquals(group.getName(), groupname); diff --git a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java index 9b9e46b6ca..4fd07ce73c 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java @@ -164,6 +164,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); + response.close(); Repository other = getRepositoryById(repository.getId()); @@ -195,6 +196,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase response.getEntity(new GenericType>() {} ); + response.close(); assertNotNull(repositories); assertFalse(repositories.isEmpty()); @@ -248,6 +250,9 @@ public class RepositoryITCase extends AbstractAdminITCaseBase assertTrue(response.getStatus() == 201); String url = response.getHeaders().get("Location").get(0); + + response.close(); + Repository other = getRepository(url); assertNotNull(other); @@ -272,10 +277,12 @@ public class RepositoryITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); + response.close(); wr = createResource(client, "repositories/".concat(id)); response = wr.get(ClientResponse.class); assertNotNull(response); assertTrue(response.getStatus() == 404); + response.close(); } //~--- get methods ---------------------------------------------------------- @@ -299,6 +306,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase Repository repository = response.getEntity(Repository.class); + response.close(); assertNotNull(repository); return repository; @@ -324,6 +332,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase Repository repository = response.getEntity(Repository.class); + response.close(); assertNotNull(repository); return repository; diff --git a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java index 3ba7df6648..eb7a8e2263 100644 --- a/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java +++ b/scm-webapp/src/test/java/sonia/scm/it/UserITCase.java @@ -104,6 +104,7 @@ public class UserITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); + response.close(); User other = getUser(marvin.getName()); @@ -134,15 +135,16 @@ public class UserITCase extends AbstractAdminITCaseBase public void getAll() { WebResource wr = createResource(client, "users"); - ClientResponse respone = wr.get(ClientResponse.class); + ClientResponse response = wr.get(ClientResponse.class); - assertNotNull(respone); - assertTrue(respone.getStatus() == 200); + assertNotNull(response); + assertTrue(response.getStatus() == 200); Collection users = - respone.getEntity(new GenericType>() {} + response.getEntity(new GenericType>() {} ); + response.close(); assertNotNull(users); assertFalse(users.isEmpty()); @@ -175,6 +177,7 @@ public class UserITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 201); + response.close(); User other = getUser(user.getName()); @@ -198,10 +201,12 @@ public class UserITCase extends AbstractAdminITCaseBase assertNotNull(response); assertTrue(response.getStatus() == 204); + response.close(); wr = createResource(client, "users/".concat(user.getName())); response = wr.get(ClientResponse.class); assertNotNull(response); assertTrue(response.getStatus() == 404); + response.close(); } /** @@ -230,13 +235,14 @@ public class UserITCase extends AbstractAdminITCaseBase private User getUser(String username) { WebResource wr = createResource(client, "users/".concat(username)); - ClientResponse respone = wr.get(ClientResponse.class); + ClientResponse response = wr.get(ClientResponse.class); - assertNotNull(respone); - assertTrue(respone.getStatus() == 200); + assertNotNull(response); + assertTrue(response.getStatus() == 200); - User user = respone.getEntity(User.class); + User user = response.getEntity(User.class); + response.close(); assertNotNull(user); return user;