admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert assertThat(!x).isTrue() to assertThat(x).isFalse()

Browse Source 
Search:  assertThat\(\!(.+?)\)(.*?)\.isTrue\(\)

Replace: assertThat($1)$2.isFalse()

See gh-36504
This commit is contained in:
Sam Brannen
2026-03-19 15:01:17 +01:00
parent 4548f1ec66
commit 4357bbd31b
14 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java
+2 -2
View File
@@ -90,7 +90,7 @@ public abstract class AbstractBeanFactoryTests {
// The dummy business method will throw an exception if the
// necessary callbacks weren't invoked in the right order.
lb.businessMethod();
assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue();
assertThat(lb.isDestroyed()).as("Not destroyed").isFalse();
}
@Test
@@ -160,7 +160,7 @@ public abstract class AbstractBeanFactoryTests {
tb2.setAge(2);
assertThat(tb1.getAge()).as("1 age independent = 1").isEqualTo(1);
assertThat(tb2.getAge()).as("2 age independent = 2").isEqualTo(2);
assertThat(!tb1.equals(tb2)).as("object equal now false").isTrue();
assertThat(tb1.equals(tb2)).as("object equal now false").isFalse();
}
@Test
spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java
+2 -2
View File
@@ -133,10 +133,10 @@ class SimpleMailMessageTests {
// Null object is not equal
message1 = new SimpleMailMessage();
message2 = null;
assertThat(!(message1.equals(message2))).isTrue();
assertThat((message1.equals(message2))).isFalse();
// Different class is not equal
assertThat(!(message1.equals(new Object()))).isTrue();
assertThat((message1.equals(new Object()))).isFalse();
// Equal values are equal
message1 = new SimpleMailMessage();
spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
+2 -2
View File
@@ -101,12 +101,12 @@ class BeanNamePointcutTests {
assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue");
assertThat(this.counterAspect.getCount()).as("Advice not executed: must have been").isEqualTo(2);
FactoryBean<?> fb = (FactoryBean<?>) ctx.getBean("&testFactoryBean1");
assertThat(!(fb instanceof Advised)).as("FactoryBean itself must *not* be advised").isTrue();
assertThat((fb instanceof Advised)).as("FactoryBean itself must *not* be advised").isFalse();
}
@Test
void matchingFactoryBeanItself() {
assertThat(!(this.testFactoryBean2 instanceof Advised)).as("Matching bean must *not* be advised (proxied)").isTrue();
assertThat((this.testFactoryBean2 instanceof Advised)).as("Matching bean must *not* be advised (proxied)").isFalse();
FactoryBean<?> fb = (FactoryBean<?>) ctx.getBean("&testFactoryBean2");
assertThat(fb instanceof Advised).as("FactoryBean itself must be advised").isTrue();
assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue();
spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java
+2 -2
View File
@@ -93,7 +93,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
assertThat(aca.getApplicationContext()).as("has had context set").isSameAs(applicationContext);
Object aca2 = applicationContext.getBean("aca-prototype");
assertThat(aca).as("NOT Same instance").isNotSameAs(aca2);
assertThat(!applicationContext.isSingleton("aca-prototype")).as("Says is prototype").isTrue();
assertThat(applicationContext.isSingleton("aca-prototype")).as("Says is prototype").isFalse();
}
@Test
@@ -127,7 +127,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
@Test
protected void closeTriggersDestroy() {
LifecycleBean lb = (LifecycleBean) applicationContext.getBean("lifecycle");
assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue();
assertThat(lb.isDestroyed()).as("Not destroyed").isFalse();
applicationContext.close();
if (applicationContext.getParent() != null) {
((ConfigurableApplicationContext) applicationContext.getParent()).close();
spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+2 -2
View File
@@ -944,11 +944,11 @@ class ClassUtilsTests {
}
private static void assertNotPublic(Member member) {
assertThat(!isPublic(member)).as("%s must be not be public", member).isTrue();
assertThat(isPublic(member)).as("%s must be not be public", member).isFalse();
}
private static void assertNotPublic(Class<?> clazz) {
assertThat(!isPublic(clazz)).as("%s must be not be public", clazz).isTrue();
assertThat(isPublic(clazz)).as("%s must be not be public", clazz).isFalse();
}
private static boolean isPublic(Class<?> clazz) {
spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+2 -2
View File
@@ -117,7 +117,7 @@ class JdbcTemplateTests {
assertThat(this.template.getDataSource()).as("datasource ok").isSameAs(this.dataSource);
assertThat(this.template.isIgnoreWarnings()).as("ignores warnings by default").isTrue();
this.template.setIgnoreWarnings(false);
assertThat(!this.template.isIgnoreWarnings()).as("can set NOT to ignore warnings").isTrue();
assertThat(this.template.isIgnoreWarnings()).as("can set NOT to ignore warnings").isFalse();
}
@Test
@@ -1125,7 +1125,7 @@ class JdbcTemplateTests {
given(this.callableStatement.getUpdateCount()).willReturn(-1);
given(this.callableStatement.getObject(1)).willReturn("X");
assertThat(!this.template.isResultsMapCaseInsensitive()).as("default should have been NOT case insensitive").isTrue();
assertThat(this.template.isResultsMapCaseInsensitive()).as("default should have been NOT case insensitive").isFalse();
this.template.setResultsMapCaseInsensitive(true);
assertThat(this.template.isResultsMapCaseInsensitive()).as("now it should have been set to case insensitive").isTrue();
spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
+1 -1
View File
@@ -94,7 +94,7 @@ class CallMetaDataContextTests {
assertThat(inParameters).as("Wrong number of matched in parameter values").hasSize(2);
assertThat(inParameters.containsKey("id")).as("in parameter value missing").isTrue();
assertThat(inParameters.containsKey("name")).as("in out parameter value missing").isTrue();
assertThat(!inParameters.containsKey("customer_no")).as("out parameter value matched").isTrue();
assertThat(inParameters.containsKey("customer_no")).as("out parameter value matched").isFalse();
List<String> names = context.getOutParameterNames();
assertThat(names).as("Wrong number of out parameters").hasSize(2);
spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+5 -5
View File
@@ -97,14 +97,14 @@ class JndiJtaTransactionManagerTests {
}
TransactionTemplate tt = new TransactionTemplate(ptm);
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
tt.executeWithoutResult(status -> {
// something transactional
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
});
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
@@ -139,14 +139,14 @@ class JndiJtaTransactionManagerTests {
assertThat(ptm.getTransactionManager()).isEqualTo(tm);
TransactionTemplate tt = new TransactionTemplate(ptm);
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
tt.executeWithoutResult(status -> {
// something transactional
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
});
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
verify(ut).begin();
@@ -170,7 +170,7 @@ class JndiJtaTransactionManagerTests {
TransactionTemplate tt = new TransactionTemplate(ptm);
assertThat(ptm.getTransactionSynchronization()).isEqualTo(JtaTransactionManager.SYNCHRONIZATION_ALWAYS);
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
tt.executeWithoutResult(status -> {
// something transactional
spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+2 -2
View File
@@ -204,7 +204,7 @@ class ServletRequestDataBinderTests {
request.addParameter("test_age", "" + 50);
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue();
assertThat(pvs.contains("forname")).as("Didn't find normal when given prefix").isFalse();
assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue();
pvs = new ServletRequestParameterPropertyValues(request, "test");
@@ -239,7 +239,7 @@ class ServletRequestDataBinderTests {
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue();
assertThat(pvs.contains("tory")).as("Doesn't contain tory").isFalse();
PropertyValue[] ps = pvs.getPropertyValues();
Map<String, String> m = new HashMap<>();
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
+2 -2
View File
@@ -307,7 +307,7 @@ class WebRequestDataBinderTests {
request.addParameter("test_age", "" + 50);
ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request);
assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue();
assertThat(pvs.contains("forname")).as("Didn't find normal when given prefix").isFalse();
assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue();
pvs = new ServletRequestParameterPropertyValues(request, "test");
@@ -322,7 +322,7 @@ class WebRequestDataBinderTests {
assertThat(pvs.contains("forname")).as("Contains forname").isTrue();
assertThat(pvs.contains("surname")).as("Contains surname").isTrue();
assertThat(pvs.contains("age")).as("Contains age").isTrue();
assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue();
assertThat(pvs.contains("tory")).as("Doesn't contain tory").isFalse();
PropertyValue[] pvArray = pvs.getPropertyValues();
Map<String, String> m = new HashMap<>();
spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+1 -1
View File
@@ -77,7 +77,7 @@ class ContextLoaderTests {
assertThat(context.containsBean("father")).as("Has father").isTrue();
assertThat(context.containsBean("rod")).as("Has rod").isTrue();
assertThat(context.containsBean("kerry")).as("Has kerry").isTrue();
assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue();
assertThat(lb.isDestroyed()).as("Not destroyed").isFalse();
assertThat(context.containsBean("beans1.bean1")).isFalse();
assertThat(context.containsBean("beans1.bean2")).isFalse();
listener.contextDestroyed(event);
spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+2 -2
View File
@@ -135,9 +135,9 @@ class XmlWebApplicationContextTests extends AbstractApplicationContextTests {
InitAndIB iib = (InitAndIB) this.applicationContext.getBean("init-and-ib");
assertThat(InitAndIB.constructed).isTrue();
assertThat(iib.afterPropertiesSetInvoked && iib.initMethodInvoked).isTrue();
assertThat(!iib.destroyed && !iib.customDestroyed).isTrue();
assertThat(iib.destroyed && !iib.customDestroyed).isFalse();
this.applicationContext.close();
assertThat(!iib.destroyed && !iib.customDestroyed).isTrue();
assertThat(iib.destroyed && !iib.customDestroyed).isFalse();
ConfigurableApplicationContext parent = (ConfigurableApplicationContext) this.applicationContext.getParent();
parent.close();
assertThat(iib.destroyed && iib.customDestroyed).isTrue();
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+1 -1
View File
@@ -65,7 +65,7 @@ class BindTagTests extends AbstractTagTests {
assertThat(status.getExpression()).as("Correct expression").isNull();
assertThat(status.getValue()).as("Correct value").isNull();
assertThat(status.getDisplayValue()).as("Correct displayValue").isEmpty();
assertThat(!status.isError()).as("Correct isError").isTrue();
assertThat(status.isError()).as("Correct isError").isFalse();
assertThat(status.getErrorCodes()).as("Correct errorCodes").isEmpty();
assertThat(status.getErrorMessages()).as("Correct errorMessages").isEmpty();
assertThat(status.getErrorCode()).as("Correct errorCode").isEmpty();
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+12 -12
View File
@@ -49,16 +49,16 @@ class HtmlEscapeTagTests extends AbstractTagTests {
testTag.setPageContext(pc);
testTag.doStartTag();
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue();
assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse();
tag.setDefaultHtmlEscape(true);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue();
tag.setDefaultHtmlEscape(false);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue();
assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse();
tag.setDefaultHtmlEscape(true);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
@@ -67,15 +67,15 @@ class HtmlEscapeTagTests extends AbstractTagTests {
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue();
testTag.setHtmlEscape(false);
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue();
assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse();
tag.setDefaultHtmlEscape(false);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
testTag.setHtmlEscape(true);
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue();
testTag.setHtmlEscape(false);
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue();
assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse();
assertThat(testTag.isHtmlEscape()).as("Correctly applied").isFalse();
}
@Test
@@ -88,13 +88,13 @@ class HtmlEscapeTagTests extends AbstractTagTests {
tag.setPageContext(pc);
tag.doStartTag();
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse();
tag.setDefaultHtmlEscape(true);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue();
tag.setDefaultHtmlEscape(false);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse();
}
@Test
@@ -106,13 +106,13 @@ class HtmlEscapeTagTests extends AbstractTagTests {
tag.doStartTag();
sc.addInitParameter(WebUtils.HTML_ESCAPE_CONTEXT_PARAM, "false");
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isFalse();
tag.setDefaultHtmlEscape(true);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue();
tag.setDefaultHtmlEscape(false);
assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE);
assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue();
assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isFalse();
}
@Test