hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-3217] modified DCDateTest and InstallItemTest to use Calendar instead of Date for getting a date value for testing, explicitly set the timezone of the new calendar object to UTC, thanks to LuizClaudioSantos and Helix84 for the hints

Browse Source
This commit is contained in:
Hardy Pottinger
2016-06-29 23:51:23 +00:00
parent b53ac7c504
commit 2e96217e75
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace-api/src/test/java/org/dspace/content/DCDateTest.java
View File

@@ -399,6 +399,7 @@ public class DCDateTest
{ {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis()); calendar.setTimeInMillis(System.currentTimeMillis());
calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
assertTrue("testGetCurrent 0", DateUtils.isSameDay(DCDate.getCurrent().toDate(), calendar.getTime())); assertTrue("testGetCurrent 0", DateUtils.isSameDay(DCDate.getCurrent().toDate(), calendar.getTime()));
} }

24
dspace-api/src/test/java/org/dspace/content/InstallItemTest.java
View File

@@ -25,12 +25,14 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.List; import java.util.List;
import java.util.Calendar;
import java.util.TimeZone;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/** /**
* Unit Tests for class InstallItem * Unit Tests for class InstallItem
* @author pvillega * @author pvillega
@@ -246,10 +248,13 @@ public class InstallItemTest extends AbstractUnitTest
itemService.addMetadata(context, is.getItem(), "dc", "date", "issued", Item.ANY, "2011-01-01"); itemService.addMetadata(context, is.getItem(), "dc", "date", "issued", Item.ANY, "2011-01-01");
//get current date //get current date
DCDate now = DCDate.getCurrent(); Calendar calendar = Calendar.getInstance();
String dayAndTime = now.toString(); calendar.setTimeInMillis(System.currentTimeMillis());
//parse out just the date, remove the time (format: yyyy-mm-ddT00:00:00Z) calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
String date = dayAndTime.substring(0, dayAndTime.indexOf("T"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String date = sdf.format(calendar.getTime());
Item result = installItemService.installItem(context, is, handle); Item result = installItemService.installItem(context, is, handle);
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -296,10 +301,11 @@ public class InstallItemTest extends AbstractUnitTest
itemService.addMetadata(context, is.getItem(), "dc", "date", "issued", Item.ANY, "2011-01-01"); itemService.addMetadata(context, is.getItem(), "dc", "date", "issued", Item.ANY, "2011-01-01");
//get current date //get current date
DCDate now = DCDate.getCurrent(); Calendar calendar = Calendar.getInstance();
String dayAndTime = now.toString(); calendar.setTimeInMillis(System.currentTimeMillis());
//parse out just the date, remove the time (format: yyyy-mm-ddT00:00:00Z) calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
String date = dayAndTime.substring(0, dayAndTime.indexOf("T")); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String date = sdf.format(calendar.getTime());
Item result = installItemService.restoreItem(context, is, handle); Item result = installItemService.restoreItem(context, is, handle);
context.restoreAuthSystemState(); context.restoreAuthSystemState();