Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor AssertJ assertions into more idiomatic ones

Browse Source 
This commit refactors some AssertJ assertions into more idiomatic and
readable ones. Using the dedicated assertion instead of a generic one
will produce more meaningful error messages. 

For instance, consider collection size:
```
// expected: 5 but was: 2
assertThat(collection.size()).equals(5);
// Expected size: 5 but was: 2 in: [1, 2]
assertThat(collection).hasSize(5);
```

Closes gh-30104
This commit is contained in:
Krzysztof Krasoń
2023-04-04 17:34:07 +02:00
committed by GitHub
parent dd97ee4e99
commit 1734deca1e
371 changed files with 3177 additions and 3076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
View File

@@ -888,7 +888,8 @@ public class JtaTransactionManagerTests {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
assertThat(status == TransactionSynchronization.STATUS_ROLLED_BACK).as("Correct completion status").isTrue();
assertThat(status).as("Correct completion status")
.isEqualTo(TransactionSynchronization.STATUS_ROLLED_BACK);
}
});
}
@@ -932,7 +933,8 @@ public class JtaTransactionManagerTests {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
assertThat(status == TransactionSynchronization.STATUS_ROLLED_BACK).as("Correct completion status").isTrue();
assertThat(status).as("Correct completion status")
.isEqualTo(TransactionSynchronization.STATUS_ROLLED_BACK);
}
});
}
@@ -1031,7 +1033,8 @@ public class JtaTransactionManagerTests {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
assertThat(status == TransactionSynchronization.STATUS_UNKNOWN).as("Correct completion status").isTrue();
assertThat(status).as("Correct completion status")
.isEqualTo(TransactionSynchronization.STATUS_UNKNOWN);
}
});
}
@@ -1056,7 +1059,8 @@ public class JtaTransactionManagerTests {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
assertThat(status == TransactionSynchronization.STATUS_UNKNOWN).as("Correct completion status").isTrue();
assertThat(status).as("Correct completion status")
.isEqualTo(TransactionSynchronization.STATUS_UNKNOWN);
}
});
status.setRollbackOnly();
@@ -1101,7 +1105,8 @@ public class JtaTransactionManagerTests {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCompletion(int status) {
assertThat(status == TransactionSynchronization.STATUS_UNKNOWN).as("Correct completion status").isTrue();
assertThat(status).as("Correct completion status")
.isEqualTo(TransactionSynchronization.STATUS_UNKNOWN);
}
});
}

30
spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -57,18 +57,18 @@ public class TransactionSupportTests {
PlatformTransactionManager tm = new TestTransactionManager(true, true);
DefaultTransactionStatus status1 = (DefaultTransactionStatus)
tm.getTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_SUPPORTS));
assertThat(status1.getTransaction() != null).as("Must have transaction").isTrue();
assertThat(!status1.isNewTransaction()).as("Must not be new transaction").isTrue();
assertThat(status1.getTransaction()).as("Must have transaction").isNotNull();
assertThat(status1.isNewTransaction()).as("Must not be new transaction").isFalse();
DefaultTransactionStatus status2 = (DefaultTransactionStatus)
tm.getTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED));
assertThat(status2.getTransaction() != null).as("Must have transaction").isTrue();
assertThat(!status2.isNewTransaction()).as("Must not be new transaction").isTrue();
assertThat(status2.getTransaction()).as("Must have transaction").isNotNull();
assertThat(status2.isNewTransaction()).as("Must not be new transaction").isFalse();
DefaultTransactionStatus status3 = (DefaultTransactionStatus)
tm.getTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_MANDATORY));
assertThat(status3.getTransaction() != null).as("Must have transaction").isTrue();
assertThat(!status3.isNewTransaction()).as("Must not be new transaction").isTrue();
assertThat(status3.getTransaction()).as("Must have transaction").isNotNull();
assertThat(status3.isNewTransaction()).as("Must not be new transaction").isFalse();
}
@Test
@@ -233,24 +233,28 @@ public class TransactionSupportTests {
TestTransactionManager tm = new TestTransactionManager(false, true);
TransactionTemplate template = new TransactionTemplate();
template.setTransactionManager(tm);
assertThat(template.getTransactionManager() == tm).as("correct transaction manager set").isTrue();
assertThat(template.getTransactionManager()).as("correct transaction manager set").isSameAs(tm);
assertThatIllegalArgumentException().isThrownBy(() -> template.setPropagationBehaviorName("TIMEOUT_DEFAULT"));
template.setPropagationBehaviorName("PROPAGATION_SUPPORTS");
assertThat(template.getPropagationBehavior() == TransactionDefinition.PROPAGATION_SUPPORTS).as("Correct propagation behavior set").isTrue();
assertThat(template.getPropagationBehavior()).as("Correct propagation behavior set")
.isEqualTo(TransactionDefinition.PROPAGATION_SUPPORTS);
assertThatIllegalArgumentException().isThrownBy(() -> template.setPropagationBehavior(999));
template.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
assertThat(template.getPropagationBehavior() == TransactionDefinition.PROPAGATION_MANDATORY).as("Correct propagation behavior set").isTrue();
assertThat(template.getPropagationBehavior()).as("Correct propagation behavior set")
.isEqualTo(TransactionDefinition.PROPAGATION_MANDATORY);
assertThatIllegalArgumentException().isThrownBy(() -> template.setIsolationLevelName("TIMEOUT_DEFAULT"));
template.setIsolationLevelName("ISOLATION_SERIALIZABLE");
assertThat(template.getIsolationLevel() == TransactionDefinition.ISOLATION_SERIALIZABLE).as("Correct isolation level set").isTrue();
assertThat(template.getIsolationLevel()).as("Correct isolation level set")
.isEqualTo(TransactionDefinition.ISOLATION_SERIALIZABLE);
assertThatIllegalArgumentException().isThrownBy(() -> template.setIsolationLevel(999));
template.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
assertThat(template.getIsolationLevel() == TransactionDefinition.ISOLATION_REPEATABLE_READ).as("Correct isolation level set").isTrue();
assertThat(template.getIsolationLevel()).as("Correct isolation level set")
.isEqualTo(TransactionDefinition.ISOLATION_REPEATABLE_READ);
}
@Test
@@ -269,7 +273,7 @@ public class TransactionSupportTests {
@AfterEach
public void clear() {
assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
assertThat(TransactionSynchronizationManager.getResourceMap()).isEmpty();
assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
}

6
spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerAdapterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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,7 +44,7 @@ public class TransactionalApplicationListenerAdapterTests {
assertThat(callback.postEvent).isEqualTo(event);
assertThat(callback.ex).isNull();
assertThat(adapter.getTransactionPhase()).isEqualTo(TransactionPhase.AFTER_COMMIT);
assertThat(adapter.getListenerId()).isEqualTo("");
assertThat(adapter.getListenerId()).isEmpty();
}
@Test
@@ -66,7 +66,7 @@ public class TransactionalApplicationListenerAdapterTests {
assertThat(callback.postEvent).isEqualTo(event);
assertThat(callback.ex).isEqualTo(ex);
assertThat(adapter.getTransactionPhase()).isEqualTo(TransactionPhase.BEFORE_COMMIT);
assertThat(adapter.getListenerId()).isEqualTo("");
assertThat(adapter.getListenerId()).isEmpty();
}
@Test

10
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
View File

@@ -374,7 +374,7 @@ public abstract class AbstractTransactionAspectTests {
TransactionAttribute txatt = new DefaultTransactionAttribute() {
@Override
public boolean rollbackOn(Throwable t) {
assertThat(t == ex).isTrue();
assertThat(t).isSameAs(ex);
return shouldRollback;
}
};
@@ -454,7 +454,7 @@ public abstract class AbstractTransactionAspectTests {
ITestBean itb = (ITestBean) advised(tb, ptm, tas);
// verification!?
assertThat(name.equals(itb.getName())).isTrue();
assertThat(itb.getName()).isEqualTo(name);
verify(ptm).commit(status);
}
@@ -490,7 +490,7 @@ public abstract class AbstractTransactionAspectTests {
fail("Shouldn't have invoked method");
}
catch (CannotCreateTransactionException thrown) {
assertThat(thrown == ex).isTrue();
assertThat(thrown).isSameAs(ex);
}
}
@@ -525,11 +525,11 @@ public abstract class AbstractTransactionAspectTests {
fail("Shouldn't have succeeded");
}
catch (UnexpectedRollbackException thrown) {
assertThat(thrown == ex).isTrue();
assertThat(thrown).isSameAs(ex);
}
// Should have invoked target and changed name
assertThat(itb.getName() == name).isTrue();
assertThat(itb.getName()).isSameAs(name);
}
protected void checkTransactionStatus(boolean expected) {

6
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
View File

@@ -145,7 +145,7 @@ public class BeanFactoryTransactionTests {
PlatformTransactionManager ptm = mock();
PlatformTransactionManagerFacade.delegate = ptm;
assertThat(testBean.getAge() == 666).as("Age should not be " + testBean.getAge()).isTrue();
assertThat(testBean.getAge()).as("Age should not be " + testBean.getAge()).isEqualTo(666);
// Expect no methods
verifyNoInteractions(ptm);
@@ -168,7 +168,7 @@ public class BeanFactoryTransactionTests {
}
@Override
public void commit(TransactionStatus status) throws TransactionException {
assertThat(status == ts).isTrue();
assertThat(status).isSameAs(ts);
}
@Override
public void rollback(TransactionStatus status) throws TransactionException {
@@ -180,7 +180,7 @@ public class BeanFactoryTransactionTests {
// TODO same as old age to avoid ordering effect for now
int age = 666;
testBean.setAge(age);
assertThat(testBean.getAge() == age).isTrue();
assertThat(testBean.getAge()).isEqualTo(age);
}
@Test

6
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 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.
@@ -42,12 +42,12 @@ public class TransactionAttributeSourceTests {
MatchAlwaysTransactionAttributeSource tas = new MatchAlwaysTransactionAttributeSource();
TransactionAttribute ta = tas.getTransactionAttribute(Object.class.getMethod("hashCode"), null);
assertThat(ta).isNotNull();
assertThat(TransactionDefinition.PROPAGATION_REQUIRED == ta.getPropagationBehavior()).isTrue();
assertThat(ta.getPropagationBehavior()).isEqualTo(TransactionDefinition.PROPAGATION_REQUIRED);
tas.setTransactionAttribute(new DefaultTransactionAttribute(TransactionDefinition.PROPAGATION_SUPPORTS));
ta = tas.getTransactionAttribute(IOException.class.getMethod("getMessage"), IOException.class);
assertThat(ta).isNotNull();
assertThat(TransactionDefinition.PROPAGATION_SUPPORTS == ta.getPropagationBehavior()).isTrue();
assertThat(ta.getPropagationBehavior()).isEqualTo(TransactionDefinition.PROPAGATION_SUPPORTS);
}
@Test

2
spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
View File

@@ -52,7 +52,7 @@ public class JtaTransactionManagerSerializationTests {
// should do client-side lookup
assertThat(serializedJtatm.logger).as("Logger must survive serialization").isNotNull();
assertThat(serializedJtatm
.getUserTransaction() == ut2).as("UserTransaction looked up on client").isTrue();
.getUserTransaction()).as("UserTransaction looked up on client").isSameAs(ut2);
assertThat(serializedJtatm
.getTransactionManager()).as("TransactionManager didn't survive").isNull();
assertThat(serializedJtatm.isRollbackOnCommitFailure()).isTrue();