Test fixes

Author: labkey-jeckels

flow/src/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp

@@ -86,8 +86,8 @@
                 to look up specimen information from the target study's specimen repository.
             </p>
             <p class="labkey-indented">
-                <label for="targetStudy">Optionally, choose a target study folder:</label><br>
-                <select id="targetStudy" name="targetStudy">
+                <label for="TargetStudy">Optionally, choose a target study folder:</label><br>
+                <select id="TargetStudy" name="TargetStudy">
                     <labkey:options value="<%=unsafe(form.getTargetStudy())%>" map="<%=targetStudies%>"/>
                 </select>
             </p>

flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp

@@ -233,11 +233,8 @@ if (form.getKeywordDir() != null && form.getKeywordDir().length > 0 && StudyPubl
         <div style="padding-left: 2em; padding-bottom: 1em;">
             <br>
             Choose a target study folder:<br>
-            <%=select().name("targetStudy").className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
+            <%=select().name("TargetStudy").className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
             %>
-<%--            <select id="targetStudy" name="targetStudy">--%>
-<%--                <labkey:options value="<%=text(form.getTargetStudy())%>" map="<%=targetStudies%>"/>--%>
-<%--            </select>--%>
             <br><br>
         </div>
         <%

flow/src/org/labkey/flow/controllers/executescript/importAnalysisConfirm.jsp

@@ -93,7 +93,7 @@
 <input type="hidden" name="existingAnalysisId" id="existingAnalysisId" value="<%=form.getExistingAnalysisId()%>">
 <% } %>
 
-<input type="hidden" name="targetStudy" id="targetStudy" value="<%=h(form.getTargetStudy())%>">
+<input type="hidden" name="TargetStudy" id="TargetStudy" value="<%=h(form.getTargetStudy())%>">
 
 <p>You are about to import the analysis from the workspace with the following settings:</p>
 <%

luminex/test/src/org/labkey/test/tests/luminex/LuminexAsyncImportTest.java

@@ -105,7 +105,7 @@ private void importSecondRun(int index, Calendar testDate, File file) {
         int i = index;
         goToTestAssayHome();
         clickButton("Import Data");
-        setFormElement(Locator.name("network"), "NEWNET" + (i + 1));
+        setFormElement(Locator.name("Network"), "NEWNET" + (i + 1));
         clickButton("Next");
         testDate.add(Calendar.DATE, 1);
         importLuminexRunPageTwo("Guide Set plate " + (i+1), "new"+isotype, "new"+conjugate, "", "", "NewNote" + (i+1),

luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java

@@ -562,7 +562,7 @@ private void importPlateFiveAgain()
 
         goToTestAssayHome();
         clickButton("Import Data");
-        setFormElement(Locator.name("network"), "NETWORK" + (10));
+        setFormElement(Locator.name("Network"), "NETWORK" + (10));
         clickButton("Next");
 
         importLuminexRunPageTwo("Reload guide set 5", isotype, conjugate, "", "", "Notebook" + 11,

luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java

@@ -218,7 +218,7 @@ public void testUploadAndLink()
         region.setFilter("FI", "Equals", "20");
         click(Locator.name(".toggle"));
         clickButton("Link to Study");
-        selectOptionByText(Locator.name("targetStudy"), "/" + TEST_ASSAY_PRJ_LUMINEX + " (" + TEST_ASSAY_PRJ_LUMINEX + " Study)");
+        selectOptionByText(AssayConstants.TARGET_STUDY_FIELD_LOCATOR, "/" + TEST_ASSAY_PRJ_LUMINEX + " (" + TEST_ASSAY_PRJ_LUMINEX + " Study)");
         clickButton("Next");
         setFormElement(Locator.name("participantId"), "ParticipantID");
         setFormElement(Locator.name("visitId"), "100.1");

viability/src/org/labkey/viability/ViabilityAssayDataHandler.java

@@ -366,7 +366,7 @@ else if (targetStudyPair.getKey() == ExpProtocol.AssayDomainTypes.Result)
             // If the property is on the result domain, it's already in the base map.
             if (batchOrRunTargetStudy != null)
             {
-                base.put("targetStudy", batchOrRunTargetStudy);
+                base.put(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME, batchOrRunTargetStudy);
             }
 
             ViabilityResult result = ViabilityResult.fromMap(base, extra);

viability/src/org/labkey/viability/ViabilityResult.java

@@ -18,6 +18,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
+import org.labkey.api.assay.AbstractAssayProvider;
 import org.labkey.api.exp.PropertyDescriptor;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 
@@ -97,8 +98,8 @@ else if (o instanceof List)
                 throw new IllegalArgumentException("Expected comma separated list or a collecting of specimen IDs");
         }
 
-        if (base.get("targetStudy") instanceof String)
-            result.setTargetStudy((String)base.get("targetStudy"));
+        if (base.get(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME) instanceof String s)
+            result.setTargetStudy(s);
 
         if (extra != null)
             result.setProperties(extra);
@@ -130,7 +131,7 @@ public Map<String, Object> toMap()
         // NOTE: The 'list' version of 'SpecimenIDs' is used when the guava file is parsed.
         ret.put("specimenIDs", getSpecimenIDList());
 
-        ret.put("targetStudy", getTargetStudy());
+        ret.put(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME, getTargetStudy());
 
         ret.putAll(getStringProperties());
         return ret;