Skip to content
Snippets Groups Projects
Commit 0c61ed4e authored by gpawel's avatar gpawel
Browse files

[LMS-2421] fixing unit test

SVN: 22302
parent 962ada5a
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
package ch.systemsx.cisd.openbis.systemtest.plugin.generic; package ch.systemsx.cisd.openbis.systemtest.plugin.generic;
import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.fail; import static org.testng.AssertJUnit.fail;
import java.util.List; import java.util.List;
...@@ -64,15 +63,15 @@ public class SampleDetailsTest extends GenericSystemTestCase ...@@ -64,15 +63,15 @@ public class SampleDetailsTest extends GenericSystemTestCase
private static final String CONTROL_LAYOUT_EXAMPLE = "CL1"; private static final String CONTROL_LAYOUT_EXAMPLE = "CL1";
private static final String CELL_PLATE_EXAMPLE = "3VCP1"; private static final String CELL_PLATE_EXAMPLE = "3VCP5";
private static final String CELL_PLATE_EXAMPLE_ID = CISD_ID_PREFIX + CELL_PLATE_EXAMPLE; private static final String CELL_PLATE_EXAMPLE_ID = CISD_ID_PREFIX + CELL_PLATE_EXAMPLE;
private static final String CELL_PLATE_EXAMPLE_EXPERIMENT_ID = "/CISD/NEMO/EXP1"; private static final String CELL_PLATE_EXAMPLE_EXPERIMENT_ID = "/CISD/NEMO/EXP10";
private static final String CONTROL_LAYOUT_EXAMPLE_PERM_ID = "200811050919915-8"; private static final String CONTROL_LAYOUT_EXAMPLE_PERM_ID = "200811050919915-8";
private static final String CELL_PLATE_EXAMPLE_PERM_ID = "200811050946559-983"; private static final String CELL_PLATE_EXAMPLE_PERM_ID = "200811050946559-979";
private static final String CONTROL_LAYOUT_EXAMPLE_PERMLINK = StringEscapeUtils private static final String CONTROL_LAYOUT_EXAMPLE_PERMLINK = StringEscapeUtils
.escapeHtml(String.format(PERMLINK_TEMPLATE, CONTROL_LAYOUT_EXAMPLE_PERM_ID)); .escapeHtml(String.format(PERMLINK_TEMPLATE, CONTROL_LAYOUT_EXAMPLE_PERM_ID));
...@@ -120,8 +119,7 @@ public class SampleDetailsTest extends GenericSystemTestCase ...@@ -120,8 +119,7 @@ public class SampleDetailsTest extends GenericSystemTestCase
checkUserProperty(sDetails.getProperties(), "DESCRIPTION", "test control layout"); checkUserProperty(sDetails.getProperties(), "DESCRIPTION", "test control layout");
} }
@Test(groups = "broken") @Test
// FIXME LMS-2421
public void testGetCellPlateDetails() public void testGetCellPlateDetails()
{ {
logIntoCommonClientService(); logIntoCommonClientService();
...@@ -155,13 +153,9 @@ public class SampleDetailsTest extends GenericSystemTestCase ...@@ -155,13 +153,9 @@ public class SampleDetailsTest extends GenericSystemTestCase
.getIdentifier()); .getIdentifier());
assertEquals(CELL_PLATE_EXAMPLE_EXPERIMENT_ID, sDetails.getExperiment().getIdentifier()); assertEquals(CELL_PLATE_EXAMPLE_EXPERIMENT_ID, sDetails.getExperiment().getIdentifier());
assertEquals("Doe", sDetails.getDeletion().getRegistrator().getLastName());
assertEquals("wrong-code", sDetails.getDeletion().getReason());
assertEquals(1, sDetails.getParents().size()); assertEquals(1, sDetails.getParents().size());
final Sample parent = sDetails.getParents().iterator().next(); final Sample parent = sDetails.getParents().iterator().next();
assertEquals("3V-123", parent.getCode()); assertEquals("3V-125", parent.getCode());
assertNotNull(parent.getDeletion());
assertEquals(sListed.getProperties().size(), sDetails.getProperties().size()); assertEquals(sListed.getProperties().size(), sDetails.getProperties().size());
......
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