X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fusermanager%2Fimplementation%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fusermanager%2Finternal%2FUserManagerImplTest.java;h=f2cbe784fce5377347515a3a3131a5d2ec58d3ac;hp=e84396b0f49cc8cc9bab1126ec633d77a0ec2036;hb=3afbe236f240c3f35093d58999f8b5882cd9dd2e;hpb=756b3a862090ac60968d6ea33b516964e0f24a48

diff --git a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java
index e84396b0f4..f2cbe784fc 100644
--- a/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java
+++ b/opendaylight/usermanager/implementation/src/test/java/org/opendaylight/controller/usermanager/internal/UserManagerImplTest.java
@@ -31,11 +31,11 @@ import org.opendaylight.controller.usermanager.UserConfig;
 import org.opendaylight.controller.usermanager.AuthorizationConfig;
 
 /**
- * Unit Tests for UserManagerImpl
+ * Unit Tests for UserManager
  */
 public class UserManagerImplTest {
 
-    private static UserManagerImpl um;
+    private static UserManager um;
 
     /**
      * @throws java.lang.Exception
@@ -45,10 +45,10 @@ public class UserManagerImplTest {
 
         IUserManager userManager = (IUserManager) ServiceHelper
                 .getGlobalInstance(IUserManager.class, new Object());
-        if (userManager instanceof UserManagerImpl) {
-            um = (UserManagerImpl) userManager;
+        if (userManager instanceof UserManager) {
+            um = (UserManager) userManager;
         } else {
-            um = new UserManagerImpl();
+            um = new UserManager();
             um.setAuthProviders(new ConcurrentHashMap<String, IAAAProvider>());
 
             // mock up a remote server list with a dummy server
@@ -104,15 +104,9 @@ public class UserManagerImplTest {
         }
     }
 
-    /**
-     * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#addAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)}
-     * .
-     */
-    @Test
-    public void testAddAAAProvider() {
+    private IAAAProvider getAnonymousAAAProvider(final String providerName) {
         // instantiate an anonymous AAAProvider
-        IAAAProvider a3p = new IAAAProvider() {
+        return new IAAAProvider() {
 
             @Override
             public AuthResponse authService(String userName, String password,
@@ -122,31 +116,32 @@ public class UserManagerImplTest {
 
             @Override
             public String getName() {
-                return "dummyAAAProvider";
+                return providerName;
             }
         };
-
-        um.addAAAProvider(a3p);
-        assertEquals(a3p, um.getAAAProvider("dummyAAAProvider"));
-
     }
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#removeAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)}
-     * and for for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#getAAAProvider(java.lang.String)}
-     * .
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#addAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)}
+     * and for
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#removeAAAProvider(org.opendaylight.controller.usermanager.IAAAProvider)}
+     * and
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#getAAAProvider(java.lang.String)}
      */
     @Test
-    public void testRemoveAAAProvider() {
-        um.removeAAAProvider(um.getAAAProvider("dummyAAAProvider"));
+    public void testAddGetRemoveAAAProvider() {
+        final String providerName = "dummyAAAProvider";
+        IAAAProvider a3p = getAnonymousAAAProvider(providerName);
+        um.addAAAProvider(a3p);
+        assertEquals(a3p, um.getAAAProvider(providerName));
+        um.removeAAAProvider(um.getAAAProvider(providerName));
         assertTrue(um.getAAAProviderNames().isEmpty());
     }
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#authenticate(java.lang.String, java.lang.String)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#authenticate(java.lang.String, java.lang.String)}
      * .
      */
     @Test
@@ -161,7 +156,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#addRemoveLocalUser(org.opendaylight.controller.usermanager.org.opendaylight.controller.usermanager.internal.UserConfig, boolean)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#addRemoveLocalUser(org.opendaylight.controller.usermanager.org.opendaylight.controller.usermanager.internal.UserConfig, boolean)}
      * .
      */
     @Test
@@ -178,7 +173,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#changeLocalUserPassword(java.lang.String, java.lang.String, java.lang.String)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#changeLocalUserPassword(java.lang.String, java.lang.String, java.lang.String)}
      * .
      */
     @Test
@@ -188,7 +183,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#userLogout(java.lang.String)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#userLogout(java.lang.String)}
      * .
      */
     @Test
@@ -198,7 +193,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#userTimedOut(java.lang.String)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#userTimedOut(java.lang.String)}
      * .
      */
     @Test
@@ -208,7 +203,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#authenticate(org.springframework.security.core.Authentication)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#authenticate(org.springframework.security.core.Authentication)}
      * .
      */
     @Test
@@ -218,7 +213,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#saveLocalUserList()}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#saveLocalUserList()}
      * .
      */
     @Test
@@ -228,7 +223,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#saveAAAServerList()}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#saveAAAServerList()}
      * .
      */
     @Test
@@ -238,7 +233,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#saveAuthorizationList()}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#saveAuthorizationList()}
      * .
      */
     @Test
@@ -248,7 +243,7 @@ public class UserManagerImplTest {
 
     /**
      * Test method for
-     * {@link org.opendaylight.controller.usermanager.internal.UserManagerImpl#readObject(java.io.ObjectInputStream)}
+     * {@link org.opendaylight.controller.usermanager.internal.UserManager#readObject(java.io.ObjectInputStream)}
      * .
      */
     @Test