From 75f907a936c200d9edef231f39808d9a4118bca9 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk@ethz.ch>
Date: Wed, 29 May 2024 15:39:04 +0200
Subject: [PATCH] BIS-736 : external data table for AFS : fix tests
---
.../systemtest/asapi/v3/AbstractTest.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
index 972d9eced25..f175859aa6a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
@@ -983,8 +983,8 @@ public class AbstractTest extends SystemTestCase
PropertyHistoryEntry relationEntry = (PropertyHistoryEntry) entry;
assertEquals(relationEntry.getPropertyName(), propertyName);
assertEquals(relationEntry.getPropertyValue(), propertyValue);
- assertEquals(relationEntry.getValidFrom(), validFrom);
- assertEquals(relationEntry.getValidTo(), validTo);
+ assertEqualsDate(relationEntry.getValidFrom(), validFrom);
+ assertEqualsDate(relationEntry.getValidTo(), validTo);
}
protected void assertRelationshipHistory(HistoryEntry entry, IObjectId id, IRelationType type)
@@ -999,8 +999,8 @@ public class AbstractTest extends SystemTestCase
RelationHistoryEntry relationEntry = (RelationHistoryEntry) entry;
assertEquals(relationEntry.getRelatedObjectId(), id);
assertEquals(relationEntry.getRelationType(), type);
- assertEquals(relationEntry.getValidFrom(), validFrom);
- assertEquals(relationEntry.getValidTo(), validTo);
+ assertEqualsDate(relationEntry.getValidFrom(), validFrom);
+ assertEqualsDate(relationEntry.getValidTo(), validTo);
}
protected Map<String, Attachment> assertAttachments(Collection<Attachment> attachments, AttachmentCreation... expectedAttachments)
@@ -1045,7 +1045,13 @@ public class AbstractTest extends SystemTestCase
protected void assertEqualsDate(Date actualDate, Date expectedDate)
{
- assertEquals(createTimestampFormat().format(actualDate), createTimestampFormat().format(expectedDate));
+ if (actualDate != null && expectedDate != null)
+ {
+ assertEquals(createTimestampFormat().format(actualDate), createTimestampFormat().format(expectedDate));
+ } else
+ {
+ assertEquals(actualDate, expectedDate);
+ }
}
private SimpleDateFormat createTimestampFormat()
--
GitLab