Skip to content

Commit 2934a82

Browse files
committed
Suppress deprecation warnings in MvcNamespaceTests
1 parent 379d916 commit 2934a82

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
108108
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
109109
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
110-
import org.springframework.web.servlet.resource.AppCacheManifestTransformer;
111110
import org.springframework.web.servlet.resource.CachingResourceResolver;
112111
import org.springframework.web.servlet.resource.CachingResourceTransformer;
113112
import org.springframework.web.servlet.resource.ContentVersionStrategy;
@@ -414,6 +413,7 @@ public void testResourcesWithOptionalAttributes() throws Exception {
414413
}
415414

416415
@Test
416+
@SuppressWarnings("deprecation")
417417
public void testResourcesWithResolversTransformers() throws Exception {
418418
loadBeanDefinitions("mvc-config-resources-chain.xml");
419419

@@ -452,14 +452,15 @@ public void testResourcesWithResolversTransformers() throws Exception {
452452
assertThat(transformers).hasSize(3);
453453
assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
454454
assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
455-
assertThat(transformers.get(2)).isInstanceOf(AppCacheManifestTransformer.class);
455+
assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
456456

457457
CachingResourceTransformer cachingTransformer = (CachingResourceTransformer) transformers.get(0);
458458
assertThat(cachingTransformer.getCache()).isInstanceOf(ConcurrentMapCache.class);
459459
assertThat(cachingTransformer.getCache().getName()).isEqualTo("test-resource-cache");
460460
}
461461

462462
@Test
463+
@SuppressWarnings("deprecation")
463464
public void testResourcesWithResolversTransformersCustom() throws Exception {
464465
loadBeanDefinitions("mvc-config-resources-chain-no-auto.xml");
465466

@@ -489,7 +490,7 @@ public void testResourcesWithResolversTransformersCustom() throws Exception {
489490
List<ResourceTransformer> transformers = handler.getResourceTransformers();
490491
assertThat(transformers).hasSize(2);
491492
assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
492-
assertThat(transformers.get(1)).isInstanceOf(AppCacheManifestTransformer.class);
493+
assertThat(transformers.get(1)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
493494
}
494495

495496
@Test

0 commit comments

Comments
 (0)