From 260ec56bdc72d7109f2d7ffb7acc16f4a850c73a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 31 Oct 2012 10:29:03 +0000
Subject: [PATCH] SP-347, BIS-178: Fixing test
SVN: 27432
---
.../server/business/AbstractLoaderTestCase.java | 9 ++++++---
.../proteomics/server/business/SampleLoaderTest.java | 7 +++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
index 86e3ade569f..fb4a9bd7133 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
@@ -43,9 +43,6 @@ public abstract class AbstractLoaderTestCase extends AbstractDAOWithoutContextTe
private static final String SESSION_TOKEN = "session-token";
- protected static final Session SESSION = new Session(CommonTestUtils.USER_ID, SESSION_TOKEN,
- PRINCIPAL, "remote-host", 1);
-
protected ICommonBusinessObjectFactory boFactory;
@Autowired
@@ -53,4 +50,10 @@ public abstract class AbstractLoaderTestCase extends AbstractDAOWithoutContextTe
{
this.boFactory = boFactory;
}
+
+ protected Session session()
+ {
+ return new Session(CommonTestUtils.USER_ID, SESSION_TOKEN,
+ PRINCIPAL, "remote-host", 1);
+ }
}
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
index f8267d579ef..1c417ec20eb 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
@@ -25,7 +25,8 @@ import java.util.List;
import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
-import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.SampleLoader;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
*
@@ -39,7 +40,9 @@ public class SampleLoaderTest extends AbstractLoaderTestCase
@Test
public void test()
{
- SampleLoader loader = new SampleLoader(SESSION, daoFactory, boFactory);
+ Session session = session();
+ session.setPerson(new PersonPE());
+ SampleLoader loader = new SampleLoader(session, daoFactory, boFactory);
List<Sample> samples = loader.listSamplesWithParentsByTypeAndSpace("CELL_PLATE", "CISD");
Collections.sort(samples, new Comparator<Sample>()
{
--
GitLab