You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/06/18 22:08:38 UTC
[airavata] branch develop updated: AIRAVATA-3328 Fix broken tests
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 2b33fda AIRAVATA-3328 Fix broken tests
2b33fda is described below
commit 2b33fda08b2d93348e1e86c8e17f20b386302446
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 18 18:08:14 2020 -0400
AIRAVATA-3328 Fix broken tests
---
.../registry/core/entities/appcatalog/GatewayGroupsEntity.java | 2 +-
.../core/repositories/replicacatalog/DataProductRepositoryTest.java | 3 ++-
.../repositories/replicacatalog/DataReplicaLocationRepositoryTest.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
index 53d2400..ec7f9f7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GatewayGroupsEntity.java
@@ -44,7 +44,7 @@ public class GatewayGroupsEntity implements Serializable {
@Column(name = "DEFAULT_GATEWAY_USERS_GROUP_ID")
private String defaultGatewayUsersGroupId;
- protected GatewayGroupsEntity() {
+ public GatewayGroupsEntity() {
}
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java
index 75b182d..2e191c7 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java
@@ -132,7 +132,8 @@ public class DataProductRepositoryTest extends TestBase {
assertEquals(1, retrievedDataProductModel1.getReplicaLocationsSize());
DataReplicaLocationModel retrievedReplicaLocationModel1 = retrievedDataProductModel1.getReplicaLocations().get(0);
assertEquals(productUri1, retrievedReplicaLocationModel1.getProductUri());
- assertFalse(retrievedReplicaLocationModel1.isSetValidUntilTime());
+ // validUntilTime has a default value
+ assertEquals(0, retrievedReplicaLocationModel1.getValidUntilTime());
dataProductRepository.removeDataProduct(productUri1);
assertFalse(dataProductRepository.isDataProductExists(productUri1));
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java
index 2784733..0082473 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java
@@ -89,7 +89,8 @@ public class DataReplicaLocationRepositoryTest extends TestBase {
DataReplicaLocationModel retrievedDataReplicaLocationModel = dataReplicaLocationRepository.getReplicaLocation(replicaId1);
assertTrue(retrievedDataReplicaLocationModel.getReplicaMetadata().size() == 2);
assertEquals(retrievedDataReplicaLocationModel.getReplicaPersistentType(), testDataReplicaLocationModel1.getReplicaPersistentType());
- assertFalse(retrievedDataReplicaLocationModel.isSetValidUntilTime());
+ // validUntilTime has a default value
+ assertEquals(0, retrievedDataReplicaLocationModel.getValidUntilTime());
testDataProductModel.setReplicaLocations(Arrays.asList(testDataReplicaLocationModel1, testDataReplicaLocationModel2));
dataProductRepository.updateDataProduct(testDataProductModel);