From 0078118582e79984c0c45f6827f55f82611b30f4 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 10 Aug 2010 17:18:44 +0000
Subject: [PATCH] [LMS-1676] system test fix
SVN: 17388
---
.../sample/FillSampleRegistrationForm.java | 12 ++++++------
.../sample/GenericSampleRegistrationTest.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
index 34d26032b54..cda3209fc3f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
@@ -49,7 +49,7 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
private final List<PropertyField> properties;
- private String parent;
+ private String parentsOrNull;
private String container;
@@ -62,9 +62,9 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
this.properties = new ArrayList<PropertyField>();
}
- public final FillSampleRegistrationForm parent(final String parentFieldValue)
+ public final FillSampleRegistrationForm parents(final String parents)
{
- this.parent = parentFieldValue;
+ this.parentsOrNull = parents;
return this;
}
@@ -96,12 +96,12 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
+ GroupSelectionWidget.SUFFIX + FORM_ID);
GWTUtils.setSelectedItem(groupSelector, ModelDataPropertyNames.CODE, groupNameOrNull);
- if (StringUtils.isBlank(parent) == false)
+ if (StringUtils.isBlank(parentsOrNull) == false)
{
final SampleChooserField parentField =
(SampleChooserField) GWTTestUtil.getWidgetWithID(FORM_ID
- + GenericSampleRegistrationForm.ID_SUFFIX_PARENT);
- parentField.setValue(parent);
+ + ParentSamplesArea.ID_SUFFIX_PARENT_SAMPLES);
+ parentField.setValue(parentsOrNull);
}
if (StringUtils.isBlank(container) == false)
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index 15cb62cb379..c45101a85cc 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
@@ -122,7 +122,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
final String sampleTypeCode = DILUTION_PLATE;
loginAndPreprareRegistration(sampleTypeCode);
remoteConsole.prepare(new FillSampleRegistrationForm("CISD", sampleCode)
- .parent("MP1-MIXED"));
+ .parents("MP1-MIXED"));
remoteConsole.prepare(new InvokeActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_BROWSE));
remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(sampleCode
--
GitLab