From: m.dalakov <m.dalakov@samsung.com>
Date: Mon, 25 Sep 2017 16:32:38 +0000 (+0300)
Subject: fix sonar issue: checkstyle:InnerAssignmentCheck squid:CommentedOutCodeLine pmd:Suspi... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a064a5bea8c68d5f3ed0735e79f5f90a9f05679;p=platform%2Fcore%2Fsecurity%2Fsuspicious-activity-monitor.git

fix sonar issue: checkstyle:InnerAssignmentCheck squid:CommentedOutCodeLine pmd:SuspiciousConstantFieldName
---

diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java
index fd4f860..fb66ad3 100644
--- a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java
+++ b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/api/AppConfigInit.java
@@ -40,7 +40,7 @@ import org.springframework.core.env.Environment;
 @PropertySources({
         @PropertySource("classpath:application.properties"),
         @PropertySource("classpath:jdbc.properties") })
-@SuppressWarnings("squid:HideUtilityClassConstructorCheck")
+//CHECKSTYLE:OFF
 public class AppConfigInit {
 
     static {
diff --git a/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java b/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java
index f845155..9c4f279 100644
--- a/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/domain/user/UserTest.java
@@ -119,9 +119,6 @@ public class UserTest {
         user.setId(1l);
 
         String toString = user.toString();
-
-        // User{id=1, username='user', email='user@company.com',
-        // date='Tue Jul 19 13:16:53 EEST 2016', locked=false, role=role}
         assertTrue(toString.contains("User{"));
         assertTrue(toString.contains("id=" + user.getId()));
         assertTrue(toString.contains("email='" + user.getEmail() + "'"));
diff --git a/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java b/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java
index cbdbd3d..def2168 100644
--- a/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java
+++ b/servers/commons/src/test/java/com/samsung/commons/service/UserDetailsServiceTest.java
@@ -118,12 +118,14 @@ public class UserDetailsServiceTest {
 
         User userToSave = new User("userToSave", "userToSave@email.com", roleAdmin);
         assertNotNull(userToSave);
-        assertNotNull(userToSave = userService.save(userToSave));
+        userToSave = userService.save(userToSave);
+        assertNotNull(userToSave);
 
         CustomUserDetails detailsToSave = new CustomUserDetails("passToSave", "restorePassLinkToSave.com", userToSave);
         assertNull(detailsToSave.getId());
 
-        assertNotNull(detailsToSave = customUserDetailsService.save(detailsToSave));
+        detailsToSave = customUserDetailsService.save(detailsToSave);
+        assertNotNull(detailsToSave);
         assertNotNull(detailsToSave.getId());
 
         assertNotNull(customUserDetailsService.findById(detailsToSave.getId()));
diff --git a/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewPolicyGroupTest.java b/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewPolicyGroupTest.java
index c325f24..9ed22f4 100644
--- a/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewPolicyGroupTest.java
+++ b/servers/dsm/src/test/java/com/samsung/dsm/model/view/ViewPolicyGroupTest.java
@@ -25,7 +25,7 @@ import com.samsung.dsm.policy.parser.PolicyConfigParser;
 
 public class ViewPolicyGroupTest {
 
-    public static String POLICY = "[" +
+    public static final String POLICY = "[" +
                                     "{" +
                                         "\"group\":\"no-display\"," +
                                         "\"policies\":[]" +