1 files changed, 39 insertions, 11 deletions

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/requesthandler/impl/LocalRequestValidatorImplTest.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/requesthandler/impl/LocalRequestValidatorImplTest.java
index 51dfa6a1b..27f0897cc 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/requesthandler/impl/LocalRequestValidatorImplTest.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/onap/appc/requesthandler/impl/LocalRequestValidatorImplTest.java
@@ -22,34 +22,40 @@
 
 package org.onap.appc.requesthandler.impl;
 
-// import com.att.eelf.configuration.EELFLogger;
-// import com.att.eelf.configuration.EELFManager;
+
+import static org.junit.Assert.fail;
+import static org.powermock.api.mockito.PowerMockito.spy;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFLogger.Level;
+import com.att.eelf.configuration.EELFManager;
+
+import java.util.Date;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.Matchers;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.appc.domainmodel.lcm.ActionIdentifiers;
-import org.onap.appc.domainmodel.lcm.ActionLevel;
 import org.onap.appc.domainmodel.lcm.RuntimeContext;
 import org.onap.appc.domainmodel.lcm.VNFOperation;
 import org.onap.appc.exceptions.InvalidInputException;
 import org.onap.appc.requesthandler.LCMStateManager;
 import org.onap.appc.requesthandler.exceptions.DuplicateRequestException;
 import org.onap.appc.requesthandler.exceptions.LCMOperationsDisabledException;
+import org.onap.appc.requesthandler.exceptions.RequestExpiredException;
 import org.onap.appc.transactionrecorder.TransactionRecorder;
-
-import static org.powermock.api.mockito.PowerMockito.spy;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
 
 /**
  * Test class for LocalRequestValidatorImpl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class LocalRequestValidatorImplTest implements LocalRequestHanlderTestHelper {
 
-    // protected final EELFLogger logger = EELFManager.getInstance().getLogger(LocalRequestValidatorImplTest.class);
+@RunWith(PowerMockRunner.class)
+public class LocalRequestValidatorImplTest implements LocalRequestHanlderTestHelper {
 
     @Mock
     private LCMStateManager lcmStateManager;
@@ -67,6 +73,9 @@ public class LocalRequestValidatorImplTest implements LocalRequestHanlderTestHel
 
         Mockito.when(lcmStateManager.isLCMOperationEnabled()).thenReturn(true);
         Mockito.when(transactionRecorder.isTransactionDuplicate(Matchers.anyObject())).thenReturn(false);
+        final EELFLogger logger = EELFManager.getInstance().getLogger(LocalRequestValidatorImpl.class);
+        logger.setLevel(Level.TRACE);
+        Whitebox.setInternalState(requestValidator, "logger", logger);
     }
 
     @Test(expected = LCMOperationsDisabledException.class)
@@ -99,7 +108,6 @@ public class LocalRequestValidatorImplTest implements LocalRequestHanlderTestHel
         RuntimeContext context = createRequestValidatorInput();
         ActionIdentifiers ai = context.getRequestContext().getActionIdentifiers();
         ai.setVnfId(null);
-        // logger.warn("Set vnfId in ActionIdentifiers extracted from createRequestValidatorInput's RequestContext to null");
         requestValidator.validateRequest(context);
     }
 
@@ -110,6 +118,26 @@ public class LocalRequestValidatorImplTest implements LocalRequestHanlderTestHel
         requestValidator.validateRequest(context);
     }
 
+    @Test(expected = InvalidInputException.class)
+    public void validateRequestInvalidInputInvalidTime() throws Exception {
+        RuntimeContext context = createRequestValidatorInput();
+        context.getResponseContext().getCommonHeader().setTimestamp(new Date(System.currentTimeMillis() + 999999));
+        final EELFLogger logger = EELFManager.getInstance().getLogger(AbstractRequestValidatorImpl.class);
+        logger.setLevel(Level.TRACE);
+        Whitebox.setInternalState(requestValidator, "logger", logger);
+        requestValidator.validateRequest(context);
+    }
+
+    @Test(expected = RequestExpiredException.class)
+    public void validateRequestRequestExpiredException() throws Exception {
+        RuntimeContext context = createRequestValidatorInput();
+        context.getResponseContext().getCommonHeader().setTimestamp(new Date(System.currentTimeMillis() - 999999));
+        final EELFLogger logger = EELFManager.getInstance().getLogger(AbstractRequestValidatorImpl.class);
+        logger.setLevel(Level.TRACE);
+        Whitebox.setInternalState(requestValidator, "logger", logger);
+        requestValidator.validateRequest(context);
+    }
+
     private RuntimeContext createRequestValidatorInput() {
         return createRequestHandlerRuntimeContext("VSCP", "{\"request-id\":\"request-id\"}");
     }