Code Review
/
aai
/
model-loader.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Handle non-obfuscated config
[aai/model-loader.git]
/
src
/
test
/
java
/
org
/
onap
/
aai
/
modelloader
/
config
/
TestModelLoaderConfig.java
diff --git
a/src/test/java/org/onap/aai/modelloader/config/TestModelLoaderConfig.java
b/src/test/java/org/onap/aai/modelloader/config/TestModelLoaderConfig.java
index
bfd793a
..
5243ac5
100644
(file)
--- a/
src/test/java/org/onap/aai/modelloader/config/TestModelLoaderConfig.java
+++ b/
src/test/java/org/onap/aai/modelloader/config/TestModelLoaderConfig.java
@@
-78,6
+78,9
@@
public class TestModelLoaderConfig {
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_PASSWORD, password);
assertEquals(password, config.getPassword());
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_PASSWORD, password);
assertEquals(password, config.getPassword());
+
+ config = createUnobfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_PASSWORD, password);
+ assertEquals(password, config.getPassword());
}
@Test
}
@Test
@@
-86,6
+89,9
@@
public class TestModelLoaderConfig {
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getKeyStorePassword());
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getKeyStorePassword());
+
+ config = createUnobfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD, password);
+ assertEquals(password, config.getKeyStorePassword());
}
@Test
}
@Test
@@
-94,6
+100,9
@@
public class TestModelLoaderConfig {
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_AUTHENTICATION_PASSWORD, password);
assertEquals(password, config.getAaiAuthenticationPassword());
ModelLoaderConfig config =
createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_AUTHENTICATION_PASSWORD, password);
assertEquals(password, config.getAaiAuthenticationPassword());
+
+ config = createUnobfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_AUTHENTICATION_PASSWORD, password);
+ assertEquals(password, config.getAaiAuthenticationPassword());
}
@Test
}
@Test
@@
-101,6
+110,9
@@
public class TestModelLoaderConfig {
String password = "myvoiceismypassword";
ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getAaiKeyStorePassword());
String password = "myvoiceismypassword";
ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getAaiKeyStorePassword());
+
+ config = createUnobfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_KEYSTORE_PASSWORD, password);
+ assertEquals(password, config.getAaiKeyStorePassword());
}
@Test
}
@Test
@@
-117,6
+129,9
@@
public class TestModelLoaderConfig {
String password = "babelpassword";
ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_BABEL_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getBabelKeyStorePassword());
String password = "babelpassword";
ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_BABEL_KEYSTORE_PASSWORD, password);
assertEquals(password, config.getBabelKeyStorePassword());
+
+ config = createUnobfuscatedTestConfig(ModelLoaderConfig.PROP_BABEL_KEYSTORE_PASSWORD, password);
+ assertEquals(password, config.getBabelKeyStorePassword());
}
@Test
}
@Test
@@
-190,4
+205,10
@@
public class TestModelLoaderConfig {
props.put(propertyName, Password.obfuscate(propertyValue));
return new ModelLoaderConfig(props, null);
}
props.put(propertyName, Password.obfuscate(propertyValue));
return new ModelLoaderConfig(props, null);
}
+
+ private ModelLoaderConfig createUnobfuscatedTestConfig(String propertyName, String propertyValue) {
+ Properties props = new Properties();
+ props.put(propertyName, propertyValue);
+ return new ModelLoaderConfig(props, null);
+ }
}
}