diff --git a/source/test-java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java index ce2052efa5..4ca1bde419 100644 --- a/source/test-java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java +++ b/source/test-java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java @@ -87,7 +87,7 @@ public abstract class AbstractMetadataExtracterTest extends TestCase long now = System.currentTimeMillis(); TempFileProvider.TempFileCleanerJob.removeFiles(now); - TimeZone tz = TimeZone.getTimeZone("Europe/London"); + TimeZone tz = TimeZone.getTimeZone("GMT"); TimeZone.setDefault(tz); // Joda time has already grabbed the JVM zone so re-set it here DateTimeZone.setDefault(DateTimeZone.forTimeZone(tz)); diff --git a/source/test-java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java index 8b376cf1cb..d8873c93c5 100644 --- a/source/test-java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java +++ b/source/test-java/org/alfresco/repo/content/metadata/OfficeMetadataExtracterTest.java @@ -105,20 +105,20 @@ public class OfficeMetadataExtracterTest extends AbstractMetadataExtracterTest if(mimetype.equals(MimetypeMap.MIMETYPE_WORD)) { assertEquals( "Property " + ContentModel.PROP_CREATED + " not found for mimetype " + mimetype, - "2005-05-26T13:57:00.000+01:00", + "2005-05-26T12:57:00.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_CREATED))); assertEquals( "Property " + ContentModel.PROP_MODIFIED + " not found for mimetype " + mimetype, - "2005-09-20T18:25:00.000+01:00", + "2005-09-20T17:25:00.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_MODIFIED))); } else if(mimetype.equals(MimetypeMap.MIMETYPE_EXCEL)) { assertEquals( "Property " + ContentModel.PROP_CREATED + " not found for mimetype " + mimetype, - "1996-10-15T00:33:28.000+01:00", + "1996-10-14T23:33:28.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_CREATED))); assertEquals( "Property " + ContentModel.PROP_MODIFIED + " not found for mimetype " + mimetype, - "2005-09-20T19:22:32.000+01:00", + "2005-09-20T18:22:32.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_MODIFIED))); } else if(mimetype.equals(MimetypeMap.MIMETYPE_PPT)) { assertEquals( @@ -127,7 +127,7 @@ public class OfficeMetadataExtracterTest extends AbstractMetadataExtracterTest DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_CREATED))); assertEquals( "Property " + ContentModel.PROP_MODIFIED + " not found for mimetype " + mimetype, - "2005-09-20T19:23:41.000+01:00", + "2005-09-20T18:23:41.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_MODIFIED))); } diff --git a/source/test-java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java index 7b58d4114b..d4488e59a2 100644 --- a/source/test-java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java +++ b/source/test-java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracterTest.java @@ -84,7 +84,7 @@ public class PdfBoxMetadataExtracterTest extends AbstractMetadataExtracterTest Map properties) { assertEquals( "Property " + ContentModel.PROP_CREATED + " not found for mimetype " + mimetype, - "2005-05-26T20:52:58.000+01:00", + "2005-05-26T19:52:58.000Z", DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_CREATED))); } diff --git a/source/test-java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java index 4545c7c713..a58e0668c7 100644 --- a/source/test-java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java +++ b/source/test-java/org/alfresco/repo/content/metadata/PoiMetadataExtracterTest.java @@ -94,7 +94,7 @@ public class PoiMetadataExtracterTest extends AbstractMetadataExtracterTest } else if (MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET.equals(mimetype)) { - checkFileCreationDate(mimetype, properties, "1996-10-15T00:33:28.000+01:00"); + checkFileCreationDate(mimetype, properties, "1996-10-14T23:33:28.000Z"); } else if (MimetypeMap.MIMETYPE_OPENXML_PRESENTATION.equals(mimetype)) { diff --git a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java index 6eff9af3b5..d0ae9b39ba 100644 --- a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java +++ b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java @@ -23,6 +23,7 @@ import java.io.InputStreamReader; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.TimeZone; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; @@ -45,6 +46,7 @@ import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; import org.alfresco.util.debug.NodeStoreInspector; import org.junit.experimental.categories.Category; +import org.joda.time.DateTimeZone; import org.springframework.extensions.surf.util.ISO8601DateFormat; @Category(OwnJVMTestsCategory.class) @@ -74,6 +76,11 @@ public class ImporterComponentTest extends BaseSpringTest // Create the store this.storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis()); + + TimeZone tz = TimeZone.getTimeZone("GMT"); + TimeZone.setDefault(tz); + // Joda time has already grabbed the JVM zone so re-set it here + DateTimeZone.setDefault(DateTimeZone.forTimeZone(tz)); } @Override @@ -126,9 +133,9 @@ public class ImporterComponentTest extends BaseSpringTest String modifiedDate = DefaultTypeConverter.INSTANCE.convert(String.class, nodeProps.get(ContentModel.PROP_MODIFIED)); String modifier = DefaultTypeConverter.INSTANCE.convert(String.class, nodeProps.get(ContentModel.PROP_MODIFIER)); // Check that the cm:auditable properties are correct - assertEquals("cm:created not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-05-01T00:00:00.000+01:00")), createdDate); + assertEquals("cm:created not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-04-30T23:00:00.000Z")), createdDate); assertEquals("cm:creator not preserved during import", "Import Creator", creator); - assertEquals("cm:modified not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-05-02T00:00:00.000+01:00")), modifiedDate); + assertEquals("cm:modified not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-05-01T23:00:00.000Z")), modifiedDate); assertEquals("cm:modifier not preserved during import", "Import Modifier", modifier); nodeRef = childAssocs.get(1).getChildRef(); @@ -138,7 +145,7 @@ public class ImporterComponentTest extends BaseSpringTest modifiedDate = DefaultTypeConverter.INSTANCE.convert(String.class, nodeProps.get(ContentModel.PROP_MODIFIED)); modifier = DefaultTypeConverter.INSTANCE.convert(String.class, nodeProps.get(ContentModel.PROP_MODIFIER)); // Check that the cm:auditable properties are correct - assertEquals("cm:created not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-05-01T00:00:00.000+01:00")), createdDate); + assertEquals("cm:created not preserved during import", ISO8601DateFormat.format(ISO8601DateFormat.parse("2009-04-30T23:00:00.000Z")), createdDate); assertEquals("cm:creator not preserved during import", "Import Creator", creator); assertEquals("cm:modifier not preserved during import", AuthenticationUtil.getSystemUserName(), modifier); }