Refactor AAA.checkUser()

[nemo.git] / nemo-impl / src / test / java / org / opendaylight / nemo / user / tenantmanager / AAATest.java

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
index 976f58870716ba00439cff7eca88b7188badf83b..98f669a0dc4f0cc056123f10c124699c68a22f04 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
@@ -22,10 +22,7 @@ import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserPassword;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserRoleName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance;
 
 /**
  * Created by zhangmeng on 2015/11/20.
@@ -33,31 +30,25 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.com
 public class AAATest extends TestCase {
     private AAA aaa;
     private TenantManage tenantManage;
-    private UserId userId;
-    private UserName userName;
-    private UserPassword userPassword;
-    private UserRoleName userRoleName;
+    private UserInstance userInstance;
 
     @Before
     public void setUp() throws Exception {
         tenantManage = mock(TenantManage.class);
         aaa = new AAA(tenantManage);
 
-        userId = mock(UserId.class);
-        userName = mock(UserName.class);
-        userPassword = mock(UserPassword.class);
-        userRoleName = mock(UserRoleName.class);
+        userInstance = mock(UserInstance.class);
     }
 
     @Test
     public void testCheckUser() throws Exception {
         doNothing().when(tenantManage).fetchUsers();
         when(tenantManage.getUsersList()).thenReturn(null);
-        String acutal = aaa.CheckUser(userId, userName, userPassword, userRoleName);
+        String acutal = aaa.checkUser(userInstance);
         String expected = "The user is not exist.";
         verify(tenantManage).fetchUsers();
         verify(tenantManage).getUsersList();
         Assert.assertNotNull(aaa);
         Assert.assertEquals(expected,acutal);
     }
-}
\ No newline at end of file
+}