From 85eac72f12cc4c31705725fd1c5df0e732070769 Mon Sep 17 00:00:00 2001 From: lum Date: Fri, 11 Jul 2025 11:30:09 -0700 Subject: [PATCH 1/2] Regression for 53361 --- src/org/labkey/test/tests/list/ListTest.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java index 9c5404850b..126961cdd8 100644 --- a/src/org/labkey/test/tests/list/ListTest.java +++ b/src/org/labkey/test/tests/list/ListTest.java @@ -2102,23 +2102,27 @@ public void customizeURLTest() @Test public void testPkNameParameterCollision() throws IOException, CommandException { - String listName = TestDataGenerator.randomDomainName("list_key_check"); - String pkCol = "Name"; + // Create lists with PKs having the same name as detail URL list definition identifier + // params to ensure we can resolve detail pages correctly + validateDetailsView("list_name_key_check", "Name"); + validateDetailsView("list_id_key_check", "ListId"); + } + private void validateDetailsView(String listName, String pkCol) throws CommandException, IOException + { + listName = TestDataGenerator.randomDomainName(listName); var dgen = new VarListDefinition(listName) - .setFields(List.of(new FieldDefinition(pkCol))) - .create(createDefaultConnection(), getProjectName()) - .withGeneratedRows(10); + .setFields(List.of(new FieldDefinition(pkCol))) + .create(createDefaultConnection(), getProjectName()) + .withGeneratedRows(10); List pks = dgen.getRows().stream().map(row -> (String) row.get(pkCol)).toList(); dgen.insertRows(); goToProjectHome(); - goToManageLists().getGrid().viewListData(listName); clickAndWait(Locator.linkWithText(pks.get(0))); - assertElementPresent(Locator.byClass("labkey-error-heading") - .withText("List item '%s' does not exist".formatted(listName))); + assertElementPresent(Locator.tagContainingText("td", pks.get(0))); } @Override From 01f4430432bb649eff87ecf3f022784069105572 Mon Sep 17 00:00:00 2001 From: Lum Date: Thu, 17 Jul 2025 09:54:54 -0700 Subject: [PATCH 2/2] update comment --- src/org/labkey/test/tests/list/ListTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java index babe483b37..699842367a 100644 --- a/src/org/labkey/test/tests/list/ListTest.java +++ b/src/org/labkey/test/tests/list/ListTest.java @@ -2109,8 +2109,8 @@ public void customizeURLTest() } /** - * Issue 53361: 'list-details.view' doesn't work when list pk is named "name" - * Expect bad product behavior. Convert this to a regression test once the issue is fixed. + * Regression for issue 53361: 'list-details.view' doesn't work when list pk is named "name" + * Test for both name and listId key field names. */ @Test public void testPkNameParameterCollision() throws IOException, CommandException