X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2Ftest%2FJU_ExpireRange.java;h=20d0dcba6a598615a82cdcc12e543fdee5f0cd34;hp=4ed167e99acc317dc641bb474c000d2315201606;hb=d86e3224e6a5af2bd2b713f93bea5e6677d3ebc2;hpb=df63855ff6362e059bc33d84d3a27d0d92150116

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
index 4ed167e9..20d0dcba 100644
--- a/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/batch/helpers/test/JU_ExpireRange.java
@@ -22,6 +22,7 @@ package org.onap.aaf.auth.batch.helpers.test;
 
 import static org.junit.Assert.*;
 
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Set;
 
@@ -33,10 +34,11 @@ public class JU_ExpireRange {
 	@Test
 	public void test() {
 		ExpireRange expRange = new ExpireRange(new PropAccess());
+		Date now = expRange.now();
 		
 		Set<String> names=expRange.names();
 		assertTrue(names.contains("OneMonth"));
-		assertTrue(names.contains("CredOneWeek"));
+		assertTrue(names.contains("OneWeek"));
 		assertTrue(names.contains("Delete"));
 		assertFalse(names.contains(null));
 		assertFalse(names.contains("bogus"));
@@ -46,17 +48,16 @@ public class JU_ExpireRange {
 		String[] all = new String[] {"ur","cred"};
 		
 		// Test 3 weeks prior
-		gc.setTime(expRange.now);
+		gc.setTime(now);
 		gc.add(GregorianCalendar.WEEK_OF_MONTH,-3);
 		for(String rs : all) {
 			r = expRange.getRange(rs, gc.getTime());
 			assertNotNull(r);
 			assertEquals("Delete",r.name());
-			assertFalse(r.shouldContact(null));
 		}
 		
 		// Test 1 week prior
-		gc.setTime(expRange.now);
+		gc.setTime(now);
 		gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
 		for(String rs : all) {
 			r = expRange.getRange(rs, gc.getTime());
@@ -64,7 +65,7 @@ public class JU_ExpireRange {
 		}
 		
 		// Test Today
-		r = expRange.getRange("cred", expRange.now);
+		r = expRange.getRange("cred", now);
 		assertNotNull(r);
 	}