Skip to content

Fix column identifiers in HDRLTest #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 4 commits into from
Oct 15, 2025
Merged

Fix column identifiers in HDRLTest #239

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d9398e
Wait for the page to load after clicking
labkey-tchad Oct 14, 2025
d7ae24c
Put HDRLTest in the correct suite
labkey-tchad Oct 14, 2025
c031beb
Use correct column name
labkey-tchad Oct 14, 2025
b924ae7
Add comments
labkey-tchad Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ...t/src/org/labkey/test/tests/HDRLTest.java → .../org/labkey/test/tests/hdrl/HDRLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.labkey.test.tests;
package org.labkey.test.tests.hdrl;

import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -50,7 +50,7 @@
import static org.junit.Assert.assertTrue;
import static org.labkey.test.util.PermissionsHelper.READER_ROLE;

@Category({Git.class})
@Category({Git.class}) // Requires dataintegration module
@BaseWebDriverTest.ClassTimeout(minutes = 8)
public class HDRLTest extends BaseWebDriverTest implements PostgresOnlyTest
{
Expand Down Expand Up @@ -212,15 +212,15 @@ public void testRetrievalOfResultsAndArchiving() throws Exception
specimen1.put("SampleIntegrity", "Hemolyzed");
specimen1.put("TestResult", "HIV Negative");
specimen1.put("CustomerCode", "5B");
specimen1.put("RequestStatus", "Completed");
specimen1.put("RequestStatusId", "Completed");
specimen1.put("ModifiedResultFlag", "F");

Map<String, String> specimen2 = new HashMap<>();

specimen2.put("RequestId", requestId);
specimen2.put("SpecimenId", specimenIds.get(1));
specimen2.put("Received", "2015-06-01 00:00");
specimen2.put("RequestStatus", "Exception");
specimen2.put("RequestStatusId", "Exception");
specimen2.put("ModifiedResultFlag", "F");

List<Map<String, String>> specimens = new ArrayList<>();
Expand Down Expand Up @@ -392,10 +392,10 @@ public void testFileUploadAndSubmit()

log("edit an existing request");
goToProjectHome();
click(Locator.linkContainingText("View test requests"));
clickAndWait(Locator.linkContainingText("View test requests"));

DataRegionTable drt = new DataRegionTable("query", this);
int idx = drt.getRowIndex("ShippingCarrier", "FedEx");
int idx = drt.getRowIndex("ShippingCarrierId", "FedEx");
assertNotEquals(-1, idx);
clickAndWait(drt.link(idx, 0));
log("submitting an existing request");
Expand All @@ -404,7 +404,7 @@ public void testFileUploadAndSubmit()
clickButton(SUBMIT_BUTTON_TEXT);

drt = new DataRegionTable("query", this);
idx = drt.getRowIndex("ShippingCarrier", "FedEx");
idx = drt.getRowIndex("ShippingCarrierId", "FedEx");
assertNotEquals(-1, idx);
Assert.assertFalse(drt.getDataAsText(idx, "Submitted By").trim().isEmpty()); // "submitted by" field should be filled in
Assert.assertFalse(drt.getDataAsText(idx, "Submitted").trim().isEmpty()); // submitted date should be filled in
Expand All @@ -423,7 +423,7 @@ public void testFileUploadAndSubmit()
goToProjectHome();
clickAndWait(Locator.linkContainingText("View test requests"));
drt = new DataRegionTable("query", this);
idx = drt.getRowIndex("ShippingCarrier", "FedEx");
idx = drt.getRowIndex("ShippingCarrierId", "FedEx");
assertNotEquals(-1, idx);
log("ensure submitted requests are still editable by admins");
assertEquals("VIEW", drt.getDataAsText(idx, 0));
Expand Down Expand Up @@ -526,7 +526,7 @@ public void testDataDeletion()
getDriver().close();
switchToMainWindow();
goToProjectHome();
click(Locator.linkWithText("View test requests"));
clickAndWait(Locator.linkWithText("View test requests"));
DataRegionTable drt = new DataRegionTable("query", this);
int idx = drt.getRowIndex("ShippingNumber", "testRetrievalOfResults");
assertNotEquals(-1, idx);
Expand Down Expand Up @@ -641,9 +641,9 @@ protected void setupFolder()
protected void setTimeWindow()
{
goToAdminConsole();
click(Locator.linkWithText("HDRL Sensitive Data"));
clickAndWait(Locator.linkWithText("HDRL Sensitive Data"));
setFormElement(Locator.name("timeWindowInDays"), "0");
click(Locator.linkWithSpan("Save"));
clickAndWait(Locator.linkWithSpan("Save"));
}

@Override
Expand Down