From eb2a37099650285552f110eb74915dda9b0c5800 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 16 Dec 2010 10:16:17 +0000
Subject: [PATCH] [LMS-1921] fixed openbis tests
SVN: 19189
---
.../cisd/openbis/generic/shared/dto/SampleTypePE.java | 10 +++++-----
.../screening/server/logic/ScreeningApiImplTest.java | 8 +++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
index 1d06c76bf82..08245e1c842 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
@@ -62,15 +62,15 @@ public final class SampleTypePE extends EntityTypePE
// NOTE: Should be objects in order to allow Hibernate to find SampleType by example.
//
- private Boolean listable = true;
+ private Boolean listable;
- private Integer generatedFromHierarchyDepth = 0;
+ private Integer generatedFromHierarchyDepth;
- private Integer containerHierarchyDepth = 0;
+ private Integer containerHierarchyDepth;
- private Boolean subcodeUnique = false;
+ private Boolean subcodeUnique;
- private Boolean autoGeneratedCode = false;
+ private Boolean autoGeneratedCode;
private String generatedCodePrefix;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
index 04d32cd52ad..e472a198e6f 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImplTest.java
@@ -403,7 +403,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
{
SamplePE sample = new SamplePE();
sample.setId(1L);
- sample.setSampleType(new SampleTypePE());
+ final SampleTypePE sampleType = new SampleTypePE();
+ sampleType.setContainerHierarchyDepth(1);
+ sampleType.setGeneratedFromHierarchyDepth(1);
+ sampleType.setListable(false);
+ sampleType.setAutoGeneratedCode(false);
+ sampleType.setSubcodeUnique(false);
+ sample.setSampleType(sampleType);
return sample;
}
--
GitLab