Skip to content

Commit ea1fc3b

Browse files
mshimamshima
authored
couchbase: switch testcontainers to DynamicPropertySource (#32055)
1 parent 1d4bf6a commit ea1fc3b

File tree

7 files changed

+46
-288
lines changed

7 files changed

+46
-288
lines changed

‎generators/spring-boot/files.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,6 @@ export const baseServerFiles = asWriteFilesSection<SpringBootApplication>({
377377
},
378378
],
379379
serverJavaUserManagement: [
380-
{
381-
condition: generator => generator.databaseTypeCouchbase || generator.searchEngineCouchbase,
382-
path: `${SERVER_TEST_SRC_DIR}_package_/`,
383-
renameTo: moveToJavaPackageTestDir,
384-
templates: ['config/TestContainersSpringContextCustomizerFactory.java'],
385-
},
386380
{
387381
path: `${SERVER_TEST_SRC_DIR}_package_/`,
388382
renameTo: moveToJavaPackageTestDir,

‎generators/spring-boot/generators/data-couchbase/__snapshots__/generator.spec.ts.snap‎

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -281,18 +281,12 @@ exports[`generator - couchbase gateway-jwt-reactive(false)-maven-enableTranslati
281281
"src/test/java/tech/jhipster/config/CouchbaseTestContainer.java": {
282282
"stateCleared": "modified",
283283
},
284-
"src/test/java/tech/jhipster/config/EmbeddedCouchbase.java": {
285-
"stateCleared": "modified",
286-
},
287284
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
288285
"stateCleared": "modified",
289286
},
290287
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
291288
"stateCleared": "modified",
292289
},
293-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
294-
"stateCleared": "modified",
295-
},
296290
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
297291
"stateCleared": "modified",
298292
},
@@ -383,9 +377,6 @@ exports[`generator - couchbase gateway-jwt-reactive(false)-maven-enableTranslati
383377
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
384378
"stateCleared": "modified",
385379
},
386-
"src/test/resources/META-INF/spring.factories": {
387-
"stateCleared": "modified",
388-
},
389380
"src/test/resources/config/application.yml": {
390381
"stateCleared": "modified",
391382
},
@@ -640,18 +631,12 @@ exports[`generator - couchbase gateway-jwt-reactive(true)-gradle-enableTranslati
640631
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
641632
"stateCleared": "modified",
642633
},
643-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
644-
"stateCleared": "modified",
645-
},
646634
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
647635
"stateCleared": "modified",
648636
},
649637
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
650638
"stateCleared": "modified",
651639
},
652-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
653-
"stateCleared": "modified",
654-
},
655640
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
656641
"stateCleared": "modified",
657642
},
@@ -715,9 +700,6 @@ exports[`generator - couchbase gateway-jwt-reactive(true)-gradle-enableTranslati
715700
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
716701
"stateCleared": "modified",
717702
},
718-
"src/test/resources/META-INF/spring.factories": {
719-
"stateCleared": "modified",
720-
},
721703
"src/test/resources/config/application.yml": {
722704
"stateCleared": "modified",
723705
},
@@ -999,18 +981,12 @@ exports[`generator - couchbase gateway-oauth2-reactive(true)-gradle-enableTransl
999981
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
1000982
"stateCleared": "modified",
1001983
},
1002-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
1003-
"stateCleared": "modified",
1004-
},
1005984
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
1006985
"stateCleared": "modified",
1007986
},
1008987
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
1009988
"stateCleared": "modified",
1010989
},
1011-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
1012-
"stateCleared": "modified",
1013-
},
1014990
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
1015991
"stateCleared": "modified",
1016992
},
@@ -1098,9 +1074,6 @@ exports[`generator - couchbase gateway-oauth2-reactive(true)-gradle-enableTransl
10981074
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
10991075
"stateCleared": "modified",
11001076
},
1101-
"src/test/resources/META-INF/spring.factories": {
1102-
"stateCleared": "modified",
1103-
},
11041077
"src/test/resources/config/application.yml": {
11051078
"stateCleared": "modified",
11061079
},
@@ -1289,15 +1262,9 @@ exports[`generator - couchbase microservice-jwt-reactive(false)-maven-enableTran
12891262
"src/test/java/tech/jhipster/config/CouchbaseTestContainer.java": {
12901263
"stateCleared": "modified",
12911264
},
1292-
"src/test/java/tech/jhipster/config/EmbeddedCouchbase.java": {
1293-
"stateCleared": "modified",
1294-
},
12951265
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
12961266
"stateCleared": "modified",
12971267
},
1298-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
1299-
"stateCleared": "modified",
1300-
},
13011268
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
13021269
"stateCleared": "modified",
13031270
},
@@ -1352,9 +1319,6 @@ exports[`generator - couchbase microservice-jwt-reactive(false)-maven-enableTran
13521319
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
13531320
"stateCleared": "modified",
13541321
},
1355-
"src/test/resources/META-INF/spring.factories": {
1356-
"stateCleared": "modified",
1357-
},
13581322
"src/test/resources/config/application.yml": {
13591323
"stateCleared": "modified",
13601324
},
@@ -1594,18 +1558,12 @@ exports[`generator - couchbase microservice-jwt-reactive(true)-gradle-enableTran
15941558
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
15951559
"stateCleared": "modified",
15961560
},
1597-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
1598-
"stateCleared": "modified",
1599-
},
16001561
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
16011562
"stateCleared": "modified",
16021563
},
16031564
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
16041565
"stateCleared": "modified",
16051566
},
1606-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
1607-
"stateCleared": "modified",
1608-
},
16091567
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
16101568
"stateCleared": "modified",
16111569
},
@@ -1660,9 +1618,6 @@ exports[`generator - couchbase microservice-jwt-reactive(true)-gradle-enableTran
16601618
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
16611619
"stateCleared": "modified",
16621620
},
1663-
"src/test/resources/META-INF/spring.factories": {
1664-
"stateCleared": "modified",
1665-
},
16661621
"src/test/resources/config/application.yml": {
16671622
"stateCleared": "modified",
16681623
},
@@ -1899,18 +1854,12 @@ exports[`generator - couchbase microservice-oauth2-reactive(true)-gradle-enableT
18991854
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
19001855
"stateCleared": "modified",
19011856
},
1902-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
1903-
"stateCleared": "modified",
1904-
},
19051857
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
19061858
"stateCleared": "modified",
19071859
},
19081860
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
19091861
"stateCleared": "modified",
19101862
},
1911-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
1912-
"stateCleared": "modified",
1913-
},
19141863
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
19151864
"stateCleared": "modified",
19161865
},
@@ -1965,9 +1914,6 @@ exports[`generator - couchbase microservice-oauth2-reactive(true)-gradle-enableT
19651914
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
19661915
"stateCleared": "modified",
19671916
},
1968-
"src/test/resources/META-INF/spring.factories": {
1969-
"stateCleared": "modified",
1970-
},
19711917
"src/test/resources/config/application.yml": {
19721918
"stateCleared": "modified",
19731919
},
@@ -2264,18 +2210,12 @@ exports[`generator - couchbase monolith-jwt-reactive(false)-maven-enableTranslat
22642210
"src/test/java/tech/jhipster/config/CouchbaseTestContainer.java": {
22652211
"stateCleared": "modified",
22662212
},
2267-
"src/test/java/tech/jhipster/config/EmbeddedCouchbase.java": {
2268-
"stateCleared": "modified",
2269-
},
22702213
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
22712214
"stateCleared": "modified",
22722215
},
22732216
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
22742217
"stateCleared": "modified",
22752218
},
2276-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
2277-
"stateCleared": "modified",
2278-
},
22792219
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
22802220
"stateCleared": "modified",
22812221
},
@@ -2366,9 +2306,6 @@ exports[`generator - couchbase monolith-jwt-reactive(false)-maven-enableTranslat
23662306
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
23672307
"stateCleared": "modified",
23682308
},
2369-
"src/test/resources/META-INF/spring.factories": {
2370-
"stateCleared": "modified",
2371-
},
23722309
"src/test/resources/config/application.yml": {
23732310
"stateCleared": "modified",
23742311
},
@@ -2614,18 +2551,12 @@ exports[`generator - couchbase monolith-jwt-reactive(true)-gradle-enableTranslat
26142551
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
26152552
"stateCleared": "modified",
26162553
},
2617-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
2618-
"stateCleared": "modified",
2619-
},
26202554
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
26212555
"stateCleared": "modified",
26222556
},
26232557
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
26242558
"stateCleared": "modified",
26252559
},
2626-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
2627-
"stateCleared": "modified",
2628-
},
26292560
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
26302561
"stateCleared": "modified",
26312562
},
@@ -2689,9 +2620,6 @@ exports[`generator - couchbase monolith-jwt-reactive(true)-gradle-enableTranslat
26892620
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
26902621
"stateCleared": "modified",
26912622
},
2692-
"src/test/resources/META-INF/spring.factories": {
2693-
"stateCleared": "modified",
2694-
},
26952623
"src/test/resources/config/application.yml": {
26962624
"stateCleared": "modified",
26972625
},
@@ -2880,18 +2808,12 @@ exports[`generator - couchbase monolith-oauth2-reactive(false)-maven-enableTrans
28802808
"src/test/java/tech/jhipster/config/CouchbaseTestContainer.java": {
28812809
"stateCleared": "modified",
28822810
},
2883-
"src/test/java/tech/jhipster/config/EmbeddedCouchbase.java": {
2884-
"stateCleared": "modified",
2885-
},
28862811
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
28872812
"stateCleared": "modified",
28882813
},
28892814
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
28902815
"stateCleared": "modified",
28912816
},
2892-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
2893-
"stateCleared": "modified",
2894-
},
28952817
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
28962818
"stateCleared": "modified",
28972819
},
@@ -2952,9 +2874,6 @@ exports[`generator - couchbase monolith-oauth2-reactive(false)-maven-enableTrans
29522874
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
29532875
"stateCleared": "modified",
29542876
},
2955-
"src/test/resources/META-INF/spring.factories": {
2956-
"stateCleared": "modified",
2957-
},
29582877
"src/test/resources/config/application.yml": {
29592878
"stateCleared": "modified",
29602879
},
@@ -3197,18 +3116,12 @@ exports[`generator - couchbase monolith-oauth2-reactive(true)-gradle-enableTrans
31973116
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
31983117
"stateCleared": "modified",
31993118
},
3200-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
3201-
"stateCleared": "modified",
3202-
},
32033119
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
32043120
"stateCleared": "modified",
32053121
},
32063122
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
32073123
"stateCleared": "modified",
32083124
},
3209-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
3210-
"stateCleared": "modified",
3211-
},
32123125
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
32133126
"stateCleared": "modified",
32143127
},
@@ -3272,9 +3185,6 @@ exports[`generator - couchbase monolith-oauth2-reactive(true)-gradle-enableTrans
32723185
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
32733186
"stateCleared": "modified",
32743187
},
3275-
"src/test/resources/META-INF/spring.factories": {
3276-
"stateCleared": "modified",
3277-
},
32783188
"src/test/resources/config/application.yml": {
32793189
"stateCleared": "modified",
32803190
},
@@ -3571,18 +3481,12 @@ exports[`generator - couchbase monolith-session-reactive(false)-maven-enableTran
35713481
"src/test/java/tech/jhipster/config/CouchbaseTestContainer.java": {
35723482
"stateCleared": "modified",
35733483
},
3574-
"src/test/java/tech/jhipster/config/EmbeddedCouchbase.java": {
3575-
"stateCleared": "modified",
3576-
},
35773484
"src/test/java/tech/jhipster/config/SpringBootTestClassOrderer.java": {
35783485
"stateCleared": "modified",
35793486
},
35803487
"src/test/java/tech/jhipster/config/StaticResourcesWebConfigurerTest.java": {
35813488
"stateCleared": "modified",
35823489
},
3583-
"src/test/java/tech/jhipster/config/TestContainersSpringContextCustomizerFactory.java": {
3584-
"stateCleared": "modified",
3585-
},
35863490
"src/test/java/tech/jhipster/config/WebConfigurerTest.java": {
35873491
"stateCleared": "modified",
35883492
},
@@ -3673,9 +3577,6 @@ exports[`generator - couchbase monolith-session-reactive(false)-maven-enableTran
36733577
"src/test/java/tech/jhipster/web/rest/errors/ExceptionTranslatorTestController.java": {
36743578
"stateCleared": "modified",
36753579
},
3676-
"src/test/resources/META-INF/spring.factories": {
3677-
"stateCleared": "modified",
3678-
},
36793580
"src/test/resources/config/application.yml": {
36803581
"stateCleared": "modified",
36813582
},
@@ -3927,18 +3828,12 @@ exports[`generator - couchbase monolith-session-reactive(true)-gradle-enableTran
39273828
"src/test/java/com/mycompany/config/CouchbaseTestContainer.java": {
39283829
"stateCleared": "modified",
39293830
},
3930-
"src/test/java/com/mycompany/config/EmbeddedCouchbase.java": {
3931-
"stateCleared": "modified",
3932-
},
39333831
"src/test/java/com/mycompany/config/JHipsterBlockHoundIntegration.java": {
39343832
"stateCleared": "modified",
39353833
},
39363834
"src/test/java/com/mycompany/config/SpringBootTestClassOrderer.java": {
39373835
"stateCleared": "modified",
39383836
},
3939-
"src/test/java/com/mycompany/config/TestContainersSpringContextCustomizerFactory.java": {
3940-
"stateCleared": "modified",
3941-
},
39423837
"src/test/java/com/mycompany/domain/AnotherSimpleAsserts.java": {
39433838
"stateCleared": "modified",
39443839
},
@@ -4002,9 +3897,6 @@ exports[`generator - couchbase monolith-session-reactive(true)-gradle-enableTran
40023897
"src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration": {
40033898
"stateCleared": "modified",
40043899
},
4005-
"src/test/resources/META-INF/spring.factories": {
4006-
"stateCleared": "modified",
4007-
},
40083900
"src/test/resources/config/application.yml": {
40093901
"stateCleared": "modified",
40103902
},

‎generators/spring-boot/generators/data-couchbase/files.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const couchbaseFiles = asWriteFilesSection<JavaApplication>({
6868
{
6969
path: `${SERVER_TEST_SRC_DIR}_package_/`,
7070
renameTo: moveToJavaPackageTestDir,
71-
templates: ['config/CouchbaseTestContainer.java', 'config/EmbeddedCouchbase.java'],
71+
templates: ['config/CouchbaseTestContainer.java'],
7272
},
7373
],
7474
});

0 commit comments

Comments
 (0)