This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/group-based-auth by this push:
new 9596987 AIRAVATA-2799 Map GatewayApprovalStatus enum as string
9596987 is described below
commit 95969875f02b7e650eb326b17e6447b0ea61a298
Author: Marcus Christie <[email protected]>
AuthorDate: Mon Jun 4 09:45:36 2018 -0400
AIRAVATA-2799 Map GatewayApprovalStatus enum as string
---
.../airavata/registry/core/entities/expcatalog/GatewayEntity.java | 1 +
.../registry/core/repositories/expcatalog/GatewayRepositoryTest.java | 3 +++
2 files changed, 4 insertions(+)
diff --git
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
index 391f31d..07eff13 100644
---
a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
+++
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
@@ -48,6 +48,7 @@ public class GatewayEntity implements Serializable {
private String emailAddress;
@Column(name = "GATEWAY_APPROVAL_STATUS")
+ @Enumerated(EnumType.STRING)
private GatewayApprovalStatus gatewayApprovalStatus;
@Column(name = "GATEWAY_ACRONYM")
diff --git
a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java
b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java
index 12a7090..4585b43 100644
---
a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java
+++
b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java
@@ -21,6 +21,7 @@
package org.apache.airavata.registry.core.repositories.expcatalog;
import org.apache.airavata.model.workspace.Gateway;
+import org.apache.airavata.model.workspace.GatewayApprovalStatus;
import
org.apache.airavata.registry.core.repositories.expcatalog.util.Initialize;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.registry.cpi.RegistryException;
@@ -64,6 +65,7 @@ public class GatewayRepositoryTest {
gateway.setGatewayId(testGatewayId);
gateway.setDomain("SEAGRID");
gateway.setEmailAddress("[email protected]");
+ gateway.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED);
String gatewayId = gatewayRepository.addGateway(gateway);
assertEquals(testGatewayId, gatewayId);
@@ -73,6 +75,7 @@ public class GatewayRepositoryTest {
Gateway retrievedGateway = gatewayRepository.getGateway(gatewayId);
assertEquals(gateway.getGatewayAdminFirstName(),
retrievedGateway.getGatewayAdminFirstName());
+ assertEquals(GatewayApprovalStatus.APPROVED,
gateway.getGatewayApprovalStatus());
assertTrue(gatewayRepository.getAllGateways().size() == 1);
--
To stop receiving notification emails like this one, please contact
[email protected].
