Skip to content
Snippets Groups Projects
Commit 713b74c6 authored by felmer's avatar felmer
Browse files

SE-182 RawDataService refactored. copyRawData() introduced, implemented, and unit tested.

SVN: 14149
parent f6ce18d0
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ import ch.systemsx.cisd.openbis.generic.server.business.bo.materiallister.IMater ...@@ -46,6 +46,7 @@ import ch.systemsx.cisd.openbis.generic.server.business.bo.materiallister.IMater
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataSetTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataSetTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExperimentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExperimentDAO;
...@@ -157,6 +158,8 @@ public abstract class AbstractServerTestCase extends AssertJUnit ...@@ -157,6 +158,8 @@ public abstract class AbstractServerTestCase extends AssertJUnit
protected IDatasetLister datasetLister; protected IDatasetLister datasetLister;
protected IDataStoreDAO dataStoreDAO;
@BeforeMethod @BeforeMethod
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void setUp() public void setUp()
...@@ -184,6 +187,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit ...@@ -184,6 +187,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
fileFormatDAO = context.mock(IFileFormatTypeDAO.class); fileFormatDAO = context.mock(IFileFormatTypeDAO.class);
dataSetTypeDAO = context.mock(IDataSetTypeDAO.class); dataSetTypeDAO = context.mock(IDataSetTypeDAO.class);
vocabularyDAO = context.mock(IVocabularyDAO.class); vocabularyDAO = context.mock(IVocabularyDAO.class);
dataStoreDAO = context.mock(IDataStoreDAO.class);
// BO // BO
groupBO = context.mock(IGroupBO.class); groupBO = context.mock(IGroupBO.class);
entityTypeBO = context.mock(IEntityTypeBO.class); entityTypeBO = context.mock(IEntityTypeBO.class);
...@@ -230,6 +234,8 @@ public abstract class AbstractServerTestCase extends AssertJUnit ...@@ -230,6 +234,8 @@ public abstract class AbstractServerTestCase extends AssertJUnit
will(returnValue(fileFormatDAO)); will(returnValue(fileFormatDAO));
allowing(daoFactory).getDataSetTypeDAO(); allowing(daoFactory).getDataSetTypeDAO();
will(returnValue(dataSetTypeDAO)); will(returnValue(dataSetTypeDAO));
allowing(daoFactory).getDataStoreDAO();
will(returnValue(dataStoreDAO));
} }
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment