From 4326868ddff468675d940077dd008efdc73aa466 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Wed, 15 Apr 2015 07:58:06 +0000
Subject: [PATCH] Test case showing a bug reported in "SSDM-1773: V3 AS API -
data set types returned by mapDataSets are incorrect"
SVN: 33834
---
.../systemtest/api/v3/MapDataSetTest.java | 27 ++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
index 1444955ee63..77af034be68 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
@@ -170,21 +170,22 @@ public class MapDataSetTest extends AbstractDataSetTest
v3api.logout(sessionToken);
}
- @Test
+ @Test(enabled=false)
public void testMapWithType()
{
String sessionToken = v3api.login(TEST_USER, PASSWORD);
DataSetPermId permId = new DataSetPermId("20081105092159111-1");
+ DataSetPermId permId2 = new DataSetPermId("ROOT_CONTAINER");
DataSetFetchOptions fetchOptions = new DataSetFetchOptions();
fetchOptions.withType();
Map<IDataSetId, DataSet> map =
- v3api.mapDataSets(sessionToken, Arrays.asList(permId),
+ v3api.mapDataSets(sessionToken, Arrays.asList(permId, permId2),
fetchOptions);
- assertEquals(map.size(), 1);
+ assertEquals(map.size(), 2);
DataSet dataSet = map.get(permId);
@@ -204,6 +205,26 @@ public class MapDataSetTest extends AbstractDataSetTest
assertModifierNotFetched(dataSet);
assertRegistratorNotFetched(dataSet);
assertTagsNotFetched(dataSet);
+
+ DataSet dataSet2 = map.get(permId2);
+
+ assertEquals(dataSet2.getType().getCode(), "CONTAINER_TYPE");
+ assertEquals(dataSet2.getType().getPermId().getPermId(), "CONTAINER_TYPE");
+ assertEquals(dataSet2.getType().getDescription(), "A container (virtual) data set type");
+ assertEquals(dataSet2.getType().getKind(), DataSetKind.CONTAINER);
+
+ assertExternalDataNotFetched(dataSet2);
+ assertExperimentNotFetched(dataSet2);
+ assertSampleNotFetched(dataSet2);
+ assertPropertiesNotFetched(dataSet2);
+ assertParentsNotFetched(dataSet2);
+ assertChildrenNotFetched(dataSet2);
+ assertContainedNotFetched(dataSet2);
+ assertContainersNotFetched(dataSet2);
+ assertModifierNotFetched(dataSet2);
+ assertRegistratorNotFetched(dataSet2);
+ assertTagsNotFetched(dataSet2);
+
v3api.logout(sessionToken);
}
--
GitLab