Skip to content

[8.18] [Test] Don't include '*' in glob pattern literals (#133114) #133125

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
merged 1 commit into from
Aug 19, 2025
Merged

[8.18] [Test] Don't include '*' in glob pattern literals (#133114) #133125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions libs/core/src/test/java/org/elasticsearch/core/GlobTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void testMatchLiteral() {
str = randomAlphanumericOfLength(randomIntBetween(1, 12));
assertMatch(str, str);

str = randomAsciiString(randomIntBetween(1, 24), ch -> ch >= ' ' && ch <= '~' && ch != '*');
str = randomAsciiStringNoAsterisks(randomIntBetween(1, 24));
assertMatch(str, str);
}

Expand Down Expand Up @@ -67,7 +67,7 @@ public void testPrefixMatch() {
assertNonMatch("123*", "abc123");
assertNonMatch("123*", "abc123def");

var prefix = randomAsciiString(randomIntBetween(2, 12));
var prefix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
var pattern = prefix + "*";
assertMatch(pattern, prefix);
assertMatch(pattern, prefix + randomAsciiString(randomIntBetween(1, 30)));
Expand All @@ -92,7 +92,7 @@ public void testSuffixMatch() {
assertNonMatch("*123", "123abc");
assertNonMatch("*123", "abc123def");

var suffix = randomAsciiString(randomIntBetween(2, 12));
var suffix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
var pattern = "*" + suffix;
assertMatch(pattern, suffix);
assertMatch(pattern, randomAsciiString(randomIntBetween(1, 30)) + suffix);
Expand All @@ -114,7 +114,7 @@ public void testInfixStringMatch() {
assertNonMatch("*123*", "12*");
assertNonMatch("*123*", "1.2.3");

var infix = randomAsciiString(randomIntBetween(2, 12));
var infix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
var pattern = "*" + infix + "*";
assertMatch(pattern, infix);
assertMatch(pattern, randomAsciiString(randomIntBetween(1, 30)) + infix + randomAsciiString(randomIntBetween(1, 30)));
Expand All @@ -138,8 +138,8 @@ public void testInfixAsteriskMatch() {
assertMatch("123*321", "12345678987654321");
assertNonMatch("123*321", "12321");

var prefix = randomAsciiString(randomIntBetween(2, 12));
var suffix = randomAsciiString(randomIntBetween(2, 12));
var prefix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
var suffix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
var pattern = prefix + "*" + suffix;
assertMatch(pattern, prefix + suffix);
assertMatch(pattern, prefix + randomAsciiString(randomIntBetween(1, 30)) + suffix);
Expand Down Expand Up @@ -180,6 +180,10 @@ private String randomAsciiString(int length) {
return randomAsciiString(length, ch -> ch >= ' ' && ch <= '~');
}

private String randomAsciiStringNoAsterisks(final int length) {
return randomAsciiString(length, ch -> ch >= ' ' && ch <= '~' && ch != '*');
}

private String randomAsciiString(int length, CharPredicate validCharacters) {
StringBuilder str = new StringBuilder(length);
nextChar: for (int i = 0; i < length; i++) {
Expand Down