Using new jetty-test-helper methods to help with symlinked

This commit is contained in:
Joakim Erdfelt 2015-07-23 16:16:04 -07:00
parent 06cb0ca897
commit 07423d92e2
1 changed files with 3 additions and 2 deletions

View File

@ -18,6 +18,7 @@
package org.eclipse.jetty.webapp; package org.eclipse.jetty.webapp;
import static org.eclipse.jetty.toolchain.test.ExtraMatchers.*;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -55,7 +56,7 @@ public class WebAppClassLoaderTest
@Before @Before
public void init() throws Exception public void init() throws Exception
{ {
this.testWebappDir = MavenTestingUtils.getProjectDir("src/test/webapp").toPath(); this.testWebappDir = MavenTestingUtils.getProjectDirPath("src/test/webapp");
Resource webapp = new PathResource(testWebappDir); Resource webapp = new PathResource(testWebappDir);
_context = new WebAppContext(); _context = new WebAppContext();
@ -257,7 +258,7 @@ public class WebAppClassLoaderTest
expected.add(webappWebInfClasses); expected.add(webappWebInfClasses);
expected.add(targetTestClasses); expected.add(targetTestClasses);
assertOrdered("Resources Found (Parent Loader Priority == false)",expected,resources); assertThat("Resources Found (Parent Loader Priority == false)",resources,ordered(expected));
// dump(resources); // dump(resources);
// assertEquals(3,resources.size()); // assertEquals(3,resources.size());