Skip to content

Commit 680d396

Browse files
labkey-jeckelslabkey-jeckels
committed
Update input element names
1 parent 15153b8 commit 680d396

35 files changed

Lines changed: 250 additions & 238 deletions

‎src/org/labkey/test/WebDriverWrapper.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,15 +2708,6 @@ public String getFormElement(WebElement el)
27082708
return el.getDomProperty("value");
27092709
}
27102710

2711-
/**
2712-
* @deprecated Use {@link org.junit.Assert#assertEquals(String, Object, Object) and {@link #getFormElement(Locator)}}
2713-
*/
2714-
@Deprecated
2715-
public void assertFormElementEquals(Locator loc, String value)
2716-
{
2717-
assertEquals(value, getFormElement(loc));
2718-
}
2719-
27202711
/**
27212712
* @deprecated Use {@link org.junit.Assert#assertEquals(String, Object, Object)} and
27222713
* {@link #getSelectedOptionText(Locator)}

‎src/org/labkey/test/tests/AssayExportImportTest.java‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
@BaseWebDriverTest.ClassTimeout(minutes = 10)
6969
public class AssayExportImportTest extends BaseWebDriverTest
7070
{
71+
public static final String INSTRUMENT_SETTING_FIELD_NAME = "instrumentSetting";
72+
public static final String RUN_FILE_FIELD_NAME = "runFileField";
73+
public static final String OPERATOR_EMAIL_FIELD_NAME = "operatorEmail";
74+
public static final String INSTRUMENT_FIELD_NAME = "instrument";
7175
private final String ASSAY_PROJECT_FOR_EXPORT_01 = "Assay_Project_For_Export_ByFilesWebPart";
7276
private final String ASSAY_PROJECT_FOR_IMPORT_01 = "Assay_Project_For_Import_ByFilesWebPart";
7377
private final String ASSAY_PROJECT_FOR_EXPORT_02 = "Assay_Project_For_Export_ByFile";
@@ -170,16 +174,16 @@ private Integer createSimpleProjectAndAssay(String projectName, String assayName
170174
protocol.getDomains().forEach(domain -> domains.put(domain.getName(), domain));
171175

172176
Domain batchDomain = domains.get("Batch Fields");
173-
batchDomain.getFields().add(new FieldDefinition("operatorEmail", ColumnType.String));
174-
batchDomain.getFields().add(new FieldDefinition("instrument", ColumnType.String)
177+
batchDomain.getFields().add(new FieldDefinition(OPERATOR_EMAIL_FIELD_NAME, ColumnType.String));
178+
batchDomain.getFields().add(new FieldDefinition(INSTRUMENT_FIELD_NAME, ColumnType.String)
175179
.setDescription("The diagnostic test instrument."));
176180

177181
Domain runDomain = domains.get("Run Fields");
178182
List<PropertyDescriptor> runFields = runDomain.getFields();
179-
runFields.add(new FieldDefinition("instrumentSetting", ColumnType.Integer)
183+
runFields.add(new FieldDefinition(INSTRUMENT_SETTING_FIELD_NAME, ColumnType.Integer)
180184
.setDescription("The configuration setting on the instrument."));
181185
if (hasRunFileField)
182-
runFields.add(new FieldDefinition("runFileField", ColumnType.File)
186+
runFields.add(new FieldDefinition(RUN_FILE_FIELD_NAME, ColumnType.File)
183187
.setDescription("File for the run."));
184188
domains.get("Run Fields").setFields(runFields);
185189

@@ -267,7 +271,7 @@ public void populateAssay(String projectName, String assayName, boolean useFiles
267271
if (fileIndex < runProperties.size())
268272
{
269273
clickAndWait(Locator.lkButton("Save and Import Another Run"));
270-
waitForElement(Locator.tagWithName("input", "instrumentSetting"));
274+
waitForElement(Locator.tagWithName("input", INSTRUMENT_SETTING_FIELD_NAME));
271275
}
272276

273277
}
@@ -276,7 +280,7 @@ public void populateAssay(String projectName, String assayName, boolean useFiles
276280
if (isElementPresent(Locator.lkButton("Save and Import Another Run")))
277281
{
278282
clickAndWait(Locator.lkButton("Save and Import Another Run"));
279-
waitForElement(Locator.tagWithName("input", "instrumentSetting"));
283+
waitForElement(Locator.tagWithName("input", INSTRUMENT_SETTING_FIELD_NAME));
280284
}
281285
}
282286

@@ -383,14 +387,14 @@ public void validateImportingFileUsingFilesWebPart() throws Exception
383387
RUN04_FILE);
384388

385389
Map<String, String> batchProperties = new HashMap<>();
386-
batchProperties.put("operatorEmail", OPERATOR_EMAIL_01);
387-
batchProperties.put("instrument", INSTRUMENT_NAME_01);
390+
batchProperties.put(OPERATOR_EMAIL_FIELD_NAME, OPERATOR_EMAIL_01);
391+
batchProperties.put(INSTRUMENT_FIELD_NAME, INSTRUMENT_NAME_01);
388392

389393
List<Map<String, String>> runProperties = new ArrayList<>();
390-
runProperties.add(Maps.of("name", RUN01_NAME, "comments", COMMENT_BASIC_01 + RUN01_NAME, "instrumentSetting", INSTRUMENT_SETTING_01));
391-
runProperties.add(Maps.of("name", RUN02_NAME, "comments", COMMENT_BASIC_01 + RUN02_NAME, "instrumentSetting", INSTRUMENT_SETTING_01));
392-
runProperties.add(Maps.of("name", RUN03_NAME, "comments", COMMENT_BASIC_01 + RUN03_NAME, "instrumentSetting", INSTRUMENT_SETTING_01));
393-
runProperties.add(Maps.of("name", RUN04_NAME, "comments", COMMENT_BASIC_01 + RUN04_NAME, "instrumentSetting", INSTRUMENT_SETTING_01));
394+
runProperties.add(Maps.of("Name", RUN01_NAME, "Comments", COMMENT_BASIC_01 + RUN01_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_01));
395+
runProperties.add(Maps.of("Name", RUN02_NAME, "Comments", COMMENT_BASIC_01 + RUN02_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_01));
396+
runProperties.add(Maps.of("Name", RUN03_NAME, "Comments", COMMENT_BASIC_01 + RUN03_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_01));
397+
runProperties.add(Maps.of("Name", RUN04_NAME, "Comments", COMMENT_BASIC_01 + RUN04_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_01));
394398

395399
log("Populate the assay '" + SIMPLE_ASSAY_FOR_EXPORT + "' by using files in the Files WebPart.");
396400
populateAssay(ASSAY_PROJECT_FOR_EXPORT_01, SIMPLE_ASSAY_FOR_EXPORT, true, runFiles, batchProperties, runProperties, SAMPLE_TXT_FILE);
@@ -478,14 +482,14 @@ public void validateImportingFileUsingRunProperties() throws Exception
478482
RUN04_FILE);
479483

480484
Map<String, String> batchProperties = new HashMap<>();
481-
batchProperties.put("operatorEmail", OPERATOR_EMAIL_02);
482-
batchProperties.put("instrument", INSTRUMENT_NAME_02);
485+
batchProperties.put(OPERATOR_EMAIL_FIELD_NAME, OPERATOR_EMAIL_02);
486+
batchProperties.put(INSTRUMENT_FIELD_NAME, INSTRUMENT_NAME_02);
483487

484488
List<Map<String, String>> runProperties = new ArrayList<>();
485-
runProperties.add(Maps.of("name", RUN01_NAME, "comments", COMMENT_BASIC_02 + RUN01_NAME, "instrumentSetting", INSTRUMENT_SETTING_02));
486-
runProperties.add(Maps.of("name", RUN02_NAME, "comments", COMMENT_BASIC_02 + RUN02_NAME, "instrumentSetting", INSTRUMENT_SETTING_02));
487-
runProperties.add(Maps.of("name", RUN03_NAME, "comments", COMMENT_BASIC_02 + RUN03_NAME, "instrumentSetting", INSTRUMENT_SETTING_02));
488-
runProperties.add(Maps.of("name", RUN04_NAME, "comments", COMMENT_BASIC_02 + RUN04_NAME, "instrumentSetting", INSTRUMENT_SETTING_02));
489+
runProperties.add(Maps.of("name", RUN01_NAME, "comments", COMMENT_BASIC_02 + RUN01_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_02));
490+
runProperties.add(Maps.of("name", RUN02_NAME, "comments", COMMENT_BASIC_02 + RUN02_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_02));
491+
runProperties.add(Maps.of("name", RUN03_NAME, "comments", COMMENT_BASIC_02 + RUN03_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_02));
492+
runProperties.add(Maps.of("name", RUN04_NAME, "comments", COMMENT_BASIC_02 + RUN04_NAME, INSTRUMENT_SETTING_FIELD_NAME, INSTRUMENT_SETTING_02));
489493

490494
log("Populate the assay '" + SIMPLE_ASSAY_FOR_EXPORT + "' by importing the file through the 'Run Properties'.");
491495
populateAssay(ASSAY_PROJECT_FOR_EXPORT_02, SIMPLE_ASSAY_FOR_EXPORT, false, runFiles, batchProperties, runProperties, null);
@@ -665,25 +669,25 @@ public void testExportXarToPipeline() throws Exception
665669
ImportRunCommand run1 = new ImportRunCommand(assayId, RUN01_FILE);
666670
run1.setName(RUN01_NAME);
667671
run1.setComment(commentPrefix + RUN01_NAME);
668-
run1.setProperties(Maps.of("instrumentSetting", instrumentSetting));
672+
run1.setProperties(Maps.of(INSTRUMENT_SETTING_FIELD_NAME, instrumentSetting));
669673
run1.execute(cn, exportProject);
670674

671675
ImportRunCommand run2 = new ImportRunCommand(assayId, RUN02_FILE);
672676
run2.setName(RUN02_NAME);
673677
run2.setComment(commentPrefix + RUN02_NAME);
674-
run2.setProperties(Maps.of("instrumentSetting", instrumentSetting));
678+
run2.setProperties(Maps.of(INSTRUMENT_SETTING_FIELD_NAME, instrumentSetting));
675679
run2.execute(cn, exportProject);
676680

677681
ImportRunCommand run3 = new ImportRunCommand(assayId, RUN03_FILE);
678682
run3.setName(RUN03_NAME);
679683
run3.setComment(commentPrefix + RUN03_NAME);
680-
run3.setProperties(Maps.of("instrumentSetting", instrumentSetting));
684+
run3.setProperties(Maps.of(INSTRUMENT_SETTING_FIELD_NAME, instrumentSetting));
681685
run3.execute(cn, exportProject);
682686

683687
ImportRunCommand run4 = new ImportRunCommand(assayId, RUN04_XLSX_FILE);
684688
run4.setName(RUN04_NAME);
685689
run4.setComment(commentPrefix + RUN04_NAME);
686-
run4.setProperties(Maps.of("instrumentSetting", instrumentSetting));
690+
run4.setProperties(Maps.of(INSTRUMENT_SETTING_FIELD_NAME, instrumentSetting));
687691
run4.execute(cn, exportProject);
688692

689693
List<String> runColumns = Arrays.asList("adjustedM1", "M2");

‎src/org/labkey/test/tests/DomainFieldTypeChangeTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.labkey.test.pages.query.UpdateQueryRowPage;
1818
import org.labkey.test.params.FieldDefinition;
1919
import org.labkey.test.params.FieldInfo;
20+
import org.labkey.test.tests.study.AssayTest;
2021
import org.labkey.test.util.APIAssayHelper;
2122
import org.labkey.test.util.DataRegionTable;
2223
import org.labkey.test.util.PortalHelper;
@@ -178,7 +179,7 @@ public void testNonProvisionedDomainFieldChanges()
178179
checkCheckbox(Locator.name("batchTestBoolean"));
179180
clickButton("Next");
180181

181-
setFormElement(Locator.name("name"), runName);
182+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, runName);
182183
setFormElement(Locator.name("runTestInteger"), "12");
183184
setFormElement(Locator.name("runTestDecimal"), "1.12");
184185
setFormElement(Locator.name("runTestDate"), "01-03-2022");

‎src/org/labkey/test/tests/FileAttachmentColumnTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.labkey.test.params.FieldDefinition.ColumnType;
3838
import org.labkey.test.params.assay.GeneralAssayDesign;
3939
import org.labkey.test.params.experiment.SampleTypeDefinition;
40+
import org.labkey.test.tests.study.AssayTest;
4041
import org.labkey.test.util.DataRegionTable;
4142
import org.labkey.test.util.ListHelper;
4243
import org.labkey.test.util.PortalHelper;
@@ -282,7 +283,7 @@ public void testAssayFileFieldsUI() throws Exception
282283
clickButton("Next"); // batch properties
283284

284285
// run properties
285-
setFormElement(Locator.input("name"), runName);
286+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, runName);
286287
setFormElement(Locator.input(RUN_TXT_COL), "run text");
287288
setFormElement(Locator.input(RUN_FILE_COL), runFileFieldFile);
288289
checkRadioButton(Locator.inputById("Fileupload"));

‎src/org/labkey/test/tests/FlagColumnTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.labkey.test.categories.Assays;
1313
import org.labkey.test.categories.Daily;
1414
import org.labkey.test.params.FieldDefinition;
15+
import org.labkey.test.tests.study.AssayTest;
1516
import org.labkey.test.util.DataRegionTable;
1617
import org.labkey.test.util.RelativeUrl;
1718

@@ -100,15 +101,15 @@ private void doInit()
100101
clickButton("Import Data");
101102

102103
log("Import run1...");
103-
setFormElement(Locator.name("name"), "Run01");
104-
setFormElement(Locator.id("TextAreaDataCollector.textArea"),
104+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, "Run01");
105+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR,
105106
"SomeData\nrun1-data1\nrun1-data2");
106107
clickButton("Save and Import Another Run");
107108

108109
log("Import run2...");
109-
setFormElement(Locator.name("name"), "Run02");
110-
setFormElement(Locator.name("anotherRunFlag"), "run has flag");
111-
setFormElement(Locator.id("TextAreaDataCollector.textArea"),
110+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, "Run02");
111+
setFormElement(Locator.name("AnotherRunFlag"), "run has flag");
112+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR,
112113
"SomeData\nrun2-data1\nrun2-data2");
113114
clickButton("Save and Finish");
114115

‎src/org/labkey/test/tests/InlineImagesAssayTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.labkey.test.components.CustomizeView;
3131
import org.labkey.test.pages.ReactAssayDesignerPage;
3232
import org.labkey.test.params.FieldDefinition;
33+
import org.labkey.test.tests.study.AssayTest;
3334
import org.labkey.test.util.DataRegionExportHelper;
3435
import org.labkey.test.util.DataRegionTable;
3536
import org.labkey.test.util.ExcelHelper;
@@ -128,8 +129,8 @@ public final void testAssayInlineImages() throws Exception
128129
clickButton("Import Data");
129130
setFormElement(Locator.name("batchFileField"), XLS_FILE);
130131
clickButton("Next");
131-
setFormElement(Locator.name("name"), runName);
132-
setFormElement(Locator.name("TextAreaDataCollector.textArea"), importData);
132+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, runName);
133+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, importData);
133134

134135
clickButton("Save and Finish");
135136

‎src/org/labkey/test/tests/MultiplePKUploadAssayTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.labkey.test.TestFileUtils;
2424
import org.labkey.test.TestTimeoutException;
2525
import org.labkey.test.categories.Daily;
26+
import org.labkey.test.tests.study.AssayTest;
2627
import org.labkey.test.util.DataRegionTable;
2728

2829
import java.io.File;
@@ -98,12 +99,12 @@ public void verifyMultiplePKListUpload() throws Exception
9899

99100
log("Specifying the specimenID");
100101
assertTitleContains("Data Import: Run Properties and Data File");
101-
setFormElement(Locator.name("name"), "First run");
102-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), "SpecimenID\nS17\nS22");
102+
setFormElement(AssayTest.ASSAY_NAME_FIELD_LOCATOR, "First run");
103+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, "SpecimenID\nS17\nS22");
103104
clickButton("Save and Finish");
104105
assertElementPresent(Locator.css(".labkey-error").withText("Can not resolve thaw list entry for specimenId: S22"));
105106

106-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), "SpecimenID\nS17");
107+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, "SpecimenID\nS17");
107108
clickButton("Save and Finish");
108109
log("Verifying the visit ID");
109110

‎src/org/labkey/test/tests/ProgrammaticQCTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.labkey.test.categories.Daily;
2727
import org.labkey.test.pages.ReactAssayDesignerPage;
2828
import org.labkey.test.params.FieldDefinition;
29+
import org.labkey.test.tests.study.AssayTest;
2930
import org.labkey.test.util.APIAssayHelper;
3031
import org.labkey.test.util.PortalHelper;
3132
import org.labkey.test.util.QCAssayScriptHelper;
@@ -165,14 +166,14 @@ private void uploadQCRuns()
165166
clickButton("Import Data");
166167
clickButton("Next");
167168

168-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
169-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA1);
169+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
170+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA1);
170171
clickButton("Save and Finish");
171172

172173
assertTextPresent("A duplicate PTID was discovered : b", "A duplicate PTID was discovered : e");
173174

174-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
175-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA2);
175+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
176+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA2);
176177
clickButton("Save and Finish");
177178

178179
// verify the log entry
@@ -190,14 +191,14 @@ private void uploadTransformRuns()
190191
clickButton("Import Data");
191192
clickButton("Next");
192193

193-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
194-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA1);
194+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
195+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA1);
195196
clickButton("Save and Finish");
196197

197198
assertTextPresent("A duplicate PTID was discovered : b", "A duplicate PTID was discovered : e");
198199

199-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
200-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA2);
200+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
201+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA2);
201202
clickButton("Save and Finish");
202203

203204
clickAndWait(Locator.linkWithText("view results"));
@@ -259,14 +260,14 @@ private void uploadTransformQCRuns()
259260
clickButton("Import Data");
260261
clickButton("Next");
261262

262-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
263-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA2);
263+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
264+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA2);
264265
clickButton("Save and Finish");
265266

266267
assertTextPresent("The animal column must contain a goat");
267268

268-
click(Locator.xpath("//input[@value='textAreaDataProvider']"));
269-
setFormElement(Locator.id("TextAreaDataCollector.textArea"), TEST_RUN1_DATA3);
269+
click(AssayTest.TEXT_AREA_DATA_PROVIDER_LOCATOR);
270+
setFormElement(AssayTest.TEXT_AREA_DATA_COLLECTOR_LOCATOR, TEST_RUN1_DATA3);
270271
clickButton("Save and Finish");
271272

272273
clickAndWait(Locator.linkWithText("view results"));

‎src/org/labkey/test/tests/RlabkeyTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ private void setupIssues()
123123

124124
clickProject(PROJECT_NAME);
125125
createNewIssueList(issuesHelper, ISSUE_LIST_NAME);
126-
issuesHelper.addIssue(Maps.of("assignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_0));
126+
issuesHelper.addIssue(Maps.of("AssignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_0));
127127

128128
clickFolder(FOLDER_NAME);
129129
createNewIssueList(issuesHelper, ISSUE_LIST_NAME);
130-
issuesHelper.addIssue(Maps.of("assignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_1));
130+
issuesHelper.addIssue(Maps.of("AssignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_1));
131131

132132
clickProject(PROJECT_NAME_2);
133133
createNewIssueList(issuesHelper, ISSUE_LIST_NAME);
134-
issuesHelper.addIssue(Maps.of("assignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_2));
134+
issuesHelper.addIssue(Maps.of("AssignedTo", _userHelper.getDisplayNameForEmail(USER), "title", ISSUE_TITLE_2));
135135
}
136136

137137
/**

‎src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ public void testExportAndImportWithMissingAndRequiredFields()
320320
clickButtonContainingText("Next");
321321

322322
// TODO: Should validate that the Derive Samples action shows the various fields as expected. That is the required and missing value fields should have the correct input type. Will be fixed in 19.2.
323-
setFormElement(Locator.tagWithName("input", "outputSample1_Name"), sampleNames[8]);
324-
setFormElement(Locator.tagWithName("input", "outputSample1_" + REQUIRED_FIELD_NAME), "Required text for this field.");
325-
setFormElement(Locator.tagWithName("input", "outputSample1_" + MISSING_FIELD_NAME), "Q");
323+
setFormElement(Locator.tagWithName("input", "Output Sample 1_Name"), sampleNames[8]);
324+
setFormElement(Locator.tagWithName("input", "Output Sample 1_" + REQUIRED_FIELD_NAME), "Required text for this field.");
325+
setFormElement(Locator.tagWithName("input", "Output Sample 1_" + MISSING_FIELD_NAME), "Q");
326326
clickButtonContainingText("Submit");
327327

328328
// TODO: There is a bug where derived values do not honor missing value fields (treat them as a text field). So the indicator field for this sample will be empty. Will be fixed in 19.2.

0 commit comments

Comments
 (0)