inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.2-BUG-FIX (4.2.3) to V4.2.1 (4.2.1.3)

Browse Source 
65947: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
      65946: Merged HEAD-BUG-FIX (4.3/Cloud) to V4.1-BUG-FIX (4.1.9)
         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/PATCHES/V4.2.1/root@66877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2014-04-07 09:32:50 +00:00
parent 6dc92ead70
commit 9ef543f2ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
View File

@@ -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"));