Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge

This commit is contained in:
Greg Wilkins 2015-07-23 12:00:11 +10:00
parent e1faa5c1e9
commit 6123605694
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
View File

@ -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));
}
}

15
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
View File

@ -188,21 +188,6 @@ public class ResourceTest
}
}
/* ------------------------------------------------------------ */
@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}")
public static Collection<Data[]> data() throws Exception