Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-16 18:26:16 +01:00
Code Issues Packages Projects Releases Activity

improve error messages of unit tests

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-02-01 16:20:43 +01:00
parent 7834e57c29
commit c608187eab
11 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/test/java/sonia/scm/it/AbstractPermissionITCaseBase.java
View File

@@ -119,7 +119,7 @@ public abstract class AbstractPermissionITCaseBase<T>
ClientResponse response = wr.post(ClientResponse.class, trillian); ClientResponse response = wr.post(ClientResponse.class, trillian);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
response.close(); response.close();
logoutClient(client); logoutClient(client);
client.destroy(); client.destroy();
@@ -311,11 +311,11 @@ public abstract class AbstractPermissionITCaseBase<T>
if (credentials.isAnonymous()) if (credentials.isAnonymous())
{ {
assertTrue(response.getStatus() == 401); assertEquals(response.getStatus(), 401);
} }
else else
{ {
assertTrue(response.getStatus() == 403); assertEquals(response.getStatus(), 403);
} }
response.close(); response.close();

4
scm-webapp/src/test/java/sonia/scm/it/AdminPermissionITCase.java
View File

@@ -286,11 +286,11 @@ public class AdminPermissionITCase
if (credentials.isAnonymous()) if (credentials.isAnonymous())
{ {
assertTrue(response.getStatus() == 401); assertEquals(response.getStatus(), 401);
} }
else else
{ {
assertTrue(response.getStatus() == 403); assertEquals(response.getStatus(), 403);
} }
// fix jersey-client bug // fix jersey-client bug

2
scm-webapp/src/test/java/sonia/scm/it/AuthenticationITCase.java
View File

@@ -77,7 +77,7 @@ public class AuthenticationITCase
ClientResponse response = authenticate(client, "dent", "trillian"); ClientResponse response = authenticate(client, "dent", "trillian");
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 401); assertEquals(response.getStatus(), 401);
response.close(); response.close();
} }

24
scm-webapp/src/test/java/sonia/scm/it/ChangesetViewerITCase.java
View File

@@ -53,6 +53,8 @@ import sonia.scm.repository.client.RepositoryClientException;
import sonia.scm.repository.client.RepositoryClientFactory; import sonia.scm.repository.client.RepositoryClientFactory;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static sonia.scm.it.IntegrationTestUtil.*; import static sonia.scm.it.IntegrationTestUtil.*;
@@ -216,11 +218,11 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
if ("svn".equals(repositoryType)) if ("svn".equals(repositoryType))
{ {
assertTrue(cpr.getTotal() == (count + 1)); assertEquals(cpr.getTotal(), (count + 1));
} }
else else
{ {
assertTrue(cpr.getTotal() == count); assertEquals(cpr.getTotal(), count);
} }
List<Changeset> changesets = cpr.getChangesets(); List<Changeset> changesets = cpr.getChangesets();
@@ -229,11 +231,11 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
if ("svn".equals(repositoryType)) if ("svn".equals(repositoryType))
{ {
assertTrue(changesets.size() == (count + 1)); assertEquals(changesets.size(), (count + 1));
} }
else else
{ {
assertTrue(changesets.size() == count); assertEquals(changesets.size(), count);
} }
Changeset c = changesets.get(0); Changeset c = changesets.get(0);
@@ -250,9 +252,17 @@ public class ChangesetViewerITCase extends AbstractAdminITCaseBase
assertNotNull(added); assertNotNull(added);
assertFalse(added.isEmpty()); assertFalse(added.isEmpty());
assertTrue(added.size() == 1); assertEquals(added.size(), 1);
assertTrue(name.concat(".txt").equals(added.get(0))
|| "/".concat(name).concat(".txt").equals(added.get(0))); //J-
assertThat(
added.get(0),
anyOf(
equalTo(name.concat(".txt")),
equalTo("/".concat(name).concat(".txt"))
)
);
//J+
} }
/** /**

8
scm-webapp/src/test/java/sonia/scm/it/GroupITCase.java
View File

@@ -138,7 +138,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.put(ClientResponse.class, group); ClientResponse response = wr.put(ClientResponse.class, group);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
Group other = getGroup("group-d"); Group other = getGroup("group-d");
@@ -202,7 +202,7 @@ public class GroupITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.post(ClientResponse.class, group); ClientResponse response = wr.post(ClientResponse.class, group);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
response.close(); response.close();
Group other = getGroup(group.getName()); Group other = getGroup(group.getName());
@@ -228,12 +228,12 @@ public class GroupITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.delete(ClientResponse.class); ClientResponse response = wr.delete(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
wr = createResource(client, "groups/".concat(name)); wr = createResource(client, "groups/".concat(name));
response = wr.get(ClientResponse.class); response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 404); assertEquals(response.getStatus(), 404);
response.close(); response.close();
} }

2
scm-webapp/src/test/java/sonia/scm/it/GroupPermissionITCase.java
View File

@@ -103,7 +103,7 @@ public class GroupPermissionITCase extends AbstractPermissionITCaseBase<Group>
ClientResponse response = wr.post(ClientResponse.class, testGroup); ClientResponse response = wr.post(ClientResponse.class, testGroup);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
response.close(); response.close();
logoutClient(client); logoutClient(client);
client.destroy(); client.destroy();

2
scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
View File

@@ -254,7 +254,7 @@ public class IntegrationTestUtil
ClientResponse response = wr.get(ClientResponse.class); ClientResponse response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
response.close(); response.close();
client.destroy(); client.destroy();
} }

4
scm-webapp/src/test/java/sonia/scm/it/RepositoryITCase.java
View File

@@ -195,7 +195,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.put(ClientResponse.class, repository); ClientResponse response = wr.put(ClientResponse.class, repository);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
Repository other = getRepositoryById(client, repository.getId()); Repository other = getRepositoryById(client, repository.getId());
@@ -222,7 +222,7 @@ public class RepositoryITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.get(ClientResponse.class); ClientResponse response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
Collection<Repository> repositories = Collection<Repository> repositories =
response.getEntity(new GenericType<Collection<Repository>>() {} response.getEntity(new GenericType<Collection<Repository>>() {}

6
scm-webapp/src/test/java/sonia/scm/it/RepositoryITUtil.java
View File

@@ -88,7 +88,7 @@ public class RepositoryITUtil
ClientResponse response = wr.post(ClientResponse.class, repository); ClientResponse response = wr.post(ClientResponse.class, repository);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
String url = response.getHeaders().get("Location").get(0); String url = response.getHeaders().get("Location").get(0);
@@ -119,12 +119,12 @@ public class RepositoryITUtil
ClientResponse response = wr.delete(ClientResponse.class); ClientResponse response = wr.delete(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
wr = createResource(client, "repositories/".concat(id)); wr = createResource(client, "repositories/".concat(id));
response = wr.get(ClientResponse.class); response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 404); assertEquals(response.getStatus(), 404);
response.close(); response.close();
} }

8
scm-webapp/src/test/java/sonia/scm/it/RepositorySimplePermissionITCase.java
View File

@@ -103,7 +103,7 @@ public class RepositorySimplePermissionITCase
ClientResponse response = wr.post(ClientResponse.class, repository); ClientResponse response = wr.post(ClientResponse.class, repository);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
String repositoryUrl = response.getHeaders().getFirst("Location"); String repositoryUrl = response.getHeaders().getFirst("Location");
@@ -112,7 +112,7 @@ public class RepositorySimplePermissionITCase
wr = client.resource(repositoryUrl); wr = client.resource(repositoryUrl);
response = wr.get(ClientResponse.class); response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
repository = response.getEntity(Repository.class); repository = response.getEntity(Repository.class);
assertNotNull(repository); assertNotNull(repository);
REPOSITORY_UUID = repository.getId(); REPOSITORY_UUID = repository.getId();
@@ -148,7 +148,7 @@ public class RepositorySimplePermissionITCase
if (!credentials.isAnonymous()) if (!credentials.isAnonymous())
{ {
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
Collection<Repository> repositories = Collection<Repository> repositories =
response.getEntity(new GenericType<Collection<Repository>>() {} response.getEntity(new GenericType<Collection<Repository>>() {}
@@ -172,7 +172,7 @@ public class RepositorySimplePermissionITCase
if (!credentials.isAnonymous()) if (!credentials.isAnonymous())
{ {
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 403); assertEquals(response.getStatus(), 403);
response.close(); response.close();
} }
} }

12
scm-webapp/src/test/java/sonia/scm/it/UserITCase.java
View File

@@ -123,7 +123,7 @@ public class UserITCase extends AbstractAdminITCaseBase
wr.type(MediaType.APPLICATION_XML).put(ClientResponse.class, marvin); wr.type(MediaType.APPLICATION_XML).put(ClientResponse.class, marvin);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
User other = getUser(marvin.getName()); User other = getUser(marvin.getName());
@@ -158,7 +158,7 @@ public class UserITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.get(ClientResponse.class); ClientResponse response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
Collection<User> users = Collection<User> users =
response.getEntity(new GenericType<Collection<User>>() {} response.getEntity(new GenericType<Collection<User>>() {}
@@ -223,7 +223,7 @@ public class UserITCase extends AbstractAdminITCaseBase
wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, user); wr.type(MediaType.APPLICATION_XML).post(ClientResponse.class, user);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 201); assertEquals(response.getStatus(), 201);
response.close(); response.close();
User other = getUser(user.getName()); User other = getUser(user.getName());
@@ -247,12 +247,12 @@ public class UserITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.delete(ClientResponse.class); ClientResponse response = wr.delete(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 204); assertEquals(response.getStatus(), 204);
response.close(); response.close();
wr = createResource(client, "users/".concat(user.getName())); wr = createResource(client, "users/".concat(user.getName()));
response = wr.get(ClientResponse.class); response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 404); assertEquals(response.getStatus(), 404);
response.close(); response.close();
} }
@@ -285,7 +285,7 @@ public class UserITCase extends AbstractAdminITCaseBase
ClientResponse response = wr.get(ClientResponse.class); ClientResponse response = wr.get(ClientResponse.class);
assertNotNull(response); assertNotNull(response);
assertTrue(response.getStatus() == 200); assertEquals(response.getStatus(), 200);
User user = response.getEntity(User.class); User user = response.getEntity(User.class);