From 6123605694523dc8b5990f98a57198d960909511 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 23 Jul 2015 12:00:11 +1000 Subject: [PATCH] fixed merge --- .../util/resource/FileSystemResourceTest.java | 8 +++++--- .../eclipse/jetty/util/resource/ResourceTest.java | 15 --------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index c6648b40a29..b0de5789d04 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -51,10 +51,10 @@ import org.eclipse.jetty.toolchain.test.IO; import org.eclipse.jetty.toolchain.test.OS; import org.eclipse.jetty.toolchain.test.TestingDir; import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.util.CollectionAssert; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -551,8 +551,10 @@ public class FileSystemResourceTest String list[] = base.list(); List actual = Arrays.asList(list); - CollectionAssert.assertContainsUnordered("Resource Directory Listing", - expected,actual); + assertEquals(expected.size(),actual.size()); + for (String s : expected) + assertEquals(true,actual.contains(s)); + } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java index 33258d0e1d2..89c600c50c9 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java @@ -187,21 +187,6 @@ public class ResourceTest return bdata; } } - - /* ------------------------------------------------------------ */ - @Test - public void testEncodeAddPath () - throws Exception - { - Resource r; - - r = Resource.newResource(__userURL+"TestData/").addPath("foo%/b r"); - Assert.assertThat(r.getURI().toString(),Matchers.endsWith("/foo%25/b%20r")); - - r = Resource.newResource("jar:"+__userURL+"TestData/test.zip!/subdir/").addPath("foo%/b r"); - Assert.assertThat(r.getURI().toString(),Matchers.endsWith("/foo%25/b%20r")); - } - @Parameters(name="{0}")