Add VnfInPlaceSoftwareUpdate for WFD

[so.git] / common / src / test / java / org / onap / so / client / aai / AAIValidatorTest.java

diff --git a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java
index 04c8b15..85d690f 100644 (file)
--- a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java
@@ -24,21 +24,16 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.aai.domain.yang.GenericVnf;
 import org.onap.aai.domain.yang.Pserver;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
 @RunWith(MockitoJUnitRunner.class) 
 public class AAIValidatorTest {
        
@@ -54,11 +49,25 @@ public class AAIValidatorTest {
                validator.setClient(client);
        }
        
-       public List<Pserver> getPservers(boolean locked){
-               Pserver pserver = new Pserver();
-               pserver.setInMaint(locked);
+       public List<Pserver> getPserversLocked(){
+               Pserver pserver1 = new Pserver();
+               pserver1.setInMaint(true);
+               Pserver pserver2 = new Pserver();
+               pserver2.setInMaint(false);
+               List<Pserver> pservers = new ArrayList<Pserver>();
+               pservers.add(pserver1);
+               pservers.add(pserver2);
+               return pservers;                
+       }
+       
+       public List<Pserver> getPserversNotLocked(){
+               Pserver pserver1 = new Pserver();
+               pserver1.setInMaint(false);
+               Pserver pserver2 = new Pserver();
+               pserver2.setInMaint(false);
                List<Pserver> pservers = new ArrayList<Pserver>();
-               pservers.add(pserver);
+               pservers.add(pserver1);
+               pservers.add(pserver2);
                return pservers;                
        }
        
@@ -69,30 +78,30 @@ public class AAIValidatorTest {
        }
 
        @Test
-       public void test_IsPhysicalServerLocked_True() throws IOException{              
-               when(client.getPhysicalServerByVnfId(vnfName,uuid)).thenReturn(getPservers(true));      
-               boolean locked = validator.isPhysicalServerLocked(vnfName, uuid);
+       public void test_IsPhysicalServerLocked_True() throws IOException{              
+               when(client.getPhysicalServerByVnfId(vnfName)).thenReturn(getPserversLocked());
+               boolean locked = validator.isPhysicalServerLocked(vnfName);
                assertEquals(true, locked);
        }
        
        @Test
-       public void test_IsPhysicalServerLocked_False() throws JsonParseException, JsonMappingException, UnsupportedEncodingException, IOException {
-               when(client.getPhysicalServerByVnfId(vnfName,uuid)).thenReturn(getPservers(false));     
-               boolean locked = validator.isPhysicalServerLocked(vnfName, uuid);
+       public void test_IsPhysicalServerLocked_False() throws IOException {
+               when(client.getPhysicalServerByVnfId(vnfName)).thenReturn(getPserversNotLocked());
+               boolean locked = validator.isPhysicalServerLocked(vnfName);
                assertEquals(false, locked);
        }
        
        @Test
-       public void test_IsVNFLocked_False() throws Exception{
-               when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(false));   
-               boolean locked = validator.isVNFLocked(vnfName, uuid);
+       public void test_IsVNFLocked_False() {
+               when(client.getVnfByName(vnfName)).thenReturn(createGenericVnfs(false));
+               boolean locked = validator.isVNFLocked(vnfName);
                assertEquals(false, locked);
        }
 
        @Test
-       public void test_IsVNFLocked_True() throws Exception{
-               when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(true));    
-               boolean locked = validator.isVNFLocked(vnfName, uuid);
+       public void test_IsVNFLocked_True() {
+               when(client.getVnfByName(vnfName)).thenReturn(createGenericVnfs(true));
+               boolean locked = validator.isVNFLocked(vnfName);
                assertEquals(true,locked );
        }
 }