From ca1054e794ab992e2eb3d4cad01b70fa151b1803 Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 10:56:52 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 135933 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) 135878 jkaabimofrad: APPSREPO-118: A few minor tweaks based on peer review. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/TestPeople.java | 12 ++++++------ .../rest/api/tests/client/AuthenticatedHttp.java | 2 +- .../rest/api/tests/client/PublicApiHttpClient.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPeople.java b/source/test-java/org/alfresco/rest/api/tests/TestPeople.java index 57717143cc..5d1a3b16f4 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestPeople.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestPeople.java @@ -1760,12 +1760,12 @@ public class TestPeople extends AbstractBaseApiTest assertEquals("A reset password email should have been sent.", 1, emailUtil.getSentCount()); MimeMessage msg = emailUtil.getLastEmail(); - assertNotNull(msg); + assertNotNull("There should be an email.", msg); assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length); // Check the recipient is the person who requested the reset password assertEquals(person.getEmail(), msg.getAllRecipients()[0].toString()); // There should be a subject - assertNotNull(msg.getSubject()); + assertNotNull("There should be a subject.", msg.getSubject()); // Check the reset password url. String resetPasswordUrl = (String) emailUtil.getLastEmailTemplateModelValue("reset_password_url"); @@ -1786,11 +1786,11 @@ public class TestPeople extends AbstractBaseApiTest post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordReset), 202); assertEquals("A reset password confirmation email should have been sent.", 1, emailUtil.getSentCount()); msg = emailUtil.getLastEmail(); - assertNotNull(msg); + assertNotNull("There should be an email.", msg); assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length); assertEquals(person.getEmail(), msg.getAllRecipients()[0].toString()); // There should be a subject - assertNotNull(msg.getSubject()); + assertNotNull("There should be a subject.", msg.getSubject()); // Try to login with old credential post("tickets", RestApiUtil.toJsonAsString(loginRequest), null, null, "authentication", 403); @@ -1804,7 +1804,7 @@ public class TestPeople extends AbstractBaseApiTest /* - * -ve tests + * Negative tests */ // First, reset the email helper emailUtil.reset(); @@ -1815,7 +1815,7 @@ public class TestPeople extends AbstractBaseApiTest post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordReset), 202); assertEquals("No email should have been sent.", 0, emailUtil.getSentCount()); - // Request reset password - Invalid user (user dose not exist) + // Request reset password - Invalid user (user does not exist) post(getRequestResetPasswordUrl(System.currentTimeMillis() + "noUser"), RestApiUtil.toJsonAsString(client), 202); assertEquals("No email should have been sent.", 0, emailUtil.getSentCount()); diff --git a/source/test-java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java b/source/test-java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java index ad2cfcc007..6e7122b573 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java @@ -133,7 +133,7 @@ public class AuthenticatedHttp extends AbstractHttp } } - public T executeHttpMethodUnAuthenticated(HttpMethod method, HttpRequestCallback callback) + public T executeHttpMethodUnauthenticated(HttpMethod method, HttpRequestCallback callback) { try { diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java index 0c420bbba4..6ebcd4b908 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java @@ -277,7 +277,7 @@ public class PublicApiHttpClient } else { - response = authenticatedHttp.executeHttpMethodUnAuthenticated(req, callback); + response = authenticatedHttp.executeHttpMethodUnauthenticated(req, callback); } return response; }