Skip to content

Commit

Permalink
Issue #5684 - Fixing regex for pathsep
Browse files Browse the repository at this point in the history 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
@joakime
joakime committed Aug 4, 2021
1 parent e0c9666 commit df26fe6
Showing 1 changed file with 21 additions and 22 deletions.
43 changes: 21 additions & 22 deletions ...-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.toolchain.test.FS;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand All @@ -43,18 +42,18 @@ public static Stream<Arguments> validLoggingModules()
return Stream.of(
Arguments.of("logging-jetty",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]jetty-slf4j-impl-.*\\.jar"),
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]jetty-slf4j-impl-.*\\.jar"),
Arrays.asList(
"logging/slf4j",
"logging-jetty"
)
),
Arguments.of("logging-logback",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]logback-classic-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]logback-core-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]logback-classic-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]logback-core-.*\\.jar"
),
Arrays.asList(
"logging/slf4j",
Expand All @@ -63,8 +62,8 @@ public static Stream<Arguments> validLoggingModules()
),
Arguments.of("logging-jul",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]slf4j-jdk14-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-jdk14-.*\\.jar"
),
Arrays.asList(
"logging/slf4j",
Expand All @@ -73,8 +72,8 @@ public static Stream<Arguments> validLoggingModules()
),
Arguments.of("logging-log4j1",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]slf4j-log4j12-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-log4j12-.*\\.jar"
),
Arrays.asList(
"logging/slf4j",
Expand All @@ -83,10 +82,10 @@ public static Stream<Arguments> validLoggingModules()
),
Arguments.of("logging-log4j2",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]log4j-slf4j18-impl-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]log4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]log4j-core-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-slf4j18-impl-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-core-.*\\.jar"
),
Arrays.asList(
"logging/slf4j",
Expand All @@ -96,20 +95,20 @@ public static Stream<Arguments> validLoggingModules()
// Disabled, as slf4j noop is not supported by output/log monitoring of AbstractJettyHomeTest
/* Arguments.of("logging-noop",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar"
), Arrays.asList(
"logging/slf4j",
"logging-log4j2"
)
),*/
Arguments.of("logging-logback,logging-jcl-capture,logging-jul-capture,logging-log4j1-capture",
Arrays.asList(
"\\$\\{jetty.home\\}[/\\]lib[/\\]logging[/\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]logback-classic-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]logback-core-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]jcl-over-slf4j-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]jul-to-slf4j-.*\\.jar",
"\\$\\{jetty.base\\}[/\\]lib[/\\]logging[/\\]log4j-over-slf4j-.*\\.jar"
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]logback-classic-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]logback-core-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]jcl-over-slf4j-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]jul-to-slf4j-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-over-slf4j-.*\\.jar"
),
Arrays.asList(
"logging/slf4j",
Expand Down Expand Up @@ -159,7 +158,7 @@ public void testLoggingConfiguration(String loggingModules, List<String> expecte

for (String expectedClasspathEntry : expectedClasspathEntries)
{
containsEntryWith("Expected Classpath Entry", rawConfigLogs, FS.separators(expectedClasspathEntry));
containsEntryWith("Expected Classpath Entry", rawConfigLogs, expectedClasspathEntry);
}
}

Expand Down

0 comments on commit df26fe6

Please sign in to comment.