From c0edcf92a0e86b0c519773b7b0d9ff0e2c19bbe5 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 29 Sep 2015 08:51:16 +0000
Subject: [PATCH] SSDM-2464: add extra test
SVN: 34728
---
.../sis/openbis/systemtest/api/v3/AbstractTest.java | 13 +++++++++++++
.../openbis/systemtest/api/v3/MapSampleTest.java | 2 ++
2 files changed, 15 insertions(+)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/AbstractTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/AbstractTest.java
index 1bfb2c11f1c..32603fca8c5 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/AbstractTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/AbstractTest.java
@@ -46,6 +46,7 @@ import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.Attachmen
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.attachment.AttachmentCreation;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.history.HistoryEntry;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IAttachmentsHolder;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IModifierHolder;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.interfaces.IParentChildrenHolder;
@@ -426,6 +427,18 @@ public class AbstractTest extends SystemTestCase
});
}
+ protected void assertHistoryNotFetched(final HistoryEntry history)
+ {
+ assertNotFetched(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ history.getAuthor();
+ }
+ });
+ }
+
private void assertNotFetched(final IDelegatedAction action)
{
try
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
index 1094f1a7fb7..41e0d61ca15 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
@@ -1095,6 +1095,8 @@ public class MapSampleTest extends AbstractSampleTest
assertTrue(entry.getValidFrom().before(end));
assertTrue(entry.getValidTo().after(entry.getValidFrom()));
assertTrue(entry.getValidTo().before(end));
+
+ assertHistoryNotFetched(entry);
}
@Test
--
GitLab