root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-10-09 15:21:21 +01:00
parent 8948322d7a 04c2bd9c89
commit 2afb641603
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
View File

@ -101,7 +101,7 @@ public class ExplodedArchiveTests {
@Test @Test
public void getEntries() throws Exception { public void getEntries() throws Exception {
Map<String, Archive.Entry> entries = getEntriesMap(this.archive); Map<String, Archive.Entry> entries = getEntriesMap(this.archive);
assertThat(entries.size(), equalTo(9)); assertThat(entries.size(), equalTo(10));
} }
@Test @Test

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java
View File

@ -91,6 +91,7 @@ public class JarFileTests {
assertThat(entries.nextElement().getName(), equalTo("special/")); assertThat(entries.nextElement().getName(), equalTo("special/"));
assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat")); assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat"));
assertThat(entries.nextElement().getName(), equalTo("nested.jar")); assertThat(entries.nextElement().getName(), equalTo("nested.jar"));
assertThat(entries.nextElement().getName(), equalTo("another-nested.jar"));
assertThat(entries.hasMoreElements(), equalTo(false)); assertThat(entries.hasMoreElements(), equalTo(false));
URL jarUrl = new URL("jar:" + this.rootJarFile.toURI() + "!/"); URL jarUrl = new URL("jar:" + this.rootJarFile.toURI() + "!/");
URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { jarUrl }); URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { jarUrl });
@ -132,6 +133,7 @@ public class JarFileTests {
assertThat(entries.nextElement().getName(), equalTo("special/")); assertThat(entries.nextElement().getName(), equalTo("special/"));
assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat")); assertThat(entries.nextElement().getName(), equalTo("special/\u00EB.dat"));
assertThat(entries.nextElement().getName(), equalTo("nested.jar")); assertThat(entries.nextElement().getName(), equalTo("nested.jar"));
assertThat(entries.nextElement().getName(), equalTo("another-nested.jar"));
assertThat(entries.hasMoreElements(), equalTo(false)); assertThat(entries.hasMoreElements(), equalTo(false));
} }