Skip to content

Commit 2a4e2b8

Browse files
committed
Review commnet changes
1 parent 0be4d8d commit 2a4e2b8

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

algorithms-genetic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<properties>
5757
<commons-math3.version>3.6.1</commons-math3.version>
5858
<io.jenetics.version>3.7.0</io.jenetics.version>
59-
<org.assertj.core.version>3.9.0</org.assertj.core.version>
59+
<org.assertj.core.version>3.14.0</org.assertj.core.version>
6060
<commons-codec.version>1.11</commons-codec.version>
6161
</properties>
6262

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/persistencecontext/PersistenceContextIntegrationTest.java

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
import javax.persistence.EntityExistsException;
88
import javax.persistence.TransactionRequiredException;
99

10-
import org.hamcrest.core.Is;
11-
import org.hamcrest.core.IsNull;
1210
import org.junit.Test;
1311
import org.junit.runner.RunWith;
1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import org.springframework.boot.test.context.SpringBootTest;
1614
import org.springframework.test.context.junit4.SpringRunner;
1715

18-
import static org.junit.Assert.assertThat;
16+
import static org.junit.Assert.assertNotNull;
17+
import static org.junit.Assert.assertNull;
1918

2019
@RunWith(SpringRunner.class)
21-
@SpringBootTest(classes = PersistenceContextDemoApplication.class)
20+
@SpringBootTest(classes = com.baeldung.persistencecontext.PersistenceContextDemoApplication.class)
2221
public class PersistenceContextIntegrationTest {
23-
22+
2423
@Autowired
2524
private TransctionPersistenceContextUserService transctionPersistenceContext;
2625
@Autowired
@@ -30,10 +29,12 @@ public class PersistenceContextIntegrationTest {
3029
public void testThatWhenUserSavedWithTransctionPersistenceContextThenUserShouldGetSavedInDB() {
3130
User user = new User(121L, "Devender", "admin");
3231
transctionPersistenceContext.insertWithTransaction(user);
32+
3333
User userFromTransctionPersistenceContext = transctionPersistenceContext.find(user.getId());
34+
assertNotNull(userFromTransctionPersistenceContext);
35+
3436
User userFromExtendedPersistenceContext = extendedPersistenceContext.find(user.getId());
35-
assertThat(userFromTransctionPersistenceContext, Is.is(IsNull.notNullValue()));
36-
assertThat(userFromExtendedPersistenceContext, Is.is(IsNull.notNullValue()));
37+
assertNotNull(userFromExtendedPersistenceContext);
3738
}
3839

3940
@Test(expected = TransactionRequiredException.class)
@@ -46,10 +47,12 @@ public void testThatUserSaveWithoutTransactionThrowException() {
4647
public void testThatWhenUserSavedWithExtendedPersistenceContextWithoutTransactionThenUserShouldGetCached() {
4748
User user = new User(123L, "Devender", "admin");
4849
extendedPersistenceContext.insertWithoutTransaction(user);
50+
4951
User userFromExtendedPersistenceContext = extendedPersistenceContext.find(user.getId());
52+
assertNotNull(userFromExtendedPersistenceContext);
53+
5054
User userFromTransctionPersistenceContext = transctionPersistenceContext.find(user.getId());
51-
assertThat(userFromExtendedPersistenceContext, Is.is(IsNull.notNullValue()));
52-
assertThat(userFromTransctionPersistenceContext, Is.is(IsNull.nullValue()));
55+
assertNull(userFromTransctionPersistenceContext);
5356
}
5457

5558
@Test(expected = EntityExistsException.class)
@@ -64,24 +67,24 @@ public void testThatPersistUserWithSameIdentifierThrowException() {
6467
public void testThatWhenUserSavedWithExtendedPersistenceContextWithTransactionThenUserShouldSaveEntityIntoDB() {
6568
User user = new User(127L, "Devender", "admin");
6669
extendedPersistenceContext.insertWithTransaction(user);
70+
6771
User userFromDB = transctionPersistenceContext.find(user.getId());
68-
assertThat(userFromDB, Is.is(IsNull.notNullValue()));
72+
assertNotNull(userFromDB);
6973
}
7074

7175
@Test
7276
public void testThatWhenUserSavedWithExtendedPersistenceContextWithTransactionThenUserShouldFlushCachedEntityIntoDB() {
7377
User user1 = new User(124L, "Devender", "admin");
7478
extendedPersistenceContext.insertWithoutTransaction(user1);
79+
7580
User user2 = new User(125L, "Devender", "admin");
7681
extendedPersistenceContext.insertWithTransaction(user2);
77-
User userFromExtendedPersistenceContextuser1 = extendedPersistenceContext.find(user1.getId());
78-
User userFromExtendedPersistenceContextuser2 = extendedPersistenceContext.find(user2.getId());
79-
User userFromTransctionPersistenceContextuser1 = transctionPersistenceContext.find(user1.getId());
80-
User userFromTransctionPersistenceContextuser2 = transctionPersistenceContext.find(user2.getId());
81-
assertThat(userFromExtendedPersistenceContextuser1, Is.is(IsNull.notNullValue()));
82-
assertThat(userFromExtendedPersistenceContextuser2, Is.is(IsNull.notNullValue()));
83-
assertThat(userFromTransctionPersistenceContextuser1, Is.is(IsNull.notNullValue()));
84-
assertThat(userFromTransctionPersistenceContextuser2, Is.is(IsNull.notNullValue()));
82+
83+
User user1FromTransctionPersistenceContext = transctionPersistenceContext.find(user1.getId());
84+
assertNotNull(user1FromTransctionPersistenceContext);
85+
86+
User user2FromTransctionPersistenceContext = transctionPersistenceContext.find(user2.getId());
87+
assertNotNull(user2FromTransctionPersistenceContext);
8588
}
8689

8790
}

0 commit comments

Comments
 (0)