Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58495: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58419: MNT-9888: WorkflowModelBuilderTest is susceptible to timezone issues
       - Fix unit tests that failed in build 77. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:41:08 +00:00
parent 2493ba39ac
commit 0e7931feaf
2 changed files with 11 additions and 11 deletions

View File

@@ -94,7 +94,7 @@ public class OpenDocumentMetadataExtracterTest extends AbstractMetadataExtracter
{
assertEquals(
"Property " + ContentModel.PROP_CREATED + " not found for mimetype " + mimetype,
DATE_FORMAT.parse("2005-09-06T23:34:00.000+0100"),
DATE_FORMAT.parse("2005-09-06T23:34:00.000+0000"),
DefaultTypeConverter.INSTANCE.convert(Date.class, properties.get(ContentModel.PROP_CREATED)));
}
else if(mimetype.equals("application/vnd.oasis.opendocument.graphics"))