GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Replace assertThat(!x).isTrue() with assertThat(x).isFalse() 

Search for   : assertThat\(!(.+)\).isTrue\(\)

Replace with : assertThat(\1).isFalse()
pull/31757/head
Sam Brannen 2 years ago
parent
21560bccd3
commit
ceba4162bb
7 changed files with 58 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
  2. 2
      spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
  3. 36
      spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
  4. 26
      spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
  5. 4
      spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
  6. 2
      spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
  7. 44
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java

2
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
Unescape View File

@ -35,7 +35,7 @@ public abstract class AbstractPropertyValuesTests { @@ -35,7 +35,7 @@ public abstract class AbstractPropertyValuesTests {
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<>();

2
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
Unescape View File

@ -89,7 +89,7 @@ public class PropertyPathFactoryBeanTests { @@ -89,7 +89,7 @@ public class PropertyPathFactoryBeanTests {
TestBean spouse = (TestBean) xbf.getBean("otb.spouse");
TestBean tbWithInner = (TestBean) xbf.getBean("tbWithInner");
assertThat(tbWithInner.getSpouse()).isSameAs(spouse);
assertThat(!tbWithInner.getFriends().isEmpty()).isTrue();
assertThat(tbWithInner.getFriends().isEmpty()).isFalse();
assertThat(tbWithInner.getFriends().iterator().next()).isSameAs(spouse);
}

36
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
Unescape View File

@ -35,8 +35,8 @@ public class BeanDefinitionTests { @@ -35,8 +35,8 @@ public class BeanDefinitionTests {
bd.setLazyInit(true);
bd.setScope("request");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");
@ -52,11 +52,11 @@ public class BeanDefinitionTests { @@ -52,11 +52,11 @@ public class BeanDefinitionTests {
bd.getPropertyValues().add("age", "99");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getPropertyValues().add("name", "myName");
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getPropertyValues().add("age", "11");
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getPropertyValues().add("age", "99");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
@ -70,11 +70,11 @@ public class BeanDefinitionTests { @@ -70,11 +70,11 @@ public class BeanDefinitionTests {
bd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test");
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 9);
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
@ -89,11 +89,11 @@ public class BeanDefinitionTests { @@ -89,11 +89,11 @@ public class BeanDefinitionTests {
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test", "int");
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5, "int");
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5, "long");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
@ -111,8 +111,8 @@ public class BeanDefinitionTests { @@ -111,8 +111,8 @@ public class BeanDefinitionTests {
otherBd.setScope("request");
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.setParentName("parent");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
@ -137,8 +137,8 @@ public class BeanDefinitionTests { @@ -137,8 +137,8 @@ public class BeanDefinitionTests {
bd.setScope("request");
BeanDefinitionHolder holder = new BeanDefinitionHolder(bd, "bd");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertThat(!bd.equals(otherBd)).isTrue();
assertThat(!otherBd.equals(bd)).isTrue();
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");

26
spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
Unescape View File

@ -193,31 +193,31 @@ class CustomEditorTests { @@ -193,31 +193,31 @@ class CustomEditorTests {
bw.setPropertyValue("bool1", "false");
assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool1"))).as("Correct bool1 value").isTrue();
assertThat(!tb.isBool1()).as("Correct bool1 value").isTrue();
assertThat(tb.isBool1()).as("Correct bool1 value").isFalse();
bw.setPropertyValue("bool1", " true ");
assertThat(tb.isBool1()).as("Correct bool1 value").isTrue();
bw.setPropertyValue("bool1", " false ");
assertThat(!tb.isBool1()).as("Correct bool1 value").isTrue();
assertThat(tb.isBool1()).as("Correct bool1 value").isFalse();
bw.setPropertyValue("bool1", "on");
assertThat(tb.isBool1()).as("Correct bool1 value").isTrue();
bw.setPropertyValue("bool1", "off");
assertThat(!tb.isBool1()).as("Correct bool1 value").isTrue();
assertThat(tb.isBool1()).as("Correct bool1 value").isFalse();
bw.setPropertyValue("bool1", "yes");
assertThat(tb.isBool1()).as("Correct bool1 value").isTrue();
bw.setPropertyValue("bool1", "no");
assertThat(!tb.isBool1()).as("Correct bool1 value").isTrue();
assertThat(tb.isBool1()).as("Correct bool1 value").isFalse();
bw.setPropertyValue("bool1", "1");
assertThat(tb.isBool1()).as("Correct bool1 value").isTrue();
bw.setPropertyValue("bool1", "0");
assertThat(!tb.isBool1()).as("Correct bool1 value").isTrue();
assertThat(tb.isBool1()).as("Correct bool1 value").isFalse();
assertThatExceptionOfType(BeansException.class).isThrownBy(() ->
bw.setPropertyValue("bool1", "argh"));
@ -234,25 +234,25 @@ class CustomEditorTests { @@ -234,25 +234,25 @@ class CustomEditorTests {
bw.setPropertyValue("bool2", "false");
assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "on");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "off");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "yes");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "no");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "1");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "0");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "");
assertThat(tb.getBool2()).as("Correct bool2 value").isNull();
@ -270,25 +270,25 @@ class CustomEditorTests { @@ -270,25 +270,25 @@ class CustomEditorTests {
bw.setPropertyValue("bool2", "false");
assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "on");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "off");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "yes");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "no");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "1");
assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
bw.setPropertyValue("bool2", "0");
assertThat(!tb.getBool2()).as("Correct bool2 value").isTrue();
assertThat(tb.getBool2()).as("Correct bool2 value").isFalse();
bw.setPropertyValue("bool2", "");
assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isNull();

4
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
Unescape View File

@ -725,7 +725,7 @@ class XmlBeanFactoryTests { @@ -725,7 +725,7 @@ class XmlBeanFactoryTests {
InitAndIB iib = (InitAndIB) xbf.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();
xbf.destroySingletons();
assertThat(iib.destroyed && iib.customDestroyed).isTrue();
xbf.destroySingletons();
@ -746,7 +746,7 @@ class XmlBeanFactoryTests { @@ -746,7 +746,7 @@ class XmlBeanFactoryTests {
InitAndIB iib = (InitAndIB) xbf.getBean("ib-same-init");
assertThat(InitAndIB.constructed).isTrue();
assertThat(iib.afterPropertiesSetInvoked && !iib.initMethodInvoked).isTrue();
assertThat(!iib.destroyed && !iib.customDestroyed).isTrue();
assertThat(iib.destroyed && !iib.customDestroyed).isFalse();
xbf.destroySingletons();
assertThat(iib.destroyed && !iib.customDestroyed).isTrue();
xbf.destroySingletons();

2
spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java vendored
Unescape View File

@ -558,7 +558,7 @@ public abstract class AbstractCacheAnnotationTests { @@ -558,7 +558,7 @@ public abstract class AbstractCacheAnnotationTests {
Object r1 = service.multiConditionalCacheAndEvict(key);
Object r3 = service.multiConditionalCacheAndEvict(key);
assertThat(!r1.equals(r3)).isTrue();
assertThat(r1.equals(r3)).isFalse();
assertThat(primary.get(key)).isNull();
Object key2 = 3;

44
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
Unescape View File

@ -112,13 +112,13 @@ public class DataSourceJtaTransactionTests { @@ -112,13 +112,13 @@ public class DataSourceJtaTransactionTests {
JtaTransactionManager ptm = new JtaTransactionManager(userTransaction);
TransactionTemplate tt = new TransactionTemplate(ptm);
assertThat(!TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(!TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(status.isNewTransaction()).isTrue();
@ -136,8 +136,8 @@ public class DataSourceJtaTransactionTests { @@ -136,8 +136,8 @@ public class DataSourceJtaTransactionTests {
}
});
assertThat(!TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
verify(userTransaction).begin();
if (rollback) {
verify(userTransaction).rollback();
@ -217,13 +217,13 @@ public class DataSourceJtaTransactionTests { @@ -217,13 +217,13 @@ public class DataSourceJtaTransactionTests {
JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager);
final TransactionTemplate tt = new TransactionTemplate(ptm);
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(status.isNewTransaction()).isTrue();
@ -247,7 +247,7 @@ public class DataSourceJtaTransactionTests { @@ -247,7 +247,7 @@ public class DataSourceJtaTransactionTests {
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(status.isNewTransaction()).isTrue();
@ -297,8 +297,8 @@ public class DataSourceJtaTransactionTests { @@ -297,8 +297,8 @@ public class DataSourceJtaTransactionTests {
}
});
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
verify(userTransaction, times(6)).begin();
verify(transactionManager, times(5)).resume(transaction);
if (rollback) {
@ -471,15 +471,15 @@ public class DataSourceJtaTransactionTests { @@ -471,15 +471,15 @@ public class DataSourceJtaTransactionTests {
JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager);
final TransactionTemplate tt = new TransactionTemplate(ptm);
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
assertThatExceptionOfType(TransactionException.class).isThrownBy(() ->
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(status.isNewTransaction()).isTrue();
@ -502,7 +502,7 @@ public class DataSourceJtaTransactionTests { @@ -502,7 +502,7 @@ public class DataSourceJtaTransactionTests {
tt.execute(new TransactionCallbackWithoutResult() {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(status.isNewTransaction()).isTrue();
@ -529,8 +529,8 @@ public class DataSourceJtaTransactionTests { @@ -529,8 +529,8 @@ public class DataSourceJtaTransactionTests {
}
}));
assertThat(!TransactionSynchronizationManager.hasResource(dsToUse)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dsToUse)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
verify(userTransaction).begin();
if (suspendException) {
@ -571,8 +571,8 @@ public class DataSourceJtaTransactionTests { @@ -571,8 +571,8 @@ public class DataSourceJtaTransactionTests {
}
};
TransactionTemplate tt = new TransactionTemplate(ptm);
assertThat(!TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isFalse();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
given(userTransaction.getStatus()).willReturn(Status.STATUS_ACTIVE);
for (int i = 0; i < 3; i++) {
@ -582,7 +582,7 @@ public class DataSourceJtaTransactionTests { @@ -582,7 +582,7 @@ public class DataSourceJtaTransactionTests {
@Override
protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(!status.isNewTransaction()).isTrue();
assertThat(status.isNewTransaction()).isFalse();
Connection con = DataSourceUtils.getConnection(dataSource);
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
@ -600,9 +600,9 @@ public class DataSourceJtaTransactionTests { @@ -600,9 +600,9 @@ public class DataSourceJtaTransactionTests {
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
}
else {
assertThat(!TransactionSynchronizationManager.hasResource(dataSource)).isTrue();
assertThat(TransactionSynchronizationManager.hasResource(dataSource)).isFalse();
}
assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
}
verify(connection, times(3)).close();
}

Write Preview
Loading…
Cancel
Save