diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java index af439024ef27298f2d9a6b26f6b7754f16949c68..67c1c6ad6570d4765145cbaef1ed91a00980eeea 100644 --- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java +++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java @@ -1011,36 +1011,6 @@ public class CreateExperimentTest extends AbstractExperimentTest assertEquals(experiment2.getProperties().size(), 2); } - @Test - public void testCreateWithMetaData() - { - // Given - String sessionToken = v3api.login(TEST_USER, PASSWORD); - PropertyTypePermId propertyType = createAPropertyType(sessionToken, DataType.BOOLEAN); - EntityTypePermId experimentType = createAnExperimentType(sessionToken, true, propertyType, PLATE_GEOMETRY); - - ExperimentCreation creation = new ExperimentCreation(); - creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY"); - creation.setTypeId(experimentType); - creation.setProjectId(new ProjectIdentifier("/CISD/NEMO")); - creation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24"); - creation.setBooleanProperty(propertyType.getPermId(), true); - creation.setMetaData(Map.of("key", "value")); - - // When - List<ExperimentPermId> experimentIds = v3api.createExperiments(sessionToken, Arrays.asList(creation)); - - // Then - assertEquals(experimentIds.size(), 1); - ExperimentFetchOptions fetchOptions = new ExperimentFetchOptions(); - fetchOptions.withProperties(); - fetchOptions.withSampleProperties(); - Experiment experiment2 = v3api.getExperiments(sessionToken, experimentIds, fetchOptions).get(experimentIds.get(0)); - assertEquals(experiment2.getProperties().get(PLATE_GEOMETRY.getPermId()), "384_WELLS_16X24"); - assertEquals(experiment2.getBooleanProperty(propertyType.getPermId()).booleanValue(), true); - assertEquals(experiment2.getMetaData(), Map.of("key", "value")); - } - @Test(dataProvider = USER_ROLES_PROVIDER) public void testCreateWithDifferentRoles(RoleWithHierarchy role) { diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java index 97d4924bfb45ff52dca4e7cc9778b5e203d9f133..0bd1b6aeff7875dd3a5f2523d0de4e85729d6459 100644 --- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java +++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java @@ -15,12 +15,9 @@ */ package ch.ethz.sis.openbis.systemtest.asapi.v3; -import static org.testng.Assert.assertEquals; - import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import org.testng.annotations.Test; @@ -97,19 +94,4 @@ public class CreateExperimentTypeTest extends CreateEntityTypeTest<ExperimentTyp "create-experiment-types NEW_EXPERIMENT_TYPES('[ExperimentTypeCreation[code=LOG_TEST_1], ExperimentTypeCreation[code=LOG_TEST_2]]')"); } - @Test - public void testCreateWithMetaData() { - String sessionToken = v3api.login(TEST_USER, PASSWORD); - - ExperimentTypeCreation creation = new ExperimentTypeCreation(); - creation.setCode("META_DATA_CODE_1"); - creation.setMetaData(Map.of("key", "value")); - - v3api.createExperimentTypes(sessionToken, Arrays.asList(creation)); - - ExperimentType type = getType(sessionToken, "META_DATA_CODE_1"); - - assertEquals(type.getMetaData(), Map.of("key", "value")); - } - }