From b74b7ef614eb3ceb159b4a8f08031410664629d5 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 4 Aug 2010 12:41:09 +0000
Subject: [PATCH] [LMS-1676] fixed tests
SVN: 17340
---
.../systemsx/cisd/openbis/generic/server/ETLServiceTest.java | 4 ++--
.../business/bo/samplelister/SampleListingWorkerTest.java | 3 ---
.../openbis/systemtest/plugin/generic/SampleBrowsingTest.java | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index 901b3a62d4f..6cfc51d8654 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
@@ -341,7 +341,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(sampleTypeDAO).tryFindSampleTypeByCode("MY_TYPE");
SampleTypePE sampleTypePE = new SampleTypePE();
sampleTypePE.setListable(Boolean.TRUE);
- sampleTypePE.setGeneratedFromHierarchyDepth(new Integer(2));
+ sampleTypePE.setGeneratedFromHierarchyDepth(new Integer(1));
sampleTypePE.setContainerHierarchyDepth(new Integer(1));
sampleTypePE.setAutoGeneratedCode(Boolean.FALSE);
sampleTypePE.setSubcodeUnique(Boolean.FALSE);
@@ -351,7 +351,7 @@ public class ETLServiceTest extends AbstractServerTestCase
SampleType sampleType = createService().getSampleType(SESSION_TOKEN, "MY_TYPE");
assertEquals(true, sampleType.isListable());
- assertEquals(2, sampleType.getGeneratedFromHierarchyDepth());
+ assertEquals(1, sampleType.getGeneratedFromHierarchyDepth());
assertEquals(1, sampleType.getContainerHierarchyDepth());
assertEquals(false, sampleType.isAutoGeneratedCode());
context.assertIsSatisfied();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
index 7c3f36c2806..c60e9d9679d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.samplelister;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertTrue;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.longs.LongSet;
@@ -172,7 +171,5 @@ public class SampleListingWorkerTest extends AbstractDAOTest
{
assertNotNull("ID:" + s.getId(), s.getGeneratedFrom());
assertEquals("ID:" + s.getId(), PARENT_ID, s.getGeneratedFrom().getId().longValue());
- assertNotNull("ID:" + s.getId(), s.getGeneratedFrom().getGeneratedFrom());
- assertNull("ID:" + s.getId(), s.getGeneratedFrom().getGeneratedFrom().getGeneratedFrom());
}
}
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 ddd324bd88a..9d9bc99edf0 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
@@ -169,7 +169,7 @@ public class SampleBrowsingTest extends GenericSystemTestCase
assertNotNull(s.getInvalidation());
assertEquals("/CISD/NEMO/EXP1", s.getExperiment().getIdentifier());
assertEquals("CISD:/CISD/3V-123", s.getGeneratedFrom().getIdentifier());
- assertEquals("CISD:/CISD/MP001-1", s.getGeneratedFrom().getGeneratedFrom().getIdentifier());
+ assertNull(s.getGeneratedFrom().getGeneratedFrom());
}
private void checkUserProperty(List<IEntityProperty> properties, String propertyCode,
--
GitLab