From a639eb6cf13731b75c85a25181d8f3001e65f2f3 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 9 Jul 2010 09:04:18 +0000
Subject: [PATCH] [LMS-1625] changed derived samples section expectations
SVN: 16953
---
.../application/sample/DerivedSamplesSection.java | 6 ++++++
.../application/sample/GenericSampleViewerTest.java | 10 +++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
index 9743717fc8a..bc589b4ff02 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
@@ -45,6 +45,12 @@ public class DerivedSamplesSection extends DisposableSectionPanel
this.parent = parent;
}
+ // @Private
+ static String createGridId(TechId containerId)
+ {
+ return SampleBrowserGrid.createGridId(createBrowserId(containerId));
+ }
+
private static String createBrowserId(TechId parentId)
{
return ID_PREFIX + parentId + "-browser";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
index a58023daa96..9d5365c7010 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
@@ -106,8 +106,12 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
".*<a href=\".*permId=" + CELL_PLATE_EXAMPLE_PERM_ID + ".*>"
+ CELL_PLATE_EXAMPLE_PERM_ID + "</a>.*");
checkSample.property("Sample Type").asCode("CELL_PLATE");
- checkSample.property("Children Samples").asGeneratedSamples("3VRP1A [REINFECT_PLATE]",
- "3VRP1B [REINFECT_PLATE]");
+ // TODO 2010-07-09, Piotr Buczek: test Parent column
+ final CheckTableCommand childrenTable = checkSample.childrenTable().expectedSize(2);
+ childrenTable.expectedRow(new SampleRow("3VRP1A", "REINFECT_PLATE").identifier("CISD",
+ "CISD"));
+ childrenTable.expectedRow(new SampleRow("3VRP1B", "REINFECT_PLATE").identifier("CISD",
+ "CISD"));
checkSample.property("Invalidation").by(new IValueAssertion<Invalidation>()
{
public void assertValue(final Invalidation invalidation)
@@ -124,7 +128,7 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
final CheckTableCommand dataTable = checkSample.dataTable().expectedSize(1);
dataTable.expectedRow(new DataSetRow(DIRECTLY_CONNECTED_DATA_SET_CODE).invalid()
.withFileFormatType("TIFF"));
- dataTable.expectedColumnsNumber(23);
+ dataTable.expectedColumnsNumber(25);
final String commentColIdent = GridTestUtils.getPropertyColumnIdentifier("COMMENT", false);
dataTable.expectedColumnHidden(commentColIdent, true);
--
GitLab