From 3e14cdbc6983d026dece705f2915e353cab12ae1 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 4 Jan 2022 13:56:16 +0100 Subject: [PATCH 1/2] Polish tests --- .../interceptor/RollbackRuleTests.java | 45 +++++++++---------- .../web/context/ContextLoaderTests.java | 40 ++++++++--------- ...scapeTagOutsideDispatcherServletTests.java | 4 +- .../web/servlet/tags/HtmlEscapeTagTests.java | 18 ++++---- ...ssageTagOutsideDispatcherServletTests.java | 4 +- .../web/servlet/tags/MessageTagTests.java | 42 ++++++++--------- .../web/servlet/tags/ThemeTagTests.java | 8 ++-- 7 files changed, 79 insertions(+), 82 deletions(-) diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java index 992053ab409..8445de81bb5 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -34,62 +34,59 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * @author Sam Brannen * @since 09.04.2003 */ -public class RollbackRuleTests { +class RollbackRuleTests { @Test - public void foundImmediatelyWithString() { - RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName()); + void foundImmediatelyWithString() { + RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class.getName()); assertThat(rr.getDepth(new Exception())).isEqualTo(0); } @Test - public void foundImmediatelyWithClass() { + void foundImmediatelyWithClass() { RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class); assertThat(rr.getDepth(new Exception())).isEqualTo(0); } @Test - public void notFound() { + void notFound() { RollbackRuleAttribute rr = new RollbackRuleAttribute(java.io.IOException.class.getName()); assertThat(rr.getDepth(new MyRuntimeException(""))).isEqualTo(-1); } @Test - public void ancestry() { - RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName()); + void ancestry() { + RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class.getName()); // Exception -> Runtime -> NestedRuntime -> MyRuntimeException assertThat(rr.getDepth(new MyRuntimeException(""))).isEqualTo(3); } @Test - public void alwaysTrueForThrowable() { - RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Throwable.class.getName()); - assertThat(rr.getDepth(new MyRuntimeException("")) > 0).isTrue(); - assertThat(rr.getDepth(new IOException()) > 0).isTrue(); - assertThat(rr.getDepth(new FatalBeanException(null,null)) > 0).isTrue(); - assertThat(rr.getDepth(new RuntimeException()) > 0).isTrue(); + void alwaysTrueForThrowable() { + RollbackRuleAttribute rr = new RollbackRuleAttribute(Throwable.class.getName()); + assertThat(rr.getDepth(new MyRuntimeException(""))).isGreaterThan(0); + assertThat(rr.getDepth(new IOException())).isGreaterThan(0); + assertThat(rr.getDepth(new FatalBeanException(null, null))).isGreaterThan(0); + assertThat(rr.getDepth(new RuntimeException())).isGreaterThan(0); } @Test - public void ctorArgMustBeAThrowableClassWithNonThrowableType() { - assertThatIllegalArgumentException().isThrownBy(() -> - new RollbackRuleAttribute(StringBuffer.class)); + void ctorArgMustBeAThrowableClassWithNonThrowableType() { + assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute(Object.class)); } @Test - public void ctorArgMustBeAThrowableClassWithNullThrowableType() { - assertThatIllegalArgumentException().isThrownBy(() -> - new RollbackRuleAttribute((Class) null)); + void ctorArgMustBeAThrowableClassWithNullThrowableType() { + assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute((Class) null)); } @Test - public void ctorArgExceptionStringNameVersionWithNull() { - assertThatIllegalArgumentException().isThrownBy(() -> - new RollbackRuleAttribute((String) null)); + void ctorArgExceptionStringNameVersionWithNull() { + assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute((String) null)); } @Test - public void foundEnclosedExceptionWithEnclosingException() { + void foundEnclosedExceptionWithEnclosingException() { RollbackRuleAttribute rr = new RollbackRuleAttribute(EnclosingException.class); assertThat(rr.getDepth(new EnclosingException.EnclosedException())).isEqualTo(0); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index 961ec8bd5e7..9e0d1259f9e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -58,10 +58,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @since 12.08.2003 * @see org.springframework.web.context.support.Spr8510Tests */ -public class ContextLoaderTests { +class ContextLoaderTests { @Test - public void testContextLoaderListenerWithDefaultContext() { + void contextLoaderListenerWithDefaultContext() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "/org/springframework/web/context/WEB-INF/applicationContext.xml " + @@ -95,7 +95,7 @@ public class ContextLoaderTests { * context before calling refresh in ContextLoaders. */ @Test - public void testContextLoaderListenerWithCustomizedContextLoader() { + void contextLoaderListenerWithCustomizedContextLoader() { final StringBuffer buffer = new StringBuffer(); final String expectedContents = "customizeContext() was called"; final MockServletContext sc = new MockServletContext(""); @@ -115,7 +115,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithLocalContextInitializers() { + void contextLoaderListenerWithLocalContextInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -130,7 +130,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithGlobalContextInitializers() { + void contextLoaderListenerWithGlobalContextInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -145,7 +145,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithMixedContextInitializers() { + void contextLoaderListenerWithMixedContextInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -160,7 +160,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithProgrammaticInitializers() { + void contextLoaderListenerWithProgrammaticInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -174,7 +174,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithProgrammaticAndLocalInitializers() { + void contextLoaderListenerWithProgrammaticAndLocalInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -189,7 +189,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithProgrammaticAndGlobalInitializers() { + void contextLoaderListenerWithProgrammaticAndGlobalInitializers() { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml"); @@ -204,7 +204,7 @@ public class ContextLoaderTests { } @Test - public void testRegisteredContextInitializerCanAccessServletContextParamsViaEnvironment() { + void registeredContextInitializerCanAccessServletContextParamsViaEnvironment() { MockServletContext sc = new MockServletContext(""); // config file doesn't matter - just a placeholder sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, @@ -218,7 +218,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderListenerWithUnknownContextInitializer() { + void contextLoaderListenerWithUnknownContextInitializer() { MockServletContext sc = new MockServletContext(""); // config file doesn't matter. just a placeholder sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, @@ -232,7 +232,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderWithCustomContext() throws Exception { + void contextLoaderWithCustomContext() throws Exception { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "org.springframework.web.servlet.SimpleWebApplicationContext"); @@ -246,7 +246,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderWithInvalidLocation() throws Exception { + void contextLoaderWithInvalidLocation() throws Exception { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "/WEB-INF/myContext.xml"); ServletContextListener listener = new ContextLoaderListener(); @@ -257,7 +257,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderWithInvalidContext() throws Exception { + void contextLoaderWithInvalidContext() throws Exception { MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "org.springframework.web.context.support.InvalidWebApplicationContext"); @@ -269,7 +269,7 @@ public class ContextLoaderTests { } @Test - public void testContextLoaderWithDefaultLocation() throws Exception { + void contextLoaderWithDefaultLocation() throws Exception { MockServletContext sc = new MockServletContext(""); ServletContextListener listener = new ContextLoaderListener(); ServletContextEvent event = new ServletContextEvent(sc); @@ -281,7 +281,7 @@ public class ContextLoaderTests { } @Test - public void testFrameworkServletWithDefaultLocation() throws Exception { + void frameworkServletWithDefaultLocation() throws Exception { DispatcherServlet servlet = new DispatcherServlet(); servlet.setContextClass(XmlWebApplicationContext.class); assertThatExceptionOfType(BeanDefinitionStoreException.class) @@ -292,7 +292,7 @@ public class ContextLoaderTests { } @Test - public void testFrameworkServletWithCustomLocation() throws Exception { + void frameworkServletWithCustomLocation() throws Exception { DispatcherServlet servlet = new DispatcherServlet(); servlet.setContextConfigLocation("/org/springframework/web/context/WEB-INF/testNamespace.xml " + "/org/springframework/web/context/WEB-INF/context-addition.xml"); @@ -303,7 +303,7 @@ public class ContextLoaderTests { @Test @SuppressWarnings("resource") - public void testClassPathXmlApplicationContext() throws IOException { + void classPathXmlApplicationContext() throws IOException { ApplicationContext context = new ClassPathXmlApplicationContext( "/org/springframework/web/context/WEB-INF/applicationContext.xml"); assertThat(context.containsBean("father")).as("Has father").isTrue(); @@ -322,7 +322,7 @@ public class ContextLoaderTests { @Test @SuppressWarnings("resource") - public void testSingletonDestructionOnStartupFailure() throws IOException { + void singletonDestructionOnStartupFailure() throws IOException { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> new ClassPathXmlApplicationContext(new String[] { "/org/springframework/web/context/WEB-INF/applicationContext.xml", diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java index 77257f567f4..d69e9142470 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2022 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. @@ -20,7 +20,7 @@ package org.springframework.web.servlet.tags; * @author Juergen Hoeller * @since 14.01.2005 */ -public class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests { +class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests { @Override protected boolean inDispatcherServlet() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index 7f8f57aa5f8..e27414fc9e2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -33,10 +33,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alef Arendsen */ @SuppressWarnings("serial") -public class HtmlEscapeTagTests extends AbstractTagTests { +class HtmlEscapeTagTests extends AbstractTagTests { @Test - public void htmlEscapeTag() throws JspException { + void htmlEscapeTag() throws JspException { PageContext pc = createPageContext(); HtmlEscapeTag tag = new HtmlEscapeTag(); tag.setPageContext(pc); @@ -88,7 +88,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void htmlEscapeTagWithContextParamTrue() throws JspException { + void htmlEscapeTagWithContextParamTrue() throws JspException { PageContext pc = createPageContext(); MockServletContext sc = (MockServletContext) pc.getServletContext(); sc.addInitParameter(WebUtils.HTML_ESCAPE_CONTEXT_PARAM, "true"); @@ -109,7 +109,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void htmlEscapeTagWithContextParamFalse() throws JspException { + void htmlEscapeTagWithContextParamFalse() throws JspException { PageContext pc = createPageContext(); MockServletContext sc = (MockServletContext) pc.getServletContext(); HtmlEscapeTag tag = new HtmlEscapeTag(); @@ -129,7 +129,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void escapeBody() throws JspException { + void escapeBody() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { @@ -149,7 +149,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void escapeBodyWithHtmlEscape() throws JspException { + void escapeBodyWithHtmlEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { @@ -170,7 +170,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void escapeBodyWithJavaScriptEscape() throws JspException { + void escapeBodyWithJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { @@ -191,7 +191,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { } @Test - public void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException { + void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java index 23b44313c3f..42907b1e634 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2022 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. @@ -20,7 +20,7 @@ package org.springframework.web.servlet.tags; * @author Juergen Hoeller * @since 14.01.2005 */ -public class MessageTagOutsideDispatcherServletTests extends MessageTagTests { +class MessageTagOutsideDispatcherServletTests extends MessageTagTests { @Override protected boolean inDispatcherServlet() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 03698a7c57f..48ba4b25ecf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -44,10 +44,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Nicholas Williams */ @SuppressWarnings("serial") -public class MessageTagTests extends AbstractTagTests { +class MessageTagTests extends AbstractTagTests { @Test - public void messageTagWithMessageSourceResolvable() throws JspException { + void messageTagWithMessageSourceResolvable() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -64,7 +64,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCode() throws JspException { + void messageTagWithCode() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -81,7 +81,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndArgument() throws JspException { + void messageTagWithCodeAndArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -99,7 +99,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndArguments() throws JspException { + void messageTagWithCodeAndArguments() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -117,7 +117,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException { + void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -136,7 +136,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndArrayArgument() throws JspException { + void messageTagWithCodeAndArrayArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -154,7 +154,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndObjectArgument() throws JspException { + void messageTagWithCodeAndObjectArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -172,7 +172,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException { + void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -191,7 +191,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndNestedArgument() throws JspException { + void messageTagWithCodeAndNestedArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -209,7 +209,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndNestedArguments() throws JspException { + void messageTagWithCodeAndNestedArguments() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -228,7 +228,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithCodeAndText() throws JspException { + void messageTagWithCodeAndText() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -246,7 +246,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithText() throws JspException { + void messageTagWithText() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -264,7 +264,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithTextEncodingEscaped() throws JspException { + void messageTagWithTextEncodingEscaped() throws JspException { PageContext pc = createPageContext(); pc.getServletContext().setInitParameter(WebUtils.RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM, "true"); pc.getResponse().setCharacterEncoding("UTF-8"); @@ -284,7 +284,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithTextAndJavaScriptEscape() throws JspException { + void messageTagWithTextAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -302,7 +302,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException { + void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { @@ -321,7 +321,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageWithVarAndScope() throws JspException { + void messageWithVarAndScope() throws JspException { PageContext pc = createPageContext(); MessageTag tag = new MessageTag(); tag.setPageContext(pc); @@ -344,7 +344,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void messageWithVar() throws JspException { + void messageWithVar() throws JspException { PageContext pc = createPageContext(); MessageTag tag = new MessageTag(); tag.setPageContext(pc); @@ -366,7 +366,7 @@ public class MessageTagTests extends AbstractTagTests { } @Test - public void nullMessageSource() throws JspException { + void nullMessageSource() throws JspException { PageContext pc = createPageContext(); ConfigurableWebApplicationContext ctx = (ConfigurableWebApplicationContext) RequestContextUtils.findWebApplicationContext((HttpServletRequest) pc.getRequest(), pc.getServletContext()); @@ -382,7 +382,7 @@ public class MessageTagTests extends AbstractTagTests { @Test @SuppressWarnings("rawtypes") - public void requestContext() throws ServletException { + void requestContext() throws ServletException { PageContext pc = createPageContext(); RequestContext rc = new RequestContext((HttpServletRequest) pc.getRequest(), pc.getServletContext()); assertThat(rc.getMessage("test")).isEqualTo("test message"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index 2704a558271..7b8b35cd4da 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -37,11 +37,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Juergen Hoeller * @author Alef Arendsen */ -public class ThemeTagTests extends AbstractTagTests { +class ThemeTagTests extends AbstractTagTests { @Test @SuppressWarnings("serial") - public void themeTag() throws JspException { + void themeTag() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); ThemeTag tag = new ThemeTag() { @@ -59,7 +59,7 @@ public class ThemeTagTests extends AbstractTagTests { @Test @SuppressWarnings("rawtypes") - public void requestContext() throws ServletException { + void requestContext() throws ServletException { PageContext pc = createPageContext(); RequestContext rc = new RequestContext((HttpServletRequest) pc.getRequest()); assertThat(rc.getThemeMessage("themetest")).isEqualTo("theme test message"); From 03668f9c103e40ec2dab222eec7ace44b9e63d07 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 4 Jan 2022 14:00:00 +0100 Subject: [PATCH 2/2] Replace remaining use of StringBuffer with StringBuilder Although this commit only applies to test classes, it serves to reduce the noise when searching for undesirable usage of StringBuffer in production code. --- .../AbstractAspectJAdvisorFactoryTests.java | 8 ++--- ...rtiesContextWithContextHierarchyTests.java | 24 +++++++-------- .../web/context/ContextLoaderTests.java | 6 ++-- .../web/servlet/tags/HtmlEscapeTagTests.java | 8 ++--- .../web/servlet/tags/MessageTagTests.java | 30 +++++++++---------- .../web/servlet/tags/ThemeTagTests.java | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 612aa61af66..9aeeef0f156 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -322,7 +322,7 @@ abstract class AbstractAspectJAdvisorFactoryTests { int b = 12; int c = 25; String d = "d"; - StringBuffer e = new StringBuffer("stringbuf"); + StringBuilder e = new StringBuilder("stringbuf"); String expectedResult = a + b+ c + d + e; assertThat(mva.mungeArgs(a, b, c, d, e)).isEqualTo(expectedResult); } @@ -728,12 +728,12 @@ abstract class AbstractAspectJAdvisorFactoryTests { @Aspect static class ManyValuedArgs { - String mungeArgs(String a, int b, int c, String d, StringBuffer e) { + String mungeArgs(String a, int b, int c, String d, StringBuilder e) { return a + b + c + d + e; } @Around(value="execution(String mungeArgs(..)) && args(a, b, c, d, e)", argNames="b,c,d,e,a") - String reverseAdvice(ProceedingJoinPoint pjp, int b, int c, String d, StringBuffer e, String a) throws Throwable { + String reverseAdvice(ProceedingJoinPoint pjp, int b, int c, String d, StringBuilder e, String a) throws Throwable { assertThat(pjp.proceed()).isEqualTo(a + b+ c+ d+ e); return a + b + c + d + e; } diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java index 0662049ca59..5d3c2684405 100644 --- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -54,10 +54,10 @@ import static org.assertj.core.api.Assertions.assertThat; class DirtiesContextWithContextHierarchyTests { @Autowired - private StringBuffer foo; + private StringBuilder foo; @Autowired - private StringBuffer baz; + private StringBuilder baz; @Autowired private ApplicationContext context; @@ -74,7 +74,7 @@ class DirtiesContextWithContextHierarchyTests { @Order(1) void verifyOriginalStateAndDirtyContexts() { assertOriginalState(); - reverseStringBuffers(); + reverseStringBuilders(); } @Test @@ -90,7 +90,7 @@ class DirtiesContextWithContextHierarchyTests { @DirtiesContext(hierarchyMode = HierarchyMode.CURRENT_LEVEL) void verifyOriginalStateWasReinstatedAndDirtyContextsAndTriggerCurrentLevelCacheClearing() { assertOriginalState(); - reverseStringBuffers(); + reverseStringBuilders(); } @Test @@ -100,7 +100,7 @@ class DirtiesContextWithContextHierarchyTests { assertCleanChildContext(); } - private void reverseStringBuffers() { + private void reverseStringBuilders() { foo.reverse(); baz.reverse(); } @@ -131,13 +131,13 @@ class DirtiesContextWithContextHierarchyTests { static class ParentConfig { @Bean - StringBuffer foo() { - return new StringBuffer("foo"); + StringBuilder foo() { + return new StringBuilder("foo"); } @Bean - StringBuffer baz() { - return new StringBuffer("baz-parent"); + StringBuilder baz() { + return new StringBuilder("baz-parent"); } } @@ -145,8 +145,8 @@ class DirtiesContextWithContextHierarchyTests { static class ChildConfig { @Bean - StringBuffer baz() { - return new StringBuffer("baz-child"); + StringBuilder baz() { + return new StringBuilder("baz-child"); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index 9e0d1259f9e..01d63c21f82 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -96,7 +96,7 @@ class ContextLoaderTests { */ @Test void contextLoaderListenerWithCustomizedContextLoader() { - final StringBuffer buffer = new StringBuffer(); + final StringBuilder builder = new StringBuilder(); final String expectedContents = "customizeContext() was called"; final MockServletContext sc = new MockServletContext(""); sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, @@ -107,11 +107,11 @@ class ContextLoaderTests { assertThat(sc).as("The ServletContext should not be null.").isNotNull(); assertThat(sc).as("Verifying that we received the expected ServletContext.").isEqualTo(sc); assertThat(wac.isActive()).as("The ApplicationContext should not yet have been refreshed.").isFalse(); - buffer.append(expectedContents); + builder.append(expectedContents); } }; listener.contextInitialized(new ServletContextEvent(sc)); - assertThat(buffer.toString()).as("customizeContext() should have been called.").isEqualTo(expectedContents); + assertThat(builder.toString()).as("customizeContext() should have been called.").isEqualTo(expectedContents); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index e27414fc9e2..5bb5f464851 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -131,7 +131,7 @@ class HtmlEscapeTagTests extends AbstractTagTests { @Test void escapeBody() throws JspException { PageContext pc = createPageContext(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); EscapeBodyTag tag = new EscapeBodyTag() { @Override protected String readBodyContent() { @@ -151,7 +151,7 @@ class HtmlEscapeTagTests extends AbstractTagTests { @Test void escapeBodyWithHtmlEscape() throws JspException { PageContext pc = createPageContext(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); EscapeBodyTag tag = new EscapeBodyTag() { @Override protected String readBodyContent() { @@ -172,7 +172,7 @@ class HtmlEscapeTagTests extends AbstractTagTests { @Test void escapeBodyWithJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); EscapeBodyTag tag = new EscapeBodyTag() { @Override protected String readBodyContent() { @@ -193,7 +193,7 @@ class HtmlEscapeTagTests extends AbstractTagTests { @Test void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); - final StringBuffer result = new StringBuffer(); + final StringBuilder result = new StringBuilder(); EscapeBodyTag tag = new EscapeBodyTag() { @Override protected String readBodyContent() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 48ba4b25ecf..ae1024bc5c9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -49,7 +49,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithMessageSourceResolvable() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -66,7 +66,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCode() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -83,7 +83,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndArgument() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -101,7 +101,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndArguments() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -119,7 +119,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -138,7 +138,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndArrayArgument() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -156,7 +156,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndObjectArgument() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -174,7 +174,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -193,7 +193,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndNestedArgument() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -211,7 +211,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndNestedArguments() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -230,7 +230,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithCodeAndText() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -248,7 +248,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithText() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -268,7 +268,7 @@ class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); pc.getServletContext().setInitParameter(WebUtils.RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM, "true"); pc.getResponse().setCharacterEncoding("UTF-8"); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -286,7 +286,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithTextAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { @@ -304,7 +304,7 @@ class MessageTagTests extends AbstractTagTests { @Test void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); MessageTag tag = new MessageTag() { @Override protected void writeMessage(String msg) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index 7b8b35cd4da..3eb98f58d28 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -43,7 +43,7 @@ class ThemeTagTests extends AbstractTagTests { @SuppressWarnings("serial") void themeTag() throws JspException { PageContext pc = createPageContext(); - final StringBuffer message = new StringBuffer(); + final StringBuilder message = new StringBuilder(); ThemeTag tag = new ThemeTag() { @Override protected void writeMessage(String msg) {