diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java index 5fcb4b499a..0241bc9eb4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class WebJarsResourceResolverTests { @Before public void setup() { // for this to work, an actual WebJar must be on the test classpath - this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/")); + this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars")); this.resolver = new WebJarsResourceResolver(); this.chain = mock(ResourceResolverChain.class); } @@ -71,20 +71,20 @@ public class WebJarsResourceResolverTests { @Test public void resolveUrlExistingNotInJarFile() { this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); - String file = "/foo/foo.txt"; + String file = "foo/foo.txt"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain); assertNull(actual); verify(this.chain, times(1)).resolveUrlPath(file, this.locations); - verify(this.chain, never()).resolveUrlPath("/foo/2.3/foo.txt", this.locations); + verify(this.chain, never()).resolveUrlPath("foo/2.3/foo.txt", this.locations); } @Test public void resolveUrlWebJarResource() { - String file = "/underscorejs/underscore.js"; - String expected = "/underscorejs/1.8.3/underscore.js"; + String file = "underscorejs/underscore.js"; + String expected = "underscorejs/1.8.3/underscore.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); given(this.chain.resolveUrlPath(expected, this.locations)).willReturn(expected); @@ -97,7 +97,7 @@ public class WebJarsResourceResolverTests { @Test public void resolveUrlWebJarResourceNotFound() { - String file = "/something/something.js"; + String file = "something/something.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); String actual = this.resolver.resolveUrlPath(file, this.locations, this.chain); @@ -111,7 +111,7 @@ public class WebJarsResourceResolverTests { public void resolveResourceExisting() { Resource expected = mock(Resource.class); this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); - String file = "/foo/2.3/foo.txt"; + String file = "foo/2.3/foo.txt"; given(this.chain.resolveResource(this.request, file, this.locations)).willReturn(expected); Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain); @@ -122,7 +122,7 @@ public class WebJarsResourceResolverTests { @Test public void resolveResourceNotFound() { - String file = "/something/something.js"; + String file = "something/something.js"; given(this.chain.resolveUrlPath(file, this.locations)).willReturn(null); Resource actual = this.resolver.resolveResource(this.request, file, this.locations, this.chain); @@ -135,8 +135,8 @@ public class WebJarsResourceResolverTests { @Test public void resolveResourceWebJar() { Resource expected = mock(Resource.class); - String file = "/underscorejs/underscore.js"; - String expectedPath = "/underscorejs/1.8.3/underscore.js"; + String file = "underscorejs/underscore.js"; + String expectedPath = "underscorejs/1.8.3/underscore.js"; this.locations = Collections.singletonList(new ClassPathResource("/META-INF/resources/webjars/", getClass())); given(this.chain.resolveResource(this.request, expectedPath, this.locations)).willReturn(expected);