From 0b06ac993829265d9e3440ee737197663405e92d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 22 Jan 2021 13:28:41 +0000 Subject: [PATCH] Use AssertJ's doesNotContainKey Closes gh-24970 --- .../BasicErrorControllerIntegrationTests.java | 37 ++++++++++--------- .../undertow/FileSessionPersistenceTests.java | 4 +- .../error/DefaultErrorAttributesTests.java | 6 +-- .../error/DefaultErrorAttributesTests.java | 24 ++++++------ 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java index 61d6abda8c..babbc738fe 100755 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -84,13 +84,13 @@ class BasicErrorControllerIntegrationTests { } @Test - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) void testErrorForMachineClientDefault() { load(); ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("?trace=true"), Map.class); assertErrorAttributes(entity.getBody(), "500", "Internal Server Error", null, "", "/"); - assertThat(entity.getBody().containsKey("exception")).isFalse(); - assertThat(entity.getBody().containsKey("trace")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("exception"); + assertThat(entity.getBody()).doesNotContainKey("trace"); } @Test @@ -136,6 +136,7 @@ class BasicErrorControllerIntegrationTests { } @Test + @SuppressWarnings("rawtypes") void testErrorForMachineClientAlwaysParamsWithoutMessage() { load("--server.error.include-exception=true", "--server.error.include-message=always"); ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("/noMessage"), Map.class); @@ -151,11 +152,11 @@ class BasicErrorControllerIntegrationTests { assertThat(entity.getBody().containsKey("trace")).isTrue(); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) private void exceptionWithoutStackTraceAndMessage(String path) { ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl(path), Map.class); assertErrorAttributes(entity.getBody(), "500", "Internal Server Error", IllegalStateException.class, "", "/"); - assertThat(entity.getBody().containsKey("trace")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("trace"); } @Test @@ -271,30 +272,30 @@ class BasicErrorControllerIntegrationTests { assertThat(entity.getBody().containsKey("errors")).isTrue(); } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings({ "rawtypes", "unchecked" }) private void bindingExceptionWithoutErrors(String param) { ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class); assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind"); - assertThat(entity.getBody().containsKey("errors")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("errors"); } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings({ "rawtypes", "unchecked" }) private void bindingExceptionWithMessage(String param) { ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class); assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "Validation failed for object='test'. Error count: 1", "/bind"); - assertThat(entity.getBody().containsKey("errors")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("errors"); } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings({ "rawtypes", "unchecked" }) private void bindingExceptionWithoutMessage(String param) { ResponseEntity entity = new TestRestTemplate().getForEntity(createUrl("/bind" + param), Map.class); assertErrorAttributes(entity.getBody(), "400", "Bad Request", BindException.class, "", "/bind"); - assertThat(entity.getBody().containsKey("errors")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("errors"); } @Test - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) void testRequestBodyValidationForMachineClient() { load("--server.error.include-exception=true"); RequestEntity request = RequestEntity.post(URI.create(createUrl("/bodyValidation"))) @@ -302,19 +303,19 @@ class BasicErrorControllerIntegrationTests { ResponseEntity entity = new TestRestTemplate().exchange(request, Map.class); assertErrorAttributes(entity.getBody(), "400", "Bad Request", MethodArgumentNotValidException.class, "", "/bodyValidation"); - assertThat(entity.getBody().containsKey("errors")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("errors"); } @Test - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) void testBindingExceptionForMachineClientDefault() { load(); RequestEntity request = RequestEntity.get(URI.create(createUrl("/bind?trace=true,message=true"))) .accept(MediaType.APPLICATION_JSON).build(); ResponseEntity entity = new TestRestTemplate().exchange(request, Map.class); - assertThat(entity.getBody().containsKey("exception")).isFalse(); - assertThat(entity.getBody().containsKey("trace")).isFalse(); - assertThat(entity.getBody().containsKey("errors")).isFalse(); + assertThat(entity.getBody()).doesNotContainKey("exception"); + assertThat(entity.getBody()).doesNotContainKey("trace"); + assertThat(entity.getBody()).doesNotContainKey("errors"); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/FileSessionPersistenceTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/FileSessionPersistenceTests.java index 80c554651a..c1952a1ad1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/FileSessionPersistenceTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/FileSessionPersistenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 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. @@ -82,7 +82,7 @@ class FileSessionPersistenceTests { this.persistence.persistSessions("test", sessionData); Map restored = this.persistence.loadSessionAttributes("test", this.classLoader); assertThat(restored).isNotNull(); - assertThat(restored.containsKey("abc")).isFalse(); + assertThat(restored).doesNotContainKey("abc"); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java index ad0c061cc2..be56afff49 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -269,8 +269,8 @@ class DefaultErrorAttributesTests { MockServerHttpRequest request = MockServerHttpRequest.get("/test").build(); Map attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, ex), ErrorAttributeOptions.defaults()); - assertThat(attributes.get("message")).isEqualTo(""); - assertThat(attributes.containsKey("errors")).isFalse(); + assertThat(attributes).containsEntry("message", ""); + assertThat(attributes).doesNotContainKey("errors"); } private ServerRequest buildServerRequest(MockServerHttpRequest request, Throwable error) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java index 8c29405b9e..e1493338a3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -90,7 +90,7 @@ class DefaultErrorAttributesTests { ErrorAttributeOptions.of(Include.MESSAGE)); assertThat(this.errorAttributes.getError(this.webRequest)).isSameAs(ex); assertThat(modelAndView).isNull(); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test"); } @@ -101,7 +101,7 @@ class DefaultErrorAttributesTests { Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); assertThat(this.errorAttributes.getError(this.webRequest)).isSameAs(ex); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test"); } @@ -112,7 +112,7 @@ class DefaultErrorAttributesTests { Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.defaults()); assertThat(this.errorAttributes.getError(this.webRequest)).isSameAs(ex); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message").toString()).contains(""); } @@ -121,7 +121,7 @@ class DefaultErrorAttributesTests { this.request.setAttribute("javax.servlet.error.message", "Test"); Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test"); } @@ -130,7 +130,7 @@ class DefaultErrorAttributesTests { this.request.setAttribute("javax.servlet.error.message", "Test"); Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.defaults()); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).asString().contains(""); } @@ -140,7 +140,7 @@ class DefaultErrorAttributesTests { this.request.setAttribute("javax.servlet.error.message", "Test"); Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test"); } @@ -149,7 +149,7 @@ class DefaultErrorAttributesTests { this.request.setAttribute("javax.servlet.error.exception", new RuntimeException()); Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("No message available"); } @@ -161,7 +161,7 @@ class DefaultErrorAttributesTests { Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); assertThat(this.errorAttributes.getError(this.webRequest)).isSameAs(wrapped); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test"); } @@ -172,7 +172,7 @@ class DefaultErrorAttributesTests { Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.of(Include.MESSAGE)); assertThat(this.errorAttributes.getError(this.webRequest)).isSameAs(error); - assertThat(attributes.containsKey("exception")).isFalse(); + assertThat(attributes).doesNotContainKey("exception"); assertThat(attributes.get("message")).isEqualTo("Test error"); } @@ -216,7 +216,7 @@ class DefaultErrorAttributesTests { assertThat(attributes.get("errors")).isEqualTo(bindingResult.getAllErrors()); } else { - assertThat(attributes.containsKey("errors")).isFalse(); + assertThat(attributes).doesNotContainKey("errors"); } } @@ -257,7 +257,7 @@ class DefaultErrorAttributesTests { this.request.setAttribute("javax.servlet.error.exception", ex); Map attributes = this.errorAttributes.getErrorAttributes(this.webRequest, ErrorAttributeOptions.defaults()); - assertThat(attributes.containsKey("trace")).isFalse(); + assertThat(attributes).doesNotContainKey("trace"); } @Test