Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-07-23 02:00:11 +0000
committerGreg Wilkins2015-07-23 02:00:11 +0000
commit6123605694523dc8b5990f98a57198d960909511 (patch)
treed96fbccc054d56c63214738882834b4a2abaa30c
parente1faa5c1e920ee4071c5dc2dab575b9452b4f625 (diff)
downloadorg.eclipse.jetty.project-6123605694523dc8b5990f98a57198d960909511.tar.gz
org.eclipse.jetty.project-6123605694523dc8b5990f98a57198d960909511.tar.xz
org.eclipse.jetty.project-6123605694523dc8b5990f98a57198d960909511.zip
fixed merge
-rw-r--r--jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java8
-rw-r--r--jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java15
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 c6648b40a2..b0de5789d0 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<String> 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 33258d0e1d..89c600c50c 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}")

Back to the top