From f3e860e8f17d37341067d9285af12940eac8bed4 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 30 May 2018 00:31:35 +0200 Subject: [PATCH] Resource handler tests expect status 404 for directory in jar file Issue: SPR-16832 --- .../web/reactive/resource/ResourceWebHandlerTests.java | 9 +++++---- .../resource/ResourceHttpRequestHandlerTests.java | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java index cd8a17c2c7f..387f3077b05 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java @@ -426,10 +426,11 @@ public class ResourceWebHandlerTests { public void directoryInJarFile() { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("")); setPathWithinHandlerMapping(exchange, "underscorejs/"); - this.handler.handle(exchange).block(TIMEOUT); - - assertNull(exchange.getResponse().getStatusCode()); - assertEquals(0, exchange.getResponse().getHeaders().getContentLength()); + StepVerifier.create(this.handler.handle(exchange)) + .expectErrorSatisfies(err -> { + assertThat(err, instanceOf(ResponseStatusException.class)); + assertEquals(HttpStatus.NOT_FOUND, ((ResponseStatusException) err).getStatus()); + }).verify(TIMEOUT); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java index 1c13e06624f..5e6c9e18c92 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -494,8 +494,7 @@ public class ResourceHttpRequestHandlerTests { public void directoryInJarFile() throws Exception { this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "underscorejs/"); this.handler.handleRequest(this.request, this.response); - assertEquals(200, this.response.getStatus()); - assertEquals(0, this.response.getContentLength()); + assertEquals(404, this.response.getStatus()); } @Test