From dada796c363c645b183ac5add0cd5f8e6959a47e Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 16 Sep 2025 08:39:18 -0700 Subject: [PATCH 1/3] Avoid generating blank domain or field names --- src/org/labkey/test/util/RandomName.java | 2 +- src/org/labkey/test/util/TestDataGenerator.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/RandomName.java b/src/org/labkey/test/util/RandomName.java index e45af8c0ad..3c9db6b0f9 100644 --- a/src/org/labkey/test/util/RandomName.java +++ b/src/org/labkey/test/util/RandomName.java @@ -15,7 +15,7 @@ public record RandomName(String part, String name) public RandomName(String part, String name) { this.part = part == null ? "" : part; // Don't trim - this.name = Objects.requireNonNull(name); + this.name = Objects.requireNonNull(name).trim(); } @Override diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index 5dd16bfe4f..bb49d4730b 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -702,6 +702,8 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando { if (domainName != null) { + if (domainName.name().isEmpty()) + return true; if (!Character.isLetterOrDigit(domainName.name().charAt(0))) return true; // domain needs to start with alphanumeric char if (Pattern.matches("(.*\\s--[^ ].*)|(.*\\s-[^- ].*)", domainName.name())) @@ -722,6 +724,8 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando } if (fieldName != null) { + if (fieldName.name().isEmpty()) + return true; if (fieldName.name().length() > 200) return true; if (COLON_NAME_PATTERN.matcher(fieldName.name()) From b08077ecfad837702d7c8c327e974c6bfe3b4e0e Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 16 Sep 2025 08:53:08 -0700 Subject: [PATCH 2/3] Don't need to trim --- src/org/labkey/test/util/RandomName.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/RandomName.java b/src/org/labkey/test/util/RandomName.java index 3c9db6b0f9..e45af8c0ad 100644 --- a/src/org/labkey/test/util/RandomName.java +++ b/src/org/labkey/test/util/RandomName.java @@ -15,7 +15,7 @@ public record RandomName(String part, String name) public RandomName(String part, String name) { this.part = part == null ? "" : part; // Don't trim - this.name = Objects.requireNonNull(name).trim(); + this.name = Objects.requireNonNull(name); } @Override From 744bb704877e2a84e3b18a1583b015680390d442 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 16 Sep 2025 08:53:42 -0700 Subject: [PATCH 3/3] isBlank --- 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 bb49d4730b..aa9ab14106 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -702,7 +702,7 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando { if (domainName != null) { - if (domainName.name().isEmpty()) + if (domainName.name().isBlank()) return true; if (!Character.isLetterOrDigit(domainName.name().charAt(0))) return true; // domain needs to start with alphanumeric char @@ -724,7 +724,7 @@ private static boolean isNameInvalidLocal(DomainKind domainKind, @Nullable Rando } if (fieldName != null) { - if (fieldName.name().isEmpty()) + if (fieldName.name().isBlank()) return true; if (fieldName.name().length() > 200) return true;