ISSUE: Some changes to Authorization

[controller.git] / opendaylight / sal / api / src / test / java / org / opendaylight / controller / sal / authorization / AuthorizationTest.java

diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java
index 518e9c607c7271be7ed2d7fa5c1464a28e29201d..55adfdac5173022579e65e96a272418dbfa3f299 100644 (file)
--- a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java
+++ b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/authorization/AuthorizationTest.java
@@ -52,7 +52,7 @@ import org.opendaylight.controller.sal.utils.NodeCreator;
        @Test
        public void testAppRoleLevel() {
                AppRoleLevel appRoleLevel = AppRoleLevel.APPOPERATOR;
        @Test
        public void testAppRoleLevel() {
                AppRoleLevel appRoleLevel = AppRoleLevel.APPOPERATOR;

-               Assert.assertTrue(appRoleLevel.toString().equals("Network-Operator"));
+               Assert.assertTrue(appRoleLevel.toString().equals("App-Operator"));

                Assert.assertTrue(appRoleLevel.toNumber() == 2);
                Assert.assertTrue(appRoleLevel.toStringPretty().equals("Application Operator"));
        }
                Assert.assertTrue(appRoleLevel.toNumber() == 2);
                Assert.assertTrue(appRoleLevel.toStringPretty().equals("Application Operator"));
        }


@@ -64,4 +64,14 @@ import org.opendaylight.controller.sal.utils.NodeCreator;
                Assert.assertTrue(userLevel.toNumber() == 0);
                Assert.assertTrue(userLevel.toStringPretty().equals("System Administrator"));
        }
                Assert.assertTrue(userLevel.toNumber() == 0);
                Assert.assertTrue(userLevel.toStringPretty().equals("System Administrator"));
        }

+       
+       @Test
+       public void testAppRoleLevelFromString() {
+               Assert.assertTrue(AppRoleLevel.fromString("App-Admin") == AppRoleLevel.APPADMIN);
+               Assert.assertTrue(AppRoleLevel.fromString("App-User") == AppRoleLevel.APPUSER);
+               Assert.assertTrue(AppRoleLevel.fromString("App-Operator") == AppRoleLevel.APPOPERATOR);
+               Assert.assertTrue(AppRoleLevel.fromString(" ") == null);
+               Assert.assertTrue(AppRoleLevel.fromString("") == null);
+               Assert.assertTrue(AppRoleLevel.fromString("App-Admini") == null);               
+       }

 }
 }