From fac5036b29f755b4411e3306a4601314a105d49f Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 9 Nov 2017 16:26:32 +0000 Subject: [PATCH] Refactor emptying trashcan test API. --- .../java/org/alfresco/rest/v0/UserTrashcanAPI.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/UserTrashcanAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/UserTrashcanAPI.java index 7179ea71c2..83bfce01a8 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/UserTrashcanAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/UserTrashcanAPI.java @@ -26,6 +26,8 @@ */ package org.alfresco.rest.v0; +import static org.testng.AssertJUnit.assertNotNull; + import org.alfresco.rest.core.v0.BaseAPI; import org.springframework.stereotype.Component; @@ -45,12 +47,12 @@ public class UserTrashcanAPI extends BaseAPI * * @param username the username * @param password the password - * - * @return true if the request succeeded, false if not + * @throws AssertionError if emptying the trashcan fails. */ - public boolean emptyTrashcan(String username, String password) + public void emptyTrashcan(String username, String password) { - return doDeleteRequest(username, password, EMPTY_TRASHCAN) != null; + assertNotNull("Emptying trashcan failed for user " + username, + doDeleteRequest(username, password, EMPTY_TRASHCAN)); } }