[fineract-cn-provisioner] 32/50: Minor improvement to parameter validation plus corresponding test.

[myrle]

This is an automated email from the ASF dual-hosted git repository.

myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-provisioner.git

commit a68977ab5d57c1d198ced725414e6a9bb3bea961
Author: myrle-krantz <mkra...@mifos.org>
AuthorDate: Fri May 19 15:29:13 2017 +0200

    Minor improvement to parameter validation plus corresponding test.
---
 .../io/mifos/provisioner/api/v1/domain/Tenant.java |  7 ++--
 .../provisioner/api/v1/domain/TenantTest.java      | 48 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java 
b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
index fc186c7..1cf7ec1 100644
--- a/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
+++ b/api/src/main/java/io/mifos/provisioner/api/v1/domain/Tenant.java
@@ -15,13 +15,14 @@
  */
 package io.mifos.provisioner.api.v1.domain;
 
+import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+
 import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "WeakerAccess"})
 public final class Tenant {
-
-  @NotNull
+  @ValidIdentifier
   private String identifier;
   @NotNull
   private String name;
diff --git 
a/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java 
b/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java
new file mode 100644
index 0000000..ddf87e3
--- /dev/null
+++ b/api/src/test/java/io/mifos/provisioner/api/v1/domain/TenantTest.java
@@ -0,0 +1,48 @@
+package io.mifos.provisioner.api.v1.domain;
+
+import io.mifos.core.test.domain.ValidationTest;
+import io.mifos.core.test.domain.ValidationTestCase;
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * @author Myrle Krantz
+ */
+public class TenantTest extends ValidationTest<Tenant> {
+
+  public TenantTest(ValidationTestCase<Tenant> testCase) {
+    super(testCase);
+  }
+
+  @Override
+  protected Tenant createValidTestSubject() {
+    final Tenant ret = new Tenant();
+    ret.setIdentifier("identifier");
+    ret.setName("bebop-v3");
+    final CassandraConnectionInfo cassandraConnectionInfo = new 
CassandraConnectionInfo();
+    cassandraConnectionInfo.setClusterName("");
+    cassandraConnectionInfo.setContactPoints("");
+    cassandraConnectionInfo.setKeyspace("");
+    cassandraConnectionInfo.setReplicas("");
+    cassandraConnectionInfo.setReplicationType("");
+    ret.setCassandraConnectionInfo(cassandraConnectionInfo);
+    ret.setDatabaseConnectionInfo(new DatabaseConnectionInfo());
+    return ret;
+  }
+
+  @Parameterized.Parameters
+  public static Collection testCases() {
+    final Collection<ValidationTestCase> ret = new ArrayList<>();
+    ret.add(new ValidationTestCase<Tenant>("basicCase")
+            .adjustment(x -> {})
+            .valid(true));
+    ret.add(new ValidationTestCase<Tenant>("invalidIdentifier")
+            .adjustment(x -> 
x.setIdentifier(RandomStringUtils.randomAlphanumeric(33)))
+            .valid(false));
+    return ret;
+  }
+
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
my...@apache.org.