From 6c6ab307cdc10632710e4250d80f73f7b7d81c63 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 17 Apr 2012 11:11:11 +0000
Subject: [PATCH] LMS-2879: revert translator changes and update tests to
relect fixture changes
SVN: 24926
---
.../generic/shared/translator/DataSetTypeTranslator.java | 3 ---
.../generic/shared/translator/ExperimentTypeTranslator.java | 3 ---
.../generic/shared/translator/MaterialTypeTranslator.java | 2 --
.../generic/shared/translator/SampleTypeTranslator.java | 2 --
.../business/bo/samplelister/SampleListingQueryTest.java | 6 +++---
.../systemtest/plugin/generic/SampleBrowsingTest.java | 5 +++--
6 files changed, 6 insertions(+), 15 deletions(-)
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 d0d2eb0171d..c69776d8a85 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 20a5d9a36dc..8b30a5b097a 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 26ef9e82868..987ef3b28c3 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 ce5a5c0f3c8..1ea23dde138 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 4ef782c2349..8d8339c4f87 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 880c7eea53d..36aad72f6c6 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();
--
GitLab