Merge branch 'develop' of https://github.com/mifosio/test into develop
diff --git a/src/main/java/io/mifos/core/test/env/ExtraProperties.java b/src/main/java/io/mifos/core/test/env/ExtraProperties.java
new file mode 100644
index 0000000..e327e20
--- /dev/null
+++ b/src/main/java/io/mifos/core/test/env/ExtraProperties.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 The Mifos Initiative.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.core.test.env;
+
+import java.util.Hashtable;
+
+/**
+ * @author Myrle Krantz
+ */
+@SuppressWarnings("WeakerAccess")
+public class ExtraProperties extends Hashtable<String, String> {
+ @SuppressWarnings("unused")
+ public synchronized String setProperty (String key, String value ) {
+ return put(key, value);
+ }
+}
diff --git a/src/main/java/io/mifos/core/test/env/TestEnvironment.java b/src/main/java/io/mifos/core/test/env/TestEnvironment.java
index 6e27da6..dc6e352 100644
--- a/src/main/java/io/mifos/core/test/env/TestEnvironment.java
+++ b/src/main/java/io/mifos/core/test/env/TestEnvironment.java
@@ -122,6 +122,12 @@
populate();
}
+ public TestEnvironment addProperties(final ExtraProperties properties) {
+ properties.entrySet().forEach(x -> setProperty(x.getKey(), x.getValue()));
+
+ return this;
+ }
+
public String generateUniqueIdentifer(final String prefix) {
return generateUniqueIdentifer(prefix, 1);
}
@@ -213,7 +219,7 @@
this.properties.setProperty(FLYWAY_ENABLED_PROPERTY, FLYWAY_ENABLED_DEFAULT);
this.properties.setProperty(HYSTRIX_ENABLED_PROPERTY, HYSTRIX_ENABLED_DEFAULT);
this.properties.setProperty(RIBBON_USES_EUREKA_PROPERTY, RIBBON_USES_EUREKA_DEFAULT);
- this.properties.setProperty(springApplicationName + "." + RIBBON_LIST_OF_SERVERS_PROPERTY, RIBBON_SERVER_DEFAULT + ":" + SERVER_PORT_DEFAULT);
+ this.properties.setProperty(RIBBON_LIST_OF_SERVERS_PROPERTY, RIBBON_SERVER_DEFAULT + ":" + SERVER_PORT_DEFAULT);
this.keyPairHolder = RsaKeyPairFactory.createKeyPair();
