Skip to content

Commit 4fa44a9

Browse files
committed
testing with spring-data: clear identity map after fixtures are saved
1 parent f6d1169 commit 4fa44a9

6 files changed

+32
-0
lines changed

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/bigint/springData/ObjectBigIntIdTypeIndexedSpringDataJpaMySQLTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public void testUsageAppGenerated()
7474
);
7575

7676
appGeneratedRepository.saveAll(articles);
77+
flushAndClear();
7778

7879
articles.forEach(article -> idsByTitle.put(article.getTitle(), article.getId()));
7980

@@ -103,6 +104,7 @@ public void testUsageDbAutoGenerated()
103104
articles.forEach(article -> Assertions.assertNull(article.getId()));
104105

105106
dbAutoGeneratedRepository.saveAll(articles);
107+
flushAndClear();
106108

107109
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
108110

@@ -134,6 +136,7 @@ public void testUsageDbIdentityGenerated()
134136
articles.forEach(article -> Assertions.assertNull(article.getId()));
135137

136138
dbIdentityGeneratedRepository.saveAll(articles);
139+
flushAndClear();
137140

138141
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
139142

@@ -165,6 +168,7 @@ public void testUsageDbSequenceGenerated()
165168
articles.forEach(article -> Assertions.assertNull(article.getId()));
166169

167170
dbSequenceGeneratedRepository.saveAll(articles);
171+
flushAndClear();
168172

169173
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
170174

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/bigint/springData/ObjectBigIntIdTypeIndexedSpringDataJpaPostgreSQLTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public void testUsageAppGenerated()
7070
);
7171

7272
appGeneratedRepository.saveAll(articles);
73+
flushAndClear();
7374

7475
articles.forEach(article -> idsByTitle.put(article.getTitle(), article.getId()));
7576

@@ -99,6 +100,7 @@ public void testUsageDbAutoGenerated()
99100
articles.forEach(article -> Assertions.assertNull(article.getId()));
100101

101102
dbAutoGeneratedRepository.saveAll(articles);
103+
flushAndClear();
102104

103105
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
104106

@@ -130,6 +132,7 @@ public void testUsageDbIdentityGenerated()
130132
articles.forEach(article -> Assertions.assertNull(article.getId()));
131133

132134
dbIdentityGeneratedRepository.saveAll(articles);
135+
flushAndClear();
133136

134137
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
135138

@@ -161,6 +164,7 @@ public void testUsageDbSequenceGenerated()
161164
articles.forEach(article -> Assertions.assertNull(article.getId()));
162165

163166
dbSequenceGeneratedRepository.saveAll(articles);
167+
flushAndClear();
164168

165169
articles.forEach(article -> Assertions.assertNotNull(article.getId()));
166170

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/springData/AbstractSpringDataMySQLTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,19 @@ public abstract class AbstractSpringDataMySQLTest
3434
*/
3535
@AfterEach
3636
void flushAfterEach()
37+
{
38+
flush();
39+
}
40+
41+
protected void flush()
42+
{
43+
testEntityManager.flush();
44+
}
45+
46+
protected void flushAndClear()
3747
{
3848
testEntityManager.flush();
49+
testEntityManager.clear();
3950
}
4051

4152
}

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/springData/AbstractSpringDataPostgreSQLTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,19 @@ public abstract class AbstractSpringDataPostgreSQLTest
3434
*/
3535
@AfterEach
3636
void flushAfterEach()
37+
{
38+
flush();
39+
}
40+
41+
protected void flush()
42+
{
43+
testEntityManager.flush();
44+
}
45+
46+
protected void flushAndClear()
3747
{
3848
testEntityManager.flush();
49+
testEntityManager.clear();
3950
}
4051

4152
}

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/uuid/springData/ObjectUuidTypeIndexedSpringDataJpaMySQLTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void testUsage()
4949
);
5050

5151
uuidAppGeneratedRepository.saveAll(articles);
52+
flushAndClear();
5253

5354
articles.forEach(article -> idsByTitle.put(article.getTitle(), article.getId()));
5455

testing/testing-typed-ids-spring-data-indexed/src/test/java/org/framefork/typedIds/uuid/springData/ObjectUuidTypeIndexedSpringDataJpaPostgreSQLTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void testUsage()
4848
);
4949

5050
uuidAppGeneratedRepository.saveAll(articles);
51+
flushAndClear();
5152

5253
articles.forEach(article -> idsByTitle.put(article.getTitle(), article.getId()));
5354

0 commit comments

Comments
 (0)