Skip to content
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

Jump to bottom

Issue #6021 - PoC for resolvePath within XmlConfiguration #6022

Merged
merged 10 commits into from
Mar 3, 2021
Merged

Issue #6021 - PoC for resolvePath within XmlConfiguration #6022

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
613e0ec
Issue #6021 - PoC for resolvePath within XmlConfiguration
joakime Mar 2, 2021
927dc60
Issue #6021 - Fixing test case
joakime Mar 2, 2021
021451c
Issue #6021 - Adding windows specific testcases
joakime Mar 3, 2021
87f7530
Issue #6021 - Addressing expectations on Windows
joakime Mar 3, 2021
3a457a1
Issue #6021 - More windows specific test cases
joakime Mar 3, 2021
e34c1cc
Issue #6021 - Tabs vs Spaces
joakime Mar 3, 2021
9de2c20
Issue #6021 - Simpler resolvePath
joakime Mar 3, 2021
48d296a
Issue #6021 - Addressing naming
joakime Mar 3, 2021
40e9cd0
Issue #6021 - Addressing naming
joakime Mar 3, 2021
6d2ea3d
Issue #6021 - Addressing defaults
joakime Mar 3, 2021
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
24 changes: 16 additions & 8 deletions jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,15 +1622,23 @@ public void testCallResolvePath(String configValue, String expectedPath) throws
" </Set>" +
"</Configure>");

configuration.setJettyStandardIdsAndProperties(null, Resource.newResource(war));
configuration.getProperties().put("jetty.base", "/var/lib/jetty-base");
if (configValue != null)
configuration.getProperties().put("jetty.sslContext.keyStorePath", configValue);
try
{
configuration.setJettyStandardIdsAndProperties(null, Resource.newResource(war));
configuration.getProperties().put("jetty.base", "/var/lib/jetty-base");
if (configValue != null)
configuration.getProperties().put("jetty.sslContext.keyStorePath", configValue);

TestConfiguration tc = new TestConfiguration();
configuration.configure(tc);
TestConfiguration tc = new TestConfiguration();
configuration.configure(tc);

assertThat(tc.getTestString(), is(expectedPath));
assertThat(tc.getTestString(), is(expectedPath));
gregw marked this conversation as resolved.
Show resolved Hide resolved
}
finally
{
// cleanup after myself
configuration.getProperties().remove("jetty.base");
}
}

@Test
Expand Down Expand Up @@ -1658,7 +1666,7 @@ public void testResolvePathInvalidBase()
FS.ensureDeleted(testPath);
Path baseDir = testPath.resolve("bogus");
String resolved = XmlConfiguration.resolvePath(baseDir.toString(), "etc/keystore");
assertNull(resolved, "Should be null as baseDir does not exist");
assertEquals(baseDir.resolve("etc/keystore").toString(), resolved);
}

private ByteArrayOutputStream captureLoggingBytes(ThrowableAction action) throws Exception
Expand Down