- Add junit tests for basic auth password comparison

- Fix #483

Author: rathnapandi

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerPoliciesAdapter.java

@@ -122,7 +122,7 @@ public Policy getPolicyForName(PolicyType type, String name) throws AppException
         List<Policy> policies = this.mappedPolicies.get(type);
 
         for (Policy policy : policies) {
-            LOG.info("Policy Name : {}", policy.getName());
+            LOG.debug("Policy Name : {}", policy.getName());
             if (policy.getName().equals(name)) {
                 return policy;
             }

modules/apim-adapter/src/test/java/com/axway/apim/api/model/AuthenticationProfileTest.java

@@ -147,6 +147,59 @@ public void compareBasicAuthProfiles(){
         Assert.assertEquals(authenticationProfileFromGateway, authenticationProfile);
     }
 
+    @Test
+    public void compareBasicAuthProfilesWithDifferentPassword(){
+        AuthenticationProfile authenticationProfile = new AuthenticationProfile();
+        authenticationProfile.setName("_default");
+        authenticationProfile.setType(AuthType.http_basic);
+        authenticationProfile.setIsDefault(true);
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("username","admin");
+        parameters.put("password", Utils.getEncryptedPassword());
+        parameters.put("_id_", 0);
+
+        authenticationProfile.setParameters(parameters);
+        AuthenticationProfile authenticationProfileFromGateway = new AuthenticationProfile();
+        authenticationProfileFromGateway.setName("_default");
+        authenticationProfileFromGateway.setIsDefault(true);
+        authenticationProfileFromGateway.setType(AuthType.http_basic);
+
+        parameters = new HashMap<>();
+        parameters.put("username","admin");
+        parameters.put("password", Utils.getEncryptedPassword()+1);
+        parameters.put("_id_", 0);
+
+        authenticationProfileFromGateway.setParameters(parameters);
+        Assert.assertNotEquals(authenticationProfileFromGateway, authenticationProfile);
+    }
+
+    @Test
+    public void compareBasicAuthProfilesWithSamePassword(){
+        AuthenticationProfile authenticationProfile = new AuthenticationProfile();
+        authenticationProfile.setName("_default");
+        authenticationProfile.setType(AuthType.http_basic);
+        authenticationProfile.setIsDefault(true);
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("username","admin");
+        parameters.put("password", Utils.getEncryptedPassword());
+        parameters.put("_id_", 0);
+
+        authenticationProfile.setParameters(parameters);
+        AuthenticationProfile authenticationProfileFromGateway = new AuthenticationProfile();
+        authenticationProfileFromGateway.setName("_default");
+        authenticationProfileFromGateway.setIsDefault(true);
+        authenticationProfileFromGateway.setType(AuthType.http_basic);
+
+        parameters = new HashMap<>();
+        parameters.put("username","admin");
+        parameters.put("password", Utils.getEncryptedPassword());
+        parameters.put("_id_", 0);
+
+        authenticationProfileFromGateway.setParameters(parameters);
+        Assert.assertEquals(authenticationProfileFromGateway, authenticationProfile);
+    }
+
+
     @Test
     public void compareApikeyAuthProfiles(){
         AuthenticationProfile authenticationProfile = new AuthenticationProfile();

modules/apis/src/main/java/com/axway/apim/apiimport/APIChangeState.java

@@ -83,8 +83,8 @@ private void getChanges() throws AppException {
                     String getterMethodName = "get" + field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
                     Method method = desiredAPI.getClass().getMethod(getterMethodName, null);
                     Method method2 = actualAPI.getClass().getMethod(getterMethodName, null);
-                    Object desiredValue = method.invoke(desiredAPI, null);
-                    Object actualValue = method2.invoke(actualAPI, null);
+                    Object desiredValue = method.invoke(desiredAPI,  null);
+                    Object actualValue = method2.invoke(actualAPI,  null);
                     APIPropertyAnnotation property = field.getAnnotation(APIPropertyAnnotation.class);
                     if (desiredValue == null && actualValue == null) continue;
                     if (desiredValue == null && property.ignoreNull()) {
@@ -287,7 +287,7 @@ public boolean isAdminAccountNeeded() throws AppException {
         boolean orgAdminSelfServiceEnabled = APIManagerAdapter.getInstance().getConfigAdapter().getConfig(APIManagerAdapter.getInstance().hasAdminAccount()).getOadminSelfServiceEnabled();
         if (orgAdminSelfServiceEnabled) return false;
         return (!getDesiredAPI().getState().equals(API.STATE_UNPUBLISHED) && !getDesiredAPI().getState().equals(API.STATE_DELETED)) ||
-                (getActualAPI() != null && !getActualAPI().getState().equals(API.STATE_UNPUBLISHED));
+            (getActualAPI() != null && !getActualAPI().getState().equals(API.STATE_UNPUBLISHED));
     }
 
     public String waiting4Approval() throws AppException {

modules/apps/src/main/java/com/axway/apim/appexport/impl/JsonApplicationExporter.java

@@ -118,9 +118,7 @@ public void writeContent(ExportApplication app, ObjectMapper mapper, File localF
         }
     }
     private String getExportFolder(ExportApplication app) {
-        String appName = app.getName();
-        appName = appName.replace(" ", "-");
-        return appName;
+        return Utils.replaceSpecialChars(app.getName());
     }
 
     public static void writeBytesToFile(byte[] bFile, String fileDest) throws AppException {

modules/organizations/src/main/java/com/axway/apim/organization/impl/JsonOrgExporter.java

@@ -99,9 +99,7 @@ public void writeContent(ExportOrganization org, ObjectMapper mapper, File local
     }
 
     private String getExportFolder(ExportOrganization org) {
-        String name = org.getName();
-        name = name.replace(" ", "-");
-        return name;
+        return Utils.replaceSpecialChars(org.getName());
     }
 
     @Override