From 73eca2fb0eeb4ea9540c10b83d7982146826b191 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Fri, 5 Aug 2011 14:07:50 +0000
Subject: [PATCH] LMS-2440 Fixing broken tests.
SVN: 22357
---
.../generic/server/dataaccess/db/ExperimentDAOTest.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
index a25e1abcc22..301835128cf 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
@@ -312,9 +312,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
assertEquals(rowsInAttachmentContents - 1, countRowsInTable(ATT_CONTENTS_TABLE));
}
- // @Test(expectedExceptions = DataIntegrityViolationException.class)
- @Test(groups = "broken-deletion")
- // FIXME LMS-2440
+ @Test(expectedExceptions = DataIntegrityViolationException.class)
public final void testDeleteFailWithDataSets()
{
final IExperimentDAO experimentDAO = daoFactory.getExperimentDAO();
@@ -330,7 +328,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
daoFactory.getExperimentDAO().createOrUpdateExperiment(experiment);
final ExperimentPE deletedExperiment = findExperiment("/CISD/DEFAULT/EXP-13");
- final ExternalDataPE dataSet = findExternalData("20081105092158673-1");
+ final ExternalDataPE dataSet = findExternalData("20110805092359990-17");
dataSet.setExperiment(deletedExperiment);
daoFactory.getDataDAO().validateAndSaveUpdatedEntity(dataSet);
--
GitLab