diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java index d0d2eb0171d48ced871003b1770dfa77e79ddaad..c69776d8a85dccb97ca1dca8894486a9492580cc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java @@ -25,7 +25,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType; import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE; import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE; -import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; /** * Translates {@link DataSetTypePE} to {@link DataSetType}. @@ -52,8 +51,6 @@ public class DataSetTypeTranslator result.setDatabaseInstance(DatabaseInstanceTranslator.translate(entityTypeOrNull .getDatabaseInstance())); - // used for checking of dynamic properties assignment in dropboxes - HibernateUtils.initialize(entityTypeOrNull.getDataSetTypePropertyTypes()); result.setDataSetTypePropertyTypes(EntityType .sortedInternally(DataSetTypePropertyTypeTranslator.translate( entityTypeOrNull.getDataSetTypePropertyTypes(), result, cacheOrNull))); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java index 20a5d9a36dc2214c6234cc0af9fe53d03afa5a93..8b30a5b097ad9213fcb5c474c93b2fcd6f05dfc2 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java @@ -25,7 +25,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE; import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE; -import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; /** * @author Franz-Josef Elmer @@ -39,8 +38,6 @@ public class ExperimentTypeTranslator result.setCode(experimentTypePE.getCode()); result.setDescription(experimentTypePE.getDescription()); - // used for checking of dynamic properties assignment in dropboxes - HibernateUtils.initialize(experimentTypePE.getExperimentTypePropertyTypes()); result.setExperimentTypePropertyTypes(EntityType .sortedInternally(ExperimentTypePropertyTypeTranslator.translate( experimentTypePE.getExperimentTypePropertyTypes(), result, cachedOrNull))); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java index 26ef9e8286892bb55457fc9feb9ba4b6e6a9fe14..987ef3b28c3e9654f53143daafbd09f37c22438a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java @@ -61,8 +61,6 @@ public class MaterialTypeTranslator unsetMaterialTypes(entityTypeOrNull.getMaterialTypePropertyTypes()); } - // used for checking of dynamic properties assignment in dropboxes - HibernateUtils.initialize(entityTypeOrNull.getMaterialTypePropertyTypes()); result.setMaterialTypePropertyTypes(EntityType .sortedInternally(MaterialTypePropertyTypeTranslator.translate( entityTypeOrNull.getMaterialTypePropertyTypes(), result, cacheOrNull))); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java index ce5a5c0f3c8b95872cf8894ae405e752dc0d3e18..1ea23dde13839fc5a10a5b9ec36d4f000157e0ea 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java @@ -53,8 +53,6 @@ public class SampleTypeTranslator result.setAutoGeneratedCode(sampleTypePE.isAutoGeneratedCode()); result.setGeneratedCodePrefix(sampleTypePE.getGeneratedCodePrefix()); - // used for checking of dynamic properties assignment in dropboxes - HibernateUtils.initialize(sampleTypePE.getSampleTypePropertyTypes()); result.setSampleTypePropertyTypes(EntityType .sortedInternally(SampleTypePropertyTypeTranslator.translate( sampleTypePE.getSampleTypePropertyTypes(), result, cacheOrNull))); diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java index 4ef782c2349a85132eb83544b8fb551e3a83f35e..8d8339c4f87fde3a652893de99cab0dbe751ade2 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java @@ -143,7 +143,7 @@ public class SampleListingQueryTest extends AbstractDAOTest @Test public void testSampleCount() { - assertEquals(692, query.getSampleCount(dbInstanceId)); // without deleted + assertEquals(693, query.getSampleCount(dbInstanceId)); // without deleted } @Test @@ -266,7 +266,7 @@ public class SampleListingQueryTest extends AbstractDAOTest assertTrue(msg, EqualsBuilder.reflectionEquals(sample, sample2)); ++sampleCount; } - assertEquals(30, sampleCount); // without deleted + assertEquals(31, sampleCount); // without deleted } @Test @@ -322,7 +322,7 @@ public class SampleListingQueryTest extends AbstractDAOTest assertNotNull(msg, sample.expe_id); ++sampleCount; } - assertEquals(15, sampleCount); // without deleted + assertEquals(16, sampleCount); // without deleted } @Test diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java index 880c7eea53d5ea0c9054c0621356aa28e82d7623..36aad72f6c6a004bac7f46868f6b7155ca8f2e95 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java @@ -70,12 +70,13 @@ public class SampleBrowsingTest extends GenericSystemTestCase ResultSetWithEntityTypes<Sample> samples = commonClientService.listSamples(new ListSampleDisplayCriteria(listCriteria)); - assertEquals(30, samples.getResultSet().getTotalLength()); + assertEquals(31, samples.getResultSet().getTotalLength()); List<BasicEntityType> availableEntityTypes = new ArrayList<BasicEntityType>(); availableEntityTypes.addAll(samples.getAvailableEntityTypes()); Collections.sort(availableEntityTypes, new ToStringComparator()); - assertEquals("[CELL_PLATE, CONTROL_LAYOUT, DILUTION_PLATE, MASTER_PLATE, REINFECT_PLATE]", + assertEquals( + "[CELL_PLATE, CONTROL_LAYOUT, DILUTION_PLATE, DYNAMIC_PLATE, MASTER_PLATE, REINFECT_PLATE]", availableEntityTypes.toString()); GridRowModels<Sample> list = samples.getResultSet().getList();