Checkstyle fixes

[clamp.git] / src / test / java / org / onap / clamp / clds / config / CldsUserJsonDecoderTest.java

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 b3d5217..a948042 100644 (file)
--- 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
@@ -17,69 +19,81 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
+ * Modifications copyright (c) 2018 Nokia
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 
 package org.onap.clamp.clds.config;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
+import org.onap.clamp.clds.exception.CldsUsersException;
 import org.onap.clamp.clds.service.CldsUser;
 
 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",
+    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" };
 
     @Test
-    public void testDecodingDoubleUsers() throws Exception {
+    public void testDecodingDoubleUsers() {
+
+        // when
         CldsUser[] usersArray = CldsUserJsonDecoder
                 .decodeJson(CldsUserJsonDecoderTest.class.getResourceAsStream("/clds/clds-users-two-users.json"));
 
-        assertEquals(usersArray.length, 2);
+        // then
+        assertThat(usersArray).hasSize(2);
+        assertThat(usersArray[0]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
+                .containsExactly(user1, password, normalPermissionsArray);
 
-        assertEquals(usersArray[0].getUser(), user1);
-        assertEquals(usersArray[1].getUser(), user2);
+        assertThat(usersArray[1]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
+                .containsExactly(user2, password, normalPermissionsArray);
 
-        assertEquals(usersArray[0].getPassword(), password);
-        assertEquals(usersArray[1].getPassword(), password);
-
-        assertArrayEquals(usersArray[0].getPermissionsString(), normalPermissionsArray);
-        assertArrayEquals(usersArray[1].getPermissionsString(), normalPermissionsArray);
     }
 
     @Test
-    public void testDecodingNoPermission() throws Exception {
+    public void testDecodingNoPermission() {
+        // when
         CldsUser[] usersArray = CldsUserJsonDecoder
                 .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-no-permission.json"));
 
-        assertEquals(usersArray.length, 1);
-        assertEquals(usersArray[0].getUser(), user1);
-        assertEquals(usersArray[0].getPassword(), null);
-        assertArrayEquals(usersArray[0].getPermissionsString(), new String[0]);
+        // then
+        assertThat(usersArray).hasSize(1);
+        CldsUser user = usersArray[0];
+        assertThat(user.getUser()).isEqualTo(user1);
+        assertThat(user.getPassword()).isEqualTo(null);
+        assertThat(user.getPermissionsString()).isEmpty();
     }
 
     @Test
-    public void testDecodingIncompletePermissions() throws Exception {
+    public void testDecodingIncompletePermissions() {
+
+        // when
         CldsUser[] usersArray = CldsUserJsonDecoder
                 .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-incomplete-permissions.json"));
 
-        assertEquals(usersArray.length, 1);
-        assertEquals(usersArray[0].getUser(), user1);
-        assertEquals(usersArray[0].getPassword(), password);
-        assertArrayEquals(usersArray[0].getPermissionsString(), incompletePermissionsArray);
+        // 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"));
     }
 
 }