Skip to content
Snippets Groups Projects
Commit 72df8a82 authored by felmer's avatar felmer
Browse files

BIS-292: Bug reproduce, system tests written, bug fixed. 

SVN: 27899
parent c20b8cad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 116 additions and 9 deletions
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+ 3
− 3
View file @ 72df8a82
......@@ -627,20 +627,20 @@ abstract class AbstractBusinessObject implements IDAOFactory
{
return;
}
AttachmentHolderPE actualAttachmentHolder = attachmentHolder;
final IAttachmentDAO dao = getAttachmentDAO();
for (final AttachmentPE attachment : attachments)
{
try
{
dao.createAttachment(attachment, attachmentHolder);
actualAttachmentHolder = dao.createAttachment(attachment, actualAttachmentHolder);
} catch (final DataAccessException e)
{
final String fileName = attachment.getFileName();
throwException(
e,
String.format("Filename '%s' for %s '%s'", fileName,
attachmentHolder.getHolderName(),
attachmentHolder.getIdentifier()));
attachmentHolder.getHolderName(), attachmentHolder.getIdentifier()));
}
}
attachments.clear();
......
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
+ 3
− 1
View file @ 72df8a82
......@@ -44,8 +44,10 @@ public interface IAttachmentDAO extends IGenericDAO<AttachmentPE>
*
* @param attachment The property to register.
* @param owner Owner of the attachment. Should be a persistent object.
* @return the actual owner object to whom the attachment is attached. This either
* <code>owner</code> itself or a copy of it.
*/
public void createAttachment(AttachmentPE attachment, AttachmentHolderPE owner)
public AttachmentHolderPE createAttachment(AttachmentPE attachment, AttachmentHolderPE owner)
throws DataAccessException;
/**
......
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
+ 7
− 5
View file @ 72df8a82
......@@ -20,6 +20,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.orm.hibernate3.HibernateTemplate;
......@@ -75,9 +76,8 @@ final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE> impleme
//
@Override
public final void createAttachment(final AttachmentPE attachment,
final AttachmentHolderPE ownerParam)
throws DataAccessException
public final AttachmentHolderPE createAttachment(final AttachmentPE attachment,
final AttachmentHolderPE ownerParam) throws DataAccessException
{
assert attachment != null : "Unspecified attachment";
assert attachment.getAttachmentContent() != null : "Unspecified attachment content.";
......@@ -89,9 +89,10 @@ final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE> impleme
fillAttachmentData(attachment, previousAttachmentVersionOrNull);
final HibernateTemplate template = getHibernateTemplate();
if (getSession().contains(owner) == false)
Session session = getSession();
if (session.contains(owner) == false)
{
owner = (AttachmentHolderPE) getSession().merge(owner);
owner = (AttachmentHolderPE) session.merge(owner);
}
owner.addAttachment(attachment);
validatePE(attachment);
......@@ -102,6 +103,7 @@ final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE> impleme
{
operationLog.info(String.format("ADD: file attachment '%s'.", attachment));
}
return owner;
}
private void fillAttachmentData(AttachmentPE attachment,
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/perform_entity_operations/RegistrationTest.java
+ 103
− 0
View file @ 72df8a82
......@@ -35,6 +35,8 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.metaproject.Metapro
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.sample.SampleIdentifierId;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Attachment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentWithContent;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
......@@ -42,12 +44,17 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewMetaproject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
import ch.systemsx.cisd.openbis.generic.shared.dto.builders.AtomicEntityOperationDetailsBuilder;
import ch.systemsx.cisd.openbis.generic.shared.dto.builders.SampleUpdatesDTOBuilder;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
import ch.systemsx.cisd.openbis.systemtest.SystemTestCase;
/**
......@@ -55,6 +62,102 @@ import ch.systemsx.cisd.openbis.systemtest.SystemTestCase;
*/
public class RegistrationTest extends SystemTestCase
{
@Test
public void testCreateSampleWithTwoAttachments()
{
AtomicEntityOperationDetailsBuilder builder = new AtomicEntityOperationDetailsBuilder();
NewSample newSample = new NewSample();
SampleType sampleType = new SampleType();
sampleType.setCode("CELL_PLATE");
newSample.setSampleType(sampleType);
newSample.setIdentifier("/TEST-SPACE/S_2_ATT");
NewAttachment attachment1 = new NewAttachment("a/b/1", "Title 1", "Attachment 1");
attachment1.setContent("hello attachment one".getBytes());
NewAttachment attachment2 = new NewAttachment("a/b/2", "Title 2", "Attachment 2");
attachment2.setContent("hello attachment two".getBytes());
List<NewAttachment> attachments = Arrays.asList(attachment1, attachment2);
newSample.setAttachments(attachments);
builder.sample(newSample);
etlService.performEntityOperations(systemSessionToken, builder.getDetails());
Sample sample =
etlService.tryGetSampleWithExperiment(systemSessionToken,
SampleIdentifierFactory.parse(newSample));
AttachmentWithContent a1 =
genericServer.getSampleFileAttachment(systemSessionToken, new TechId(sample), "1",
null);
assertEquals("hello attachment one", new String(a1.getContent()));
}
@Test
public void testCreateSampleWithOneAttachment()
{
AtomicEntityOperationDetailsBuilder builder = new AtomicEntityOperationDetailsBuilder();
NewSample newSample = new NewSample();
SampleType sampleType = new SampleType();
sampleType.setCode("CELL_PLATE");
newSample.setSampleType(sampleType);
newSample.setIdentifier("/TEST-SPACE/S_2_ATT");
NewAttachment attachment1 = new NewAttachment("a/b/1", "Title 1", "Attachment 1");
attachment1.setContent("hello attachment one".getBytes());
List<NewAttachment> attachments = Arrays.asList(attachment1);
newSample.setAttachments(attachments);
builder.sample(newSample);
etlService.performEntityOperations(systemSessionToken, builder.getDetails());
Sample sample =
etlService.tryGetSampleWithExperiment(systemSessionToken,
SampleIdentifierFactory.parse(newSample));
List<Attachment> loadedAttachments =
commonServer.listSampleAttachments(systemSessionToken, new TechId(sample));
assertEquals("Title 1", loadedAttachments.get(0).getTitle());
assertEquals("1", loadedAttachments.get(0).getFileName());
assertEquals(1, loadedAttachments.size());
AttachmentWithContent a1 =
genericServer.getSampleFileAttachment(systemSessionToken, new TechId(sample), "1",
null);
assertEquals("hello attachment one", new String(a1.getContent()));
}
@Test
public void testAddOneAttachmentToAnExistingSample()
{
AtomicEntityOperationDetailsBuilder builder = new AtomicEntityOperationDetailsBuilder();
SampleUpdatesDTOBuilder updateBuilder = new SampleUpdatesDTOBuilder(1);
NewAttachment attachment1 = new NewAttachment("a/b/1", "Title 1", "Attachment 1");
attachment1.setContent("hello attachment one".getBytes());
updateBuilder.attachment(attachment1);
builder.sampleUpdate(updateBuilder.get());
etlService.performEntityOperations(systemSessionToken, builder.getDetails());
AttachmentWithContent a1 =
genericServer.getSampleFileAttachment(systemSessionToken, new TechId(1), "1", null);
assertEquals("hello attachment one", new String(a1.getContent()));
}
@Test
public void testAddTwoAttachmentsToAnExistingSample()
{
AtomicEntityOperationDetailsBuilder builder = new AtomicEntityOperationDetailsBuilder();
SampleUpdatesDTOBuilder updateBuilder = new SampleUpdatesDTOBuilder(1);
NewAttachment attachment1 = new NewAttachment("a/b/1", "Title 1", "Attachment 1");
attachment1.setContent("hello attachment one".getBytes());
NewAttachment attachment2 = new NewAttachment("a/b/2", "Title 2", "Attachment 2");
attachment2.setContent("hello attachment two".getBytes());
updateBuilder.attachment(attachment1);
updateBuilder.attachment(attachment2);
builder.sampleUpdate(updateBuilder.get());
etlService.performEntityOperations(systemSessionToken, builder.getDetails());
AttachmentWithContent a1 =
genericServer.getSampleFileAttachment(systemSessionToken, new TechId(1), "1", null);
assertEquals("hello attachment one", new String(a1.getContent()));
}
@Test
public void testRegistrationOfMetaprojectLinkedToExperimentSampleDataSetAndMaterial()
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment