X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fconfig%2FCldsUserJsonDecoderTest.java;h=7152ee11d98b86dfbe178648f30ae41cd40fa2d4;hb=723de7f63f0951d0cfe7a23956cf9d00128809b1;hp=a32a60351d4cccd0f9e69b1110e8d2dc81f0f5cd;hpb=81a26fc8eb791eb8f4060c226cb9e6b4557cdbfb;p=clamp.git

diff --git a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java b/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
index a32a6035..7152ee11 100644
--- a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
+++ b/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
@@ -5,6 +5,8 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -27,40 +29,35 @@ package org.onap.clamp.clds.config;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.onap.clamp.clds.service.CldsUser;
+import org.onap.clamp.authorization.CldsUser;
+import org.onap.clamp.clds.exception.CldsUsersException;
 
 public class CldsUserJsonDecoderTest {
 
     private String user1 = "admin1";
     private String user2 = "admin2";
     private String password = "5f4dcc3b5aa765d61d8327deb882cf99";
-    private String[] normalPermissionsArray = {
-        "permission-type-cl|dev|read", "permission-type-cl|dev|update", "permission-type-cl-manage|dev|*",
-        "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
-        "permission-type-template|dev|update"
-    };
-    private String[] incompletePermissionsArray = {
-        "permission-type-cl|dev|*", "permission-type-cl|dev|*", "permission-type-cl-manage|dev|*",
-        "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
-        "permission-type-template|dev|update"
-    };
+    private String[] normalPermissionsArray = { "permission-type-cl|dev|read", "permission-type-cl|dev|update",
+        "permission-type-cl-manage|dev|*", "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
+        "permission-type-template|dev|update" };
+    private String[] incompletePermissionsArray = { "permission-type-cl|dev|*", "permission-type-cl|dev|*",
+        "permission-type-cl-manage|dev|*", "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
+        "permission-type-template|dev|update" };
 
     @Test
     public void testDecodingDoubleUsers() {
 
-        //when
+        // when
         CldsUser[] usersArray = CldsUserJsonDecoder
-            .decodeJson(CldsUserJsonDecoderTest.class.getResourceAsStream("/clds/clds-users-two-users.json"));
+                .decodeJson(CldsUserJsonDecoderTest.class.getResourceAsStream("/clds/clds-users-two-users.json"));
 
-        //then
+        // then
         assertThat(usersArray).hasSize(2);
-        assertThat(usersArray[0])
-            .extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
-            .containsExactly(user1, password, normalPermissionsArray);
+        assertThat(usersArray[0]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
+                .containsExactly(user1, password, normalPermissionsArray);
 
-        assertThat(usersArray[1])
-            .extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
-            .containsExactly(user2, password, normalPermissionsArray);
+        assertThat(usersArray[1]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
+                .containsExactly(user2, password, normalPermissionsArray);
 
     }
 
@@ -70,7 +67,7 @@ public class CldsUserJsonDecoderTest {
         CldsUser[] usersArray = CldsUserJsonDecoder
                 .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-no-permission.json"));
 
-        //then
+        // then
         assertThat(usersArray).hasSize(1);
         CldsUser user = usersArray[0];
         assertThat(user.getUser()).isEqualTo(user1);
@@ -81,15 +78,22 @@ public class CldsUserJsonDecoderTest {
     @Test
     public void testDecodingIncompletePermissions() {
 
-        //when
+        // when
         CldsUser[] usersArray = CldsUserJsonDecoder
                 .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-incomplete-permissions.json"));
 
-        //then
+        // then
         assertThat(usersArray).hasSize(1);
         CldsUser user = usersArray[0];
         assertThat(user.getUser()).isEqualTo(user1);
         assertThat(user.getPassword()).isEqualTo(password);
         assertThat(user.getPermissionsString()).isEqualTo(incompletePermissionsArray);
     }
+
+    @Test(expected = CldsUsersException.class)
+    public void shouldThrowCldsUsersException() {
+        // when
+        CldsUserJsonDecoder.decodeJson(this.getClass().getResourceAsStream("/clds/clds-parse-exception.json"));
+    }
+
 }