diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index caa1b97a2c5d810a3967badea366ff0de59f175c..626d5b852a92d542e56acd178baeaef5eb4b18d5 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -378,7 +378,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createSpaceBO(SESSION);
+ one(commonBusinessObjectFactory).createSpaceBO(session);
will(returnValue(groupBO));
one(groupBO).define(groupCode, description);
@@ -576,7 +576,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDatasetLister(SESSION);
+ one(commonBusinessObjectFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleTechId(sampleId, showOnlyDirectlyConnected);
@@ -614,7 +614,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDatasetLister(SESSION);
+ one(commonBusinessObjectFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listByExperimentTechId(experimentId, true);
will(returnValue(Arrays.asList(externalData)));
@@ -646,7 +646,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createExperimentTable(SESSION);
+ one(commonBusinessObjectFactory).createExperimentTable(session);
will(returnValue(experimentTable));
one(experimentTable).load(experimentType.getCode(), projectIdentifier, false,
@@ -711,7 +711,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createPropertyTypeTable(SESSION);
+ one(commonBusinessObjectFactory).createPropertyTypeTable(session);
will(returnValue(propertyTypeTable));
one(propertyTypeTable).loadWithRelations();
@@ -871,7 +871,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createMaterialTable(SESSION);
+ one(commonBusinessObjectFactory).createMaterialTable(session);
will(returnValue(materialTable));
one(materialTable).deleteByTechIds(materialIds, reason);
@@ -933,7 +933,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createPropertyTypeBO(SESSION);
+ one(commonBusinessObjectFactory).createPropertyTypeBO(session);
will(returnValue(propertyTypeBO));
one(propertyTypeBO).define(with(aNonNull(PropertyType.class)));
@@ -951,7 +951,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createVocabularyBO(SESSION);
+ one(commonBusinessObjectFactory).createVocabularyBO(session);
will(returnValue(vocabularyBO));
one(vocabularyBO).define(with(aNonNull(NewVocabulary.class)));
@@ -972,7 +972,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createVocabularyBO(SESSION);
+ one(commonBusinessObjectFactory).createVocabularyBO(session);
will(returnValue(vocabularyBO));
one(vocabularyBO).loadDataByTechId(vocabularyId);
@@ -997,7 +997,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createVocabularyBO(SESSION);
+ one(commonBusinessObjectFactory).createVocabularyBO(session);
will(returnValue(vocabularyBO));
one(vocabularyBO).loadDataByTechId(vocabularyId);
@@ -1020,7 +1020,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypeBO(SESSION);
+ one(commonBusinessObjectFactory).createEntityTypeBO(session);
will(returnValue(entityTypeBO));
one(entityTypeBO).define(type);
@@ -1072,7 +1072,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypeBO(SESSION);
+ one(commonBusinessObjectFactory).createEntityTypeBO(session);
will(returnValue(entityTypeBO));
one(entityTypeBO).define(type);
@@ -1124,7 +1124,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypeBO(SESSION);
+ one(commonBusinessObjectFactory).createEntityTypeBO(session);
will(returnValue(entityTypeBO));
one(entityTypeBO).define(type);
@@ -1176,7 +1176,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypeBO(SESSION);
+ one(commonBusinessObjectFactory).createEntityTypeBO(session);
will(returnValue(entityTypeBO));
one(entityTypeBO).define(type);
@@ -1238,7 +1238,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(SESSION,
+ one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(session,
DtoConverters.convertEntityKind(entityKind));
will(returnValue(entityTypePropertyTypeBO));
@@ -1261,7 +1261,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(SESSION,
+ one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(session,
DtoConverters.convertEntityKind(entityKind));
will(returnValue(entityTypePropertyTypeBO));
@@ -1286,7 +1286,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(SESSION,
+ one(commonBusinessObjectFactory).createEntityTypePropertyTypeBO(session,
DtoConverters.convertEntityKind(entityKind));
will(returnValue(entityTypePropertyTypeBO));
@@ -1316,7 +1316,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createMaterialLister(SESSION);
+ one(commonBusinessObjectFactory).createMaterialLister(session);
will(returnValue(materialLister));
one(materialLister).list(criteria, true);
@@ -1362,7 +1362,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).loadByDataSetCodes(dataSetCodes, false, false);
@@ -1372,9 +1372,9 @@ public final class CommonServerTest extends AbstractServerTestCase
DataPE ds3 = createDataSet("ds3", "type2");
will(returnValue(Arrays.asList(ds1, ds2, ds3)));
- one(dataSetTypeSlaveServerPlugin).permanentlyDeleteDataSets(SESSION,
+ one(dataSetTypeSlaveServerPlugin).permanentlyDeleteDataSets(session,
Arrays.asList(ds1, ds2), reason, false, false);
- one(dataSetTypeSlaveServerPlugin).permanentlyDeleteDataSets(SESSION,
+ one(dataSetTypeSlaveServerPlugin).permanentlyDeleteDataSets(session,
Arrays.asList(ds3), reason, false, false);
}
});
@@ -1395,7 +1395,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDeletedDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDeletedDataSetTable(session);
will(returnValue(deletedDataSetTable));
one(deletedDataSetTable).loadByDataSetCodes(dataSetCodes);
@@ -1419,7 +1419,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).loadByDataSetCodes(dataSetCodes, false, false);
@@ -1433,7 +1433,7 @@ public final class CommonServerTest extends AbstractServerTestCase
List<DataPE> dataSets = Arrays.asList(ds1, ds2, ds3);
will(returnValue(dataSets));
- one(commonBusinessObjectFactory).createTrashBO(SESSION);
+ one(commonBusinessObjectFactory).createTrashBO(session);
will(returnValue(trashBO));
one(trashBO).createDeletion(reason);
one(trashBO).trashDataSets(TechId.createList(dataSets));
@@ -1455,7 +1455,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).loadByDataSetCodes(dataSetCodes, true, false);
@@ -1477,7 +1477,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).loadByDataSetCodes(dataSetCodes, false, true);
@@ -1498,7 +1498,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDataSetTable(SESSION);
+ one(commonBusinessObjectFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).loadByDataSetCodes(dataSetCodes, false, true);
@@ -1634,7 +1634,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createExperimentBO(SESSION);
+ one(commonBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).loadByExperimentIdentifier(experimentIdentifier);
@@ -1664,7 +1664,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createDeletionTable(SESSION);
+ one(commonBusinessObjectFactory).createDeletionTable(session);
will(returnValue(deletionTable));
one(deletionTable).load(true);
@@ -1688,7 +1688,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createSampleTable(SESSION);
+ one(commonBusinessObjectFactory).createSampleTable(session);
will(returnValue(sampleTable));
one(sampleTable).deleteByTechIds(sampleIds, reason);
}
@@ -1708,7 +1708,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createTrashBO(SESSION);
+ one(commonBusinessObjectFactory).createTrashBO(session);
will(returnValue(trashBO));
one(trashBO).createDeletion(reason);
one(trashBO).trashSamples(sampleIds);
@@ -1729,7 +1729,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createExperimentBO(SESSION);
+ one(commonBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).deleteByTechIds(experimentIds, reason);
}
@@ -1749,7 +1749,7 @@ public final class CommonServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(commonBusinessObjectFactory).createTrashBO(SESSION);
+ one(commonBusinessObjectFactory).createTrashBO(session);
will(returnValue(trashBO));
one(trashBO).createDeletion(reason);
one(trashBO).trashExperiments(experimentIds);
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 3ed107bcdaea9b0bf11dc6a482f973eb3724970d..e6b46d08d604ade0120db62894237ec0feffde14 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
@@ -126,7 +126,7 @@ public class ETLServiceTest extends AbstractServerTestCase
private static final int PORT = 443;
- private static final String URL = "http://" + SESSION.getRemoteHost() + ":" + PORT;
+ private static final String URL = "http://remote-host:" + PORT;
private ICommonBusinessObjectFactory boFactory;
@@ -163,7 +163,7 @@ public class ETLServiceTest extends AbstractServerTestCase
store.setCode(DSS_CODE);
will(returnValue(store));
- one(boFactory).createDatasetLister(SESSION);
+ one(boFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listByDataStore(DSS_ID);
@@ -219,7 +219,7 @@ public class ETLServiceTest extends AbstractServerTestCase
store.setCode(DSS_CODE);
will(returnValue(store));
- one(boFactory).createDatasetLister(SESSION);
+ one(boFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listAllDataSetShareIdsByDataStore(DSS_ID);
@@ -673,7 +673,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).define(sample);
@@ -699,7 +699,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).define(sample);
@@ -730,7 +730,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).define(sample);
@@ -888,7 +888,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).define(sample);
@@ -899,7 +899,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(personDAO).tryFindPersonByUserId(CommonTestUtils.USER_ID);
will(returnValue(new PersonPE()));
- one(boFactory).createDataBO(SESSION);
+ one(boFactory).createDataBO(session);
will(returnValue(dataBO));
one(dataBO).define(externalData, samplePE, SourceType.MEASUREMENT);
@@ -944,7 +944,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).update(sample);
@@ -952,7 +952,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(sampleBO).getSample();
will(returnValue(samplePE));
- one(boFactory).createDataBO(SESSION);
+ one(boFactory).createDataBO(session);
will(returnValue(dataBO));
one(dataBO).define(externalData, samplePE, SourceType.MEASUREMENT);
@@ -1064,12 +1064,12 @@ public class ETLServiceTest extends AbstractServerTestCase
will(returnValue(materialType));
one(entityOperationChecker)
- .assertMaterialCreationAllowed(SESSION, newMaterials);
+ .assertMaterialCreationAllowed(session, newMaterials);
List<NewMaterial> newMaterialsList = newMaterials.values().iterator().next();
one(propertiesBatchManager).manageProperties(materialType, newMaterialsList,
null);
- one(boFactory).createMaterialTable(SESSION);
+ one(boFactory).createMaterialTable(session);
will(returnValue(materialTable));
one(materialTable).add(newMaterialsList, materialType);
@@ -1084,26 +1084,26 @@ public class ETLServiceTest extends AbstractServerTestCase
{
{
List<NewSample> sampleList = Arrays.asList(newSample);
- one(entityOperationChecker).assertSpaceSampleCreationAllowed(SESSION,
+ one(entityOperationChecker).assertSpaceSampleCreationAllowed(session,
sampleList);
- one(boFactory).createSampleTable(SESSION);
+ one(boFactory).createSampleTable(session);
will(returnValue(sampleTable));
one(sampleTable).prepareForRegistration(sampleList, null);
one(sampleTable).save();
- one(boFactory).createSampleTable(SESSION);
+ one(boFactory).createSampleTable(session);
will(returnValue(sampleTable));
List<SampleUpdatesDTO> sampleUpdateList = Arrays.asList(sampleUpdate);
- one(entityOperationChecker).assertSpaceSampleUpdateAllowed(SESSION,
+ one(entityOperationChecker).assertSpaceSampleUpdateAllowed(session,
sampleUpdateList);
one(sampleTable).checkBeforeUpdate(sampleUpdateList);
one(sampleTable).prepareForUpdateWithSampleUpdates(sampleUpdateList);
one(sampleTable).save();
- one(entityOperationChecker).assertDataSetCreationAllowed(SESSION,
+ one(entityOperationChecker).assertDataSetCreationAllowed(session,
Arrays.asList(externalData));
}
});
@@ -1142,10 +1142,10 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createDataSetTable(SESSION);
+ one(boFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
- one(entityOperationChecker).assertDataSetUpdateAllowed(SESSION,
+ one(entityOperationChecker).assertDataSetUpdateAllowed(session,
Arrays.asList(dataSetUpdate));
one(dataSetTable).checkBeforeUpdate(Arrays.asList(dataSetUpdate));
one(dataSetTable).update(Arrays.asList(dataSetUpdate));
@@ -1239,7 +1239,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleLister(SESSION);
+ one(boFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(hibernateSearchDAO).searchForEntityIds(
@@ -1280,7 +1280,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(sampleIdentifier);
@@ -1291,7 +1291,7 @@ public class ETLServiceTest extends AbstractServerTestCase
sample.setExperiment(experiment);
will(returnValue(sample));
- one(boFactory).createDataBO(SESSION);
+ one(boFactory).createDataBO(session);
will(returnValue(dataBO));
one(dataBO).define(externalData, sample, sourceType);
@@ -1333,7 +1333,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).tryToLoadBySampleIdentifier(identifier);
@@ -1352,7 +1352,7 @@ public class ETLServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleBO(SESSION);
+ one(boFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(identifier);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
index 434a738a1dfe951d2c0d17e548a841016bc16e11..023755fa857a6da73d52fd2142e29efdee1bfe22 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
@@ -396,7 +396,7 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleLister(SESSION);
+ one(boFactory).createSampleLister(session);
will(returnValue(sampleLister));
exactly(numberOfSearches).of(hibernateSearchDAO).searchForEntityIds(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
index 2eb627c755c15c6a82cf4db33bfa864634059d35..50d3de4f59c5bfa4bad36690eb51f66b4198db47 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
@@ -102,8 +102,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
protected static final String SESSION_TOKEN = "session-token";
- protected static final Session SESSION = new Session(CommonTestUtils.USER_ID, SESSION_TOKEN,
- PRINCIPAL, "remote-host", 1);
+ protected Session session;
protected BufferedAppender logRecorder;
@@ -208,6 +207,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
public void setUp()
{
LogInitializer.init();
+ session = createSession();
logRecorder = new BufferedAppender("%m%n", Level.DEBUG);
context = new Mockery();
authenticationService = context.mock(IAuthenticationService.class);
@@ -323,7 +323,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
{
{
allowing(sessionManager).getSession(SESSION_TOKEN);
- will(returnValue(SESSION));
+ will(returnValue(session));
allowing(daoFactory).getPersistencyResources();
will(returnValue(new PersistencyResources(null, null, null, null)));
@@ -428,4 +428,9 @@ public abstract class AbstractServerTestCase extends AssertJUnit
return externalData;
}
+ protected Session createSession()
+ {
+ return new Session(CommonTestUtils.USER_ID, SESSION_TOKEN, PRINCIPAL, "remote-host", 1);
+ }
+
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
index adeca504ee2307f6291473e81774640cc6032a46..f0e2d3793944557c4d0c1625d391585161963016 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
@@ -170,7 +170,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createSampleBO(SESSION);
+ one(genericBusinessObjectFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).define(newSample);
@@ -197,7 +197,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).loadDataByTechId(experimentId);
@@ -280,7 +280,7 @@ public final class GenericServerTest extends AbstractServerTestCase
one(sampleTypeDAO).tryFindSampleTypeByCode(sampleTypePE.getCode());
will(returnValue(sampleTypePE));
- one(sampleTypeSlaveServerPlugin).registerSamples(SESSION, newSamples, null);
+ one(sampleTypeSlaveServerPlugin).registerSamples(session, newSamples, null);
one(propertiesBatchManager).manageProperties(sampleTypePE, newSamples, null);
}
@@ -309,7 +309,7 @@ public final class GenericServerTest extends AbstractServerTestCase
one(sampleTypeDAO).tryFindSampleTypeByCode(sampleTypePE.getCode());
will(returnValue(sampleTypePE));
- one(sampleTypeSlaveServerPlugin).registerSamples(SESSION, newSamples, null);
+ one(sampleTypeSlaveServerPlugin).registerSamples(session, newSamples, null);
one(propertiesBatchManager).manageProperties(sampleTypePE, newSamples, null);
}
@@ -326,7 +326,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).define(newExperiment);
@@ -369,7 +369,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).define(newExperiment);
@@ -378,12 +378,12 @@ public final class GenericServerTest extends AbstractServerTestCase
allowing(experimentBO).getExperiment();
will(returnValue(experimentPE));
- one(genericBusinessObjectFactory).createSampleBO(SESSION);
+ one(genericBusinessObjectFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(sampleIdentifier1);
one(sampleBO).setExperiment(experimentPE);
- one(genericBusinessObjectFactory).createSampleBO(SESSION);
+ one(genericBusinessObjectFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(sampleIdentifier2WithGroup);
one(sampleBO).setExperiment(experimentPE);
@@ -412,7 +412,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).define(newExperiment);
@@ -465,7 +465,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).define(newExperiment);
@@ -476,11 +476,11 @@ public final class GenericServerTest extends AbstractServerTestCase
one(sampleTypeDAO).tryFindSampleTypeByCode(sampleTypePE.getCode());
will(returnValue(sampleTypePE));
- one(sampleTypeSlaveServerPlugin).registerSamples(SESSION, newSamples, null);
+ one(sampleTypeSlaveServerPlugin).registerSamples(session, newSamples, null);
one(propertiesBatchManager).manageProperties(sampleTypePE, newSamples, null);
- one(genericBusinessObjectFactory).createSampleBO(SESSION);
+ one(genericBusinessObjectFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(
SampleIdentifierFactory.parse(createSampleIdentifier(spaceCode,
@@ -520,7 +520,7 @@ public final class GenericServerTest extends AbstractServerTestCase
one(entityTypeDAO).tryToFindEntityTypeByCode(typeCode);
will(returnValue(materialTypePE));
- one(genericBusinessObjectFactory).createMaterialTable(SESSION);
+ one(genericBusinessObjectFactory).createMaterialTable(session);
will(returnValue(materialTable));
one(materialTable).add(newMaterials, materialTypePE);
@@ -668,7 +668,7 @@ public final class GenericServerTest extends AbstractServerTestCase
if (doNotUpdate == false)
{
- one(genericBusinessObjectFactory).createMaterialTable(SESSION);
+ one(genericBusinessObjectFactory).createMaterialTable(session);
will(returnValue(materialTable));
one(materialTable).update(updates);
@@ -743,7 +743,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createSampleBO(SESSION);
+ one(genericBusinessObjectFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).update(updates);
@@ -778,7 +778,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(genericBusinessObjectFactory).createExperimentBO(SESSION);
+ one(genericBusinessObjectFactory).createExperimentBO(session);
will(returnValue(experimentBO));
one(experimentBO).update(updates);
@@ -816,7 +816,7 @@ public final class GenericServerTest extends AbstractServerTestCase
will(returnValue(experimentTypePE));
one(propertiesBatchManager).manageProperties(experimentTypePE, experiments,
null);
- one(genericBusinessObjectFactory).createExperimentTable(SESSION);
+ one(genericBusinessObjectFactory).createExperimentTable(session);
will(returnValue(experimentTable));
one(experimentTable).prepareForUpdate(
with(new BaseMatcher<List<ExperimentBatchUpdatesDTO>>()
@@ -925,7 +925,7 @@ public final class GenericServerTest extends AbstractServerTestCase
will(returnValue(entityTypeDAO));
one(entityTypeDAO).tryToFindEntityTypeByCode(EXPERIMENT_TYPE);
will(returnValue(experimentTypePE));
- one(genericBusinessObjectFactory).createExperimentTable(SESSION);
+ one(genericBusinessObjectFactory).createExperimentTable(session);
will(returnValue(experimentTable));
one(experimentTable).add(entities, experimentTypePE);
one(experimentTable).save();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
index bab65020934216a5a039d35b0da79fd8ea2628d2..7de88c8dee6224bb6ddc1bbd1bb4bf474428ec08 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
@@ -92,14 +92,14 @@ public class QueryApiServerTest extends AbstractServerTestCase
will(returnValue(SESSION_TOKEN));
one(sessionManager).getSession(SESSION_TOKEN);
- will(returnValue(SESSION));
+ will(returnValue(session));
PersonPE person = new PersonPE();
person.setUserId("Albert");
person.setRoleAssignments(new HashSet<RoleAssignmentPE>(Arrays
.asList(new RoleAssignmentPE())));
person.setActive(true);
- one(personDAO).tryFindPersonByUserId(SESSION.getUserName());
+ one(personDAO).tryFindPersonByUserId(session.getUserName());
will(returnValue(person));
one(queryServer).initDatabases(SESSION_TOKEN);
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java
index 05d74ca9b1307b7e7a5a5337e964dfb91fad5723..1f9f512a43e0902356e8532527d052a36a27144c 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java
@@ -85,10 +85,10 @@ public class PhosphoNetXServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- allowing(boFactory).createProteinDetailsBO(SESSION);
+ allowing(boFactory).createProteinDetailsBO(session);
will(returnValue(proteinDetailsBO));
- allowing(boFactory).createProteinRelatedSampleTable(SESSION);
+ allowing(boFactory).createProteinRelatedSampleTable(session);
will(returnValue(proteinRelatedSampleTable));
}
});
@@ -115,10 +115,10 @@ public class PhosphoNetXServerTest extends AbstractServerTestCase
one(proteinDAO).listAbundanceRelatedSamplePermIDsByExperiment(EXPERIMENT_PERM_ID);
will(returnValue(mockDataSet));
- one(boFactory).createAbundanceColumnDefinitionTable(SESSION);
+ one(boFactory).createAbundanceColumnDefinitionTable(session);
will(returnValue(abundanceColumnDefinitionTable));
- one(boFactory).createSampleProvider(SESSION);
+ one(boFactory).createSampleProvider(session);
will(returnValue(sampleProvider));
one(sampleProvider).loadByExperimentID(EXPERIMENT_ID);
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalTest.java
index f1532772255314b6f665e726e3c614367b23936a..e6b444dcd0fa46638fe8d85bbc8f61fb66c04e46 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalTest.java
@@ -112,7 +112,7 @@ public class ProteomicsDataServiceInternalTest extends AbstractServerTestCase
group.setDatabaseInstance(databaseInstance);
roleAssignment.setSpace(group);
person.setRoleAssignments(Collections.singleton(roleAssignment));
- SESSION.setPerson(person);
+ session.setPerson(person);
}
@Test
@@ -133,7 +133,7 @@ public class ProteomicsDataServiceInternalTest extends AbstractServerTestCase
{
prepareGetSession();
HashMap<String, String> parameterBindings = new HashMap<String, String>();
- prepareProcessDataSets(SESSION, parameterBindings, "ds1", "ds2");
+ prepareProcessDataSets(session, parameterBindings, "ds1", "ds2");
service.processDataSets(SESSION_TOKEN, COPY_PROCESSING_KEY, Arrays.asList("ds1", "ds2"));
@@ -350,7 +350,7 @@ public class ProteomicsDataServiceInternalTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(boFactory).createSampleLoader(SESSION);
+ one(boFactory).createSampleLoader(session);
will(returnValue(sampleLoader));
one(sampleLoader).listSamplesWithParentsByTypeAndSpace(
@@ -395,7 +395,7 @@ public class ProteomicsDataServiceInternalTest extends AbstractServerTestCase
}
}
- one(commonBoFactory).createDatasetLister(SESSION);
+ one(commonBoFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listAllDataSetsFor(filteredSamples);
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbundanceColumnDefinitionTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbundanceColumnDefinitionTableTest.java
index 35b26eda62a86d74d7da07b5d1ddcd1b9097a88a..f51d0c03fe501ca6d711b638cc313687e8ee412e 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbundanceColumnDefinitionTableTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbundanceColumnDefinitionTableTest.java
@@ -54,7 +54,7 @@ public class AbundanceColumnDefinitionTableTest extends AbstractServerTestCase
{
super.setUp();
phosphoNetXDAOFactory = context.mock(IPhosphoNetXDAOFactory.class);
- table = new AbundanceColumnDefinitionTable(daoFactory, phosphoNetXDAOFactory, SESSION);
+ table = new AbundanceColumnDefinitionTable(daoFactory, phosphoNetXDAOFactory, session);
}
@Test
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java
index 00702afb6343b18c4c624bce8aab20b2fc212e57..f96d353305ad8c9a63ebaab91347744c77cc4141 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java
@@ -76,7 +76,7 @@ public class ProteinInfoTableTest extends AbstractBOTestCase
{
super.setUp();
sampleProvider = context.mock(ISampleProvider.class);
- table = new ProteinInfoTable(daoFactory, specificDAOFactory, SESSION, sampleProvider);
+ table = new ProteinInfoTable(daoFactory, specificDAOFactory, session, sampleProvider);
definitions = new ArrayList<AbundanceColumnDefinition>();
definitions.add(create(SAMPLE_ID_1, SAMPLE_ID_2));
definitions.add(create(SAMPLE_ID_3));
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java
index 8bba9b0753f2aed1a87e7289c423a209fdb4fe5d..260a87bb28bd52e36dba2829c636b29e779234db 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java
@@ -60,7 +60,7 @@ public class ProteinSummaryTableTest extends AbstractServerTestCase
super.setUp();
specificDAOFactory = context.mock(IPhosphoNetXDAOFactory.class);
proteinDAO = context.mock(IProteinQueryDAO.class);
- table = new ProteinSummaryTable(daoFactory, specificDAOFactory, SESSION);
+ table = new ProteinSummaryTable(daoFactory, specificDAOFactory, session);
}
@Test
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
index 6477f787c8cb521b16a412abe49d100aa016e2d2..0a5c1a9dd7bc19f95d2a4172f1b4058766bd38b3 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
@@ -101,7 +101,7 @@ public class ScreeningServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleBO(SESSION);
+ one(screeningBOFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySamplePermId(PERM_ID);
@@ -129,7 +129,7 @@ public class ScreeningServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleBO(SESSION);
+ one(screeningBOFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ExperimentFeatureVectorSummaryLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ExperimentFeatureVectorSummaryLoaderTest.java
index 8b00bb59509df7b495269e96e17094bef4e1e551..833c5db175b07cc14803cf799abbe0e829004f64 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ExperimentFeatureVectorSummaryLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ExperimentFeatureVectorSummaryLoaderTest.java
@@ -263,7 +263,7 @@ public class ExperimentFeatureVectorSummaryLoaderTest extends AbstractServerTest
private ExperimentFeatureVectorSummaryLoader createLoaderWithoutCalculation()
{
- return new ExperimentFeatureVectorSummaryLoaderWithNoCalculation(SESSION,
+ return new ExperimentFeatureVectorSummaryLoaderWithNoCalculation(session,
screeningBOFactory, daoFactory, screeningQuery, materialSummarySettings);
}
@@ -290,7 +290,7 @@ public class ExperimentFeatureVectorSummaryLoaderTest extends AbstractServerTest
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createDatasetLister(SESSION);
+ one(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listByExperimentTechId(EXPERIMENT_ID, true);
@@ -305,7 +305,7 @@ public class ExperimentFeatureVectorSummaryLoaderTest extends AbstractServerTest
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createDataSetTable(SESSION);
+ one(screeningBOFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).createReportFromDatasets(reportingPluginKey, DATA_STORE_CODE,
@@ -321,7 +321,7 @@ public class ExperimentFeatureVectorSummaryLoaderTest extends AbstractServerTest
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createDataSetTable(SESSION);
+ one(screeningBOFactory).createDataSetTable(session);
will(returnValue(dataSetTable));
one(dataSetTable).createReportFromDatasets(reportingPluginKey, DATA_STORE_CODE,
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
index a4fa06f959c94ac99a595b448a11429c96657530..c378a643ff4984f9e91a97d8dd666ef6bd6d2c4a 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/FeatureVectorDatasetLoaderTest.java
@@ -77,9 +77,9 @@ public class FeatureVectorDatasetLoaderTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
- allowing(screeningBOFactory).createDatasetLister(SESSION);
+ allowing(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(sampleLister).list(with(recordingCriteriaMatcher));
@@ -105,7 +105,7 @@ public class FeatureVectorDatasetLoaderTest extends AbstractServerTestCase
new HashSet<PlateIdentifier>(Arrays.<PlateIdentifier> asList(new PlateIdentifier(
"P1", "S", "s-1")));
FeatureVectorDatasetLoader loader =
- new FeatureVectorDatasetLoader(SESSION, screeningBOFactory, null, plateIdentifiers);
+ new FeatureVectorDatasetLoader(session, screeningBOFactory, null, plateIdentifiers);
List<ExternalData> datasets =
new ArrayList<ExternalData>(loader.getFeatureVectorDatasets());
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
index 1fb5d455fd16b95ece84a87bbbbc3c9aa401485e..8a5344af3b60dbc6394e7b287a693126fa6b1e6b 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/HCSImageDatasetLoaderTest.java
@@ -102,9 +102,9 @@ public class HCSImageDatasetLoaderTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
- allowing(screeningBOFactory).createDatasetLister(SESSION);
+ allowing(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(sampleLister).list(with(recordingCriteriaMatcher));
@@ -130,7 +130,7 @@ public class HCSImageDatasetLoaderTest extends AbstractServerTestCase
new HashSet<PlateIdentifier>(Arrays.<PlateIdentifier> asList(new PlateIdentifier(
"P1", "S", "s-1")));
HCSImageDatasetLoader loader =
- new HCSImageDatasetLoader(SESSION, screeningBOFactory, null, plateIdentifiers);
+ new HCSImageDatasetLoader(session, screeningBOFactory, null, plateIdentifiers);
List<ImageDatasetReference> references = loader.getSegmentationImageDatasetReferences();
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 aaa7aa32b537ca00ad45fba2b35c4ea55656ace9..30ef51705d04e0aad8e12d737aac22ac9bd33bc0 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
@@ -77,7 +77,7 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
public void beforeMethod()
{
screeningBOFactory = context.mock(IScreeningBusinessObjectFactory.class);
- screeningApi = new ScreeningApiImpl(SESSION, screeningBOFactory, daoFactory);
+ screeningApi = new ScreeningApiImpl(session, screeningBOFactory, daoFactory);
}
@Test
@@ -92,13 +92,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleBO(SESSION);
+ one(screeningBOFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySampleIdentifier(SampleIdentifierFactory.parse(identifier));
one(sampleBO).getSample();
will(returnValue(plate));
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(listerCriteria));
Sample w1 = createWellSample("w1", "A01");
@@ -128,13 +128,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleBO(SESSION);
+ one(screeningBOFactory).createSampleBO(session);
will(returnValue(sampleBO));
one(sampleBO).loadBySamplePermId(permId);
one(sampleBO).getSample();
will(returnValue(plate));
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(listerCriteria));
Sample w1 = createWellSample("w1", "A01");
@@ -165,13 +165,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, "384_WELLS_16X24");
will(returnValue(Arrays.asList(p1)));
- one(screeningBOFactory).createDatasetLister(SESSION);
+ one(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleIds(with(asSet(1)));
will(returnValue(Arrays.asList(imageDataSet(p1, "1", 1),
@@ -199,13 +199,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, "384_WELLS_16X24");
will(returnValue(Arrays.asList(p1)));
- one(screeningBOFactory).createDatasetLister(SESSION);
+ one(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleIds(with(asSet(1)));
will(returnValue(Arrays.asList(imageRawDataSet(p1, "1", 1),
@@ -239,13 +239,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, "384_WELLS_16X24");
will(returnValue(Arrays.asList(p1)));
- allowing(screeningBOFactory).createDatasetLister(SESSION);
+ allowing(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleIds(with(asSet(1)));
final ExternalData rawImage = imageRawDataSet(p1, "2", 2);
@@ -293,13 +293,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, null);
will(returnValue(Arrays.asList(p1)));
- one(screeningBOFactory).createDatasetLister(SESSION);
+ one(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleIds(with(asSet(1)));
will(returnValue(Arrays.asList(imageDataSet(p1, "1", 1))));
@@ -353,13 +353,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, "384_WELLS_16X24");
will(returnValue(Arrays.asList(p1)));
- exactly(2).of(screeningBOFactory).createDatasetLister(SESSION);
+ exactly(2).of(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
long imageDatasetId = 1;
one(datasetLister).listBySampleIds(
@@ -410,13 +410,13 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(screeningBOFactory).createSampleLister(SESSION);
+ one(screeningBOFactory).createSampleLister(session);
will(returnValue(sampleLister));
one(sampleLister).list(with(any(ListOrSearchSampleCriteria.class)));
Sample p1 = plateSample(pi1, plateGeometry);
will(returnValue(Arrays.asList(p1)));
- one(screeningBOFactory).createDatasetLister(SESSION);
+ one(screeningBOFactory).createDatasetLister(session);
will(returnValue(datasetLister));
one(datasetLister).listBySampleIds(with(asSet(1)));
will(returnValue(Arrays.asList(imageDataSet(p1, "1", 1))));