mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65934: MNT-11059: ActivitiWorkflowRestApiTest and JBPMWorkflowRestApiTest failing since we switched to British Summer Time - Changed the dateformatter imports to compare equal dates correctly. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -64,7 +64,7 @@ import org.json.JSONArray;
|
|||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.extensions.surf.util.ISO8601DateFormat;
|
import org.alfresco.util.ISO8601DateFormat;
|
||||||
import org.springframework.extensions.webscripts.Status;
|
import org.springframework.extensions.webscripts.Status;
|
||||||
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
|
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
|
||||||
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
|
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
|
||||||
@@ -957,7 +957,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
|
|||||||
assertEquals(adhocInstance.getDefinition().getTitle(), result.getString("title"));
|
assertEquals(adhocInstance.getDefinition().getTitle(), result.getString("title"));
|
||||||
assertEquals(adhocInstance.getDefinition().getDescription(), result.getString("description"));
|
assertEquals(adhocInstance.getDefinition().getDescription(), result.getString("description"));
|
||||||
assertEquals(adhocInstance.isActive(), result.getBoolean("isActive"));
|
assertEquals(adhocInstance.isActive(), result.getBoolean("isActive"));
|
||||||
assertEquals(ISO8601DateFormat.format(adhocInstance.getStartDate()), result.getString("startDate"));
|
assertEquals(org.springframework.extensions.surf.util.ISO8601DateFormat.format(adhocInstance.getStartDate()), result.getString("startDate"));
|
||||||
assertNotNull(result.getString("dueDate"));
|
assertNotNull(result.getString("dueDate"));
|
||||||
assertNotNull(result.getString("endDate"));
|
assertNotNull(result.getString("endDate"));
|
||||||
assertEquals(1, result.getInt("priority"));
|
assertEquals(1, result.getInt("priority"));
|
||||||
|
Reference in New Issue
Block a user