From 157b32162825ff253fb00248339998281f39d41e Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 23 Jul 2025 16:39:37 -0500 Subject: [PATCH 1/4] Try using WebTestHelper.getRemoteApiConnection() directly --- src/org/labkey/test/util/TestDataGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index f9d16ae2af..36e0623167 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -561,7 +561,7 @@ public static String randomDomainName(@Nullable String namePart, @Nullable Integ String charSet = ALPHANUMERIC_STRING + DOMAIN_SPECIAL_STRING; // TODO increase min to 5 and max to 50 String domainName = randomName(_namePart, getNumChars(numStartChars, 0), getNumChars(numEndChars, 10), charSet, null); - while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(false), _domainKind, domainName, null)) + while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(), _domainKind, domainName, null)) domainName = randomName(_namePart, getNumChars(numStartChars, 0), getNumChars(numEndChars, 10), charSet, null); // Multiple spaces in the UI are collapsed into a single space. If we need to test for handling of multiple spaces, we'll not use this generator @@ -602,7 +602,7 @@ public static String randomFieldName(@NotNull String part, @Nullable Integer num // TODO increase max to 50 String randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 5), chars, exclusion); - while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(false), _domainKind, null, randomFieldName)) + while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(), _domainKind, null, randomFieldName)) randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 5), chars, exclusion); TestLogger.log("Generated random field name for domainKind " + _domainKind + ": " + randomFieldName); From ba1aef0a17af4fb56173291b08f8ee0f2fe94893 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 24 Jul 2025 12:10:24 -0500 Subject: [PATCH 2/4] move WebTestHelper.getRemoteApiConnection() into isDomainAndFieldNameInvalid() --- src/org/labkey/test/util/TestDataGenerator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index 36e0623167..8c478e76ae 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -561,7 +561,7 @@ public static String randomDomainName(@Nullable String namePart, @Nullable Integ String charSet = ALPHANUMERIC_STRING + DOMAIN_SPECIAL_STRING; // TODO increase min to 5 and max to 50 String domainName = randomName(_namePart, getNumChars(numStartChars, 0), getNumChars(numEndChars, 10), charSet, null); - while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(), _domainKind, domainName, null)) + while (isDomainAndFieldNameInvalid(_domainKind, domainName, null)) domainName = randomName(_namePart, getNumChars(numStartChars, 0), getNumChars(numEndChars, 10), charSet, null); // Multiple spaces in the UI are collapsed into a single space. If we need to test for handling of multiple spaces, we'll not use this generator @@ -602,14 +602,14 @@ public static String randomFieldName(@NotNull String part, @Nullable Integer num // TODO increase max to 50 String randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 5), chars, exclusion); - while (isDomainAndFieldNameInvalid(WebTestHelper.getRemoteApiConnection(), _domainKind, null, randomFieldName)) + while (isDomainAndFieldNameInvalid(_domainKind, null, randomFieldName)) randomFieldName = randomName(part, getNumChars(numStartChars, 5), getNumChars(numEndChars, 5), chars, exclusion); TestLogger.log("Generated random field name for domainKind " + _domainKind + ": " + randomFieldName); return randomFieldName; } - private static boolean isDomainAndFieldNameInvalid(Connection connection, DomainUtils.DomainKind domainKind, @Nullable String domainName, @Nullable String fieldName) + private static boolean isDomainAndFieldNameInvalid(DomainUtils.DomainKind domainKind, @Nullable String domainName, @Nullable String fieldName) { SimplePostCommand command = new SimplePostCommand("property", "validateDomainAndFieldNames"); JSONObject domainDesign = new JSONObject(); @@ -630,7 +630,7 @@ private static boolean isDomainAndFieldNameInvalid(Connection connection, Domain try { - CommandResponse response = command.execute(connection, "/"); + CommandResponse response = command.execute(WebTestHelper.getRemoteApiConnection(), "/"); return response.getParsedData().containsKey("errors"); } catch (CommandException | IOException e) From 978459a176800fba7d1987b7349057754fcc1e93 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 24 Jul 2025 14:01:32 -0500 Subject: [PATCH 3/4] revert change to FieldDefinition.labelFromName from previous PR --- src/org/labkey/test/params/FieldDefinition.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/labkey/test/params/FieldDefinition.java b/src/org/labkey/test/params/FieldDefinition.java index 0c484493f1..568e903161 100644 --- a/src/org/labkey/test/params/FieldDefinition.java +++ b/src/org/labkey/test/params/FieldDefinition.java @@ -123,8 +123,7 @@ else if (Character.isUpperCase(c) && Character.isLowerCase(chars[i - 1])) } } - // Multiple spaces in the UI are collapsed into a single space - return buf.toString().replaceAll("\\s+", " "); + return buf.toString(); } public String getEffectiveLabel() From 9d2e690554252beb4b6a9d949e19c89ce4f92641 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 24 Jul 2025 16:40:16 -0500 Subject: [PATCH 4/4] TestDataGenerator.isDomainAndFieldNameInvalid API call to use /home container intead of root --- src/org/labkey/test/util/TestDataGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index 8c478e76ae..8e7ae57a2e 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -630,7 +630,7 @@ private static boolean isDomainAndFieldNameInvalid(DomainUtils.DomainKind domain try { - CommandResponse response = command.execute(WebTestHelper.getRemoteApiConnection(), "/"); + CommandResponse response = command.execute(WebTestHelper.getRemoteApiConnection(), "/home"); return response.getParsedData().containsKey("errors"); } catch (CommandException | IOException e)