Skip to content

Update test for no-standalone changes #5831

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
labkey-adam merged 1 commit into from
Sep 6, 2024
Merged

Update test for no-standalone changes #5831

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
5 changes: 2 additions & 3 deletions core/src/org/labkey/core/admin/logger/LoggingTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ public void testXmlFiles() throws IOException
// BioJava jars add log4j2.xml files to the class path. Tolerate them, but verify that LabKey's standard
// log4j2.xml file is found first.
String filename = "log4j2.xml";
String substring = "labkeyWebapp/WEB-INF/classes/log4j2.xml"; // Our standard log4j2.xml file
String substring2 = "labkeywebapp/WEB-INF/classes/log4j2.xml"; // From an embedded distribution
String substring = "embedded/resources/main/log4j2.xml"; // Our standard log4j2.xml file

List<URL> list = Collections.list(getClass().getClassLoader().getResources(filename));
assertFalse("Did not find expected file: " + filename, list.isEmpty());
String first = list.get(0).toString();
assertTrue("Did not find substring \"" + substring + "\" in file path of the first " + filename + " file on the class path. Here's what was found: "
+ list.stream().map(URL::toString).collect(Collectors.joining(", ")), first.contains(substring) || first.contains(substring2));
+ list.stream().map(URL::toString).collect(Collectors.joining(", ")), first.contains(substring));
}

@Test
Expand Down