Merge pull request #440 from UNC-Libraries/code4

CODE 4

deposit/src/main/java/edu/unc/lib/deposit/normalize/Proquest2N3BagJob.java

@@ -364,7 +364,7 @@ private void setEmbargoUntil(Model model, Resource primaryResource, Element data
 
 			if ("2".equals(embargoCode))
 				embargoEnd = embargoEnd.plusYears(1);
-			else if ("3".equals(embargoCode))
+			else if ("3".equals(embargoCode) || "4".equals(embargoCode))
 				embargoEnd = embargoEnd.plusYears(2);
 			else
 				embargoEnd = null;

deposit/src/test/java/edu/unc/lib/deposit/normalize/Proquest2N3BagJobTest.java

@@ -272,6 +272,28 @@ public void testEmbargoInactive() {
 		DateTimeUtils.setCurrentMillisSystem();
 	}
 
+	@Test
+	public void testLongEmbargoed() {
+		// Forever 2014, as far as this test is concerned
+		DateTime newTime = new DateTime(2014, 5, 5, 0, 0, 0, 0);
+		DateTimeUtils.setCurrentMillisFixed(newTime.getMillis());
+
+		copyTestPackage("src/test/resources/proquest-embargo-code4.zip", job);
+
+		job.run();
+
+		Model model = job.getWritableModel();
+		Bag depositBag = model.getBag(job.getDepositPID().getURI());
+		Resource primaryResource = (Resource) depositBag.iterator().next();
+
+		Property embargoUntilP = cdrprop(model, embargoUntil);
+		String embargoValue = primaryResource.getProperty(embargoUntilP).getString();
+		assertEquals("Embargo value did not match the expected valued", "2016-05-05T00:00:00", embargoValue);
+
+		// Restore the system clock
+		DateTimeUtils.setCurrentMillisSystem();
+	}
+
 	@Test
 	public void testMultiplePackages() throws Exception {
 		copyTestPackage("src/test/resources/proquest-noattach.zip", job);