Corrected assist function for generating unique identifiers for test.
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 f83bf59..0d4e079 100644
--- a/src/main/java/io/mifos/core/test/env/TestEnvironment.java
+++ b/src/main/java/io/mifos/core/test/env/TestEnvironment.java
@@ -121,10 +121,10 @@
}
//prefix followed by a positive number.
- public String generateUniqueIdentifer(final String prefix, int minimumDigitCount) {
+ public String generateUniqueIdentifer(final String prefix, final int minimumDigitCount) {
uniquenessSuffix++;
- String format = String.format("%%0%dd", minimumDigitCount);
- return String.format(format, uniquenessSuffix);
+ final String format = String.format("%%0%dd", minimumDigitCount);
+ return prefix + String.format(format, uniquenessSuffix);
}
public void setContextPath(final String contextPath) {
diff --git a/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java b/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java
index 19a41af..0073649 100644
--- a/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java
+++ b/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java
@@ -20,6 +20,8 @@
public class TestEnvironmentTest {
+ private static final String UNIQUE_ID_PREFIX = "blah-";
+
public TestEnvironmentTest() {
super();
}
@@ -33,4 +35,22 @@
Assert.assertNotNull(key + " not found.", System.getProperty(key.toString()));
}
}
+
+ @Test
+ public void shouldGenerateUniqueId() {
+ final TestEnvironment testEnvironment = new TestEnvironment("mifosio-core");
+ final String uniqueId = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX);
+ final String uniqueId2 = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX);
+ Assert.assertNotEquals(uniqueId, uniqueId2);
+ Assert.assertTrue(uniqueId.startsWith(UNIQUE_ID_PREFIX));
+ Assert.assertTrue(uniqueId2.startsWith(UNIQUE_ID_PREFIX));
+ }
+
+ @Test
+ public void shouldGenerateZeroBufferedUniqueId() {
+ final TestEnvironment testEnvironment = new TestEnvironment("mifosio-core");
+ final String uniqueId = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX, 5);
+ Assert.assertTrue(uniqueId.startsWith(UNIQUE_ID_PREFIX));
+ Assert.assertEquals(uniqueId.length() - UNIQUE_ID_PREFIX.length(), 5);
+ }
}
