X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2Ftest%2FJU_ExpireRange.java;h=77eafc4b5d9ff87bbeda41dcabbaedb2176f8700;hb=HEAD;hp=5b337d5278a5c493114252998cbb4a49d7fe4104;hpb=628b7105ce4d9818aac69a082e515f9275fd46fd;p=aaf%2Fauthz.git

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 5b337d52..77eafc4b 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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;
 
@@ -30,42 +31,42 @@ import org.onap.aaf.auth.batch.helpers.ExpireRange;
 import org.onap.aaf.cadi.PropAccess;
 
 public class JU_ExpireRange {
-	@Test
-	public void test() {
-		ExpireRange expRange = new ExpireRange(new PropAccess());
-		
-		Set<String> names=expRange.names();
-		assertTrue(names.contains("OneMonth"));
-		assertTrue(names.contains("OneWeek"));
-		assertTrue(names.contains("Delete"));
-		assertFalse(names.contains(null));
-		assertFalse(names.contains("bogus"));
-		
-		ExpireRange.Range r;
-		GregorianCalendar gc = new GregorianCalendar();
-		String[] all = new String[] {"ur","cred"};
-		
-		// Test 3 weeks prior
-		gc.setTime(expRange.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.add(GregorianCalendar.WEEK_OF_MONTH,-1);
-		for(String rs : all) {
-			r = expRange.getRange(rs, gc.getTime());
-			assertNull(r);
-		}
-		
-		// Test Today
-		r = expRange.getRange("cred", expRange.now);
-		assertNotNull(r);
-	}
+    @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("OneWeek"));
+        assertTrue(names.contains("Delete"));
+        assertFalse(names.contains(null));
+        assertFalse(names.contains("bogus"));
+
+        ExpireRange.Range r;
+        GregorianCalendar gc = new GregorianCalendar();
+        String[] all = new String[] {"ur","cred"};
+
+        // Test 3 weeks prior
+        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());
+        }
+
+        // Test 1 week prior
+        gc.setTime(now);
+        gc.add(GregorianCalendar.WEEK_OF_MONTH,-1);
+        for(String rs : all) {
+            r = expRange.getRange(rs, gc.getTime());
+            assertNull(r);
+        }
+
+        // Test Today
+        r = expRange.getRange("cred", now);
+        assertNotNull(r);
+    }
 
 }