Skip to content

Commit 6d5976d

Browse files
timtebeektimtebeek
committed
Update JpaCachePropertiesTest expectations after limited autoformat
openrewrite/rewrite@7dadcb1
1 parent 30c79c0 commit 6d5976d

File tree

1 file changed

+40
-78
lines changed

1 file changed

+40
-78
lines changed

‎src/test/java/org/openrewrite/java/migrate/JpaCachePropertiesTest.java‎

Lines changed: 40 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import static org.openrewrite.xml.Assertions.xml;
2424

25+
@SuppressWarnings({"CheckTagEmptyBody", "JpaConfigDomFacetInspection", "JpaDomInspection"})
2526
class JpaCachePropertiesTest implements RewriteTest {
2627
private static final String PERSISTENCE_FILENAME = "persistence.xml";
2728

@@ -53,10 +54,8 @@ void set_set_set1() {
5354
"""
5455
<?xml version="1.0" encoding="UTF-8"?>
5556
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
56-
<persistence-unit name="set_set_set1">
57-
<!-- flag -->
58-
<shared-cache-mode>NONE</shared-cache-mode>
59-
<!-- leave -->
57+
<persistence-unit name="set_set_set1"><!-- flag -->
58+
<shared-cache-mode>NONE</shared-cache-mode><!-- leave -->
6059
<validation-mode>NONE</validation-mode>
6160
<properties>
6261
<!-- Connection properties -->
@@ -93,10 +92,8 @@ void set_set_set2() {
9392
"""
9493
<?xml version="1.0" encoding="UTF-8"?>
9594
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
96-
<persistence-unit name="set_set_set2">
97-
<!-- flag -->
98-
<shared-cache-mode>ALL</shared-cache-mode>
99-
<!-- leave -->
95+
<persistence-unit name="set_set_set2"><!-- flag -->
96+
<shared-cache-mode>ALL</shared-cache-mode><!-- leave -->
10097
<validation-mode>NONE</validation-mode>
10198
<properties>
10299
<!-- Connection properties -->
@@ -133,10 +130,8 @@ void set_set_set3() {
133130
"""
134131
<?xml version="1.0" encoding="UTF-8"?>
135132
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
136-
<persistence-unit name="set_set_set3">
137-
<!-- flag -->
138-
<shared-cache-mode>ALL</shared-cache-mode>
139-
<!-- leave, change to ALL -->
133+
<persistence-unit name="set_set_set3"><!-- flag -->
134+
<shared-cache-mode>ALL</shared-cache-mode><!-- leave, change to ALL -->
140135
<validation-mode>NONE</validation-mode>
141136
<properties>
142137
<!-- Connection properties -->
@@ -173,10 +168,8 @@ void set_set_set4() {
173168
"""
174169
<?xml version="1.0" encoding="UTF-8"?>
175170
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
176-
<persistence-unit name="set_set_set4">
177-
<!-- flag -->
178-
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
179-
<!-- leave -->
171+
<persistence-unit name="set_set_set4"><!-- flag -->
172+
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode><!-- leave -->
180173
<validation-mode>NONE</validation-mode>
181174
<properties>
182175
<!-- Connection properties -->
@@ -212,10 +205,8 @@ void set_set_notset1() {
212205
"""
213206
<?xml version="1.0" encoding="UTF-8"?>
214207
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
215-
<persistence-unit name="set_set_notset1">
216-
<!-- flag -->
217-
<shared-cache-mode>NONE</shared-cache-mode>
218-
<!-- leave -->
208+
<persistence-unit name="set_set_notset1"><!-- flag -->
209+
<shared-cache-mode>NONE</shared-cache-mode><!-- leave -->
219210
<validation-mode>NONE</validation-mode>
220211
<properties>
221212
<!-- Connection properties -->
@@ -250,10 +241,8 @@ void set_set_notset2() {
250241
"""
251242
<?xml version="1.0" encoding="UTF-8"?>
252243
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
253-
<persistence-unit name="set_set_notset2">
254-
<!-- flag -->
255-
<shared-cache-mode>ALL</shared-cache-mode>
256-
<!-- leave -->
244+
<persistence-unit name="set_set_notset2"><!-- flag -->
245+
<shared-cache-mode>ALL</shared-cache-mode><!-- leave -->
257246
<validation-mode>NONE</validation-mode>
258247
<properties>
259248
<!-- Connection properties -->
@@ -288,10 +277,8 @@ void set_set_notset3() {
288277
"""
289278
<?xml version="1.0" encoding="UTF-8"?>
290279
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
291-
<persistence-unit name="set_set_notset3">
292-
<!-- flag -->
293-
<shared-cache-mode>NONE</shared-cache-mode>
294-
<!-- change to NONE -->
280+
<persistence-unit name="set_set_notset3"><!-- flag -->
281+
<shared-cache-mode>NONE</shared-cache-mode><!-- change to NONE -->
295282
<validation-mode>NONE</validation-mode>
296283
<properties>
297284
<!-- Connection properties -->
@@ -326,10 +313,8 @@ void set_set_notset4() {
326313
"""
327314
<?xml version="1.0" encoding="UTF-8"?>
328315
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
329-
<persistence-unit name="set_set_notset4">
330-
<!-- flag -->
331-
<shared-cache-mode>ALL</shared-cache-mode>
332-
<!-- leave -->
316+
<persistence-unit name="set_set_notset4"><!-- flag -->
317+
<shared-cache-mode>ALL</shared-cache-mode><!-- leave -->
333318
<validation-mode>NONE</validation-mode>
334319
<properties>
335320
<!-- Connection properties -->
@@ -363,10 +348,8 @@ void set_set_notset5() {
363348
"""
364349
<?xml version="1.0" encoding="UTF-8"?>
365350
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
366-
<persistence-unit name="set_set_notset5">
367-
<!-- flag -->
368-
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
369-
<!-- leave -->
351+
<persistence-unit name="set_set_notset5"><!-- flag -->
352+
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode><!-- leave -->
370353
<validation-mode>NONE</validation-mode>
371354
<properties>
372355
<!-- remove -->
@@ -423,10 +406,8 @@ void set_notset_set2() {
423406
"""
424407
<?xml version="1.0" encoding="UTF-8"?>
425408
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
426-
<persistence-unit name="set_notset_set2">
427-
<!-- flag -->
428-
<shared-cache-mode>ALL</shared-cache-mode>
429-
<!-- leave -->
409+
<persistence-unit name="set_notset_set2"><!-- flag -->
410+
<shared-cache-mode>ALL</shared-cache-mode><!-- leave -->
430411
<validation-mode>NONE</validation-mode>
431412
<properties>
432413
<!-- Connection properties -->
@@ -461,10 +442,8 @@ void set_notset_set3() {
461442
"""
462443
<?xml version="1.0" encoding="UTF-8"?>
463444
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
464-
<persistence-unit name="set_notset_set3">
465-
<!-- flag -->
466-
<shared-cache-mode>ALL</shared-cache-mode>
467-
<!-- change to ALL -->
445+
<persistence-unit name="set_notset_set3"><!-- flag -->
446+
<shared-cache-mode>ALL</shared-cache-mode><!-- change to ALL -->
468447
<validation-mode>NONE</validation-mode>
469448
<properties>
470449
<!-- Connection properties -->
@@ -498,10 +477,8 @@ void set_notset_set4() {
498477
"""
499478
<?xml version="1.0" encoding="UTF-8"?>
500479
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
501-
<persistence-unit name="set_notset_set4">
502-
<!-- flag -->
503-
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
504-
<!-- leave -->
480+
<persistence-unit name="set_notset_set4"><!-- flag -->
481+
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode><!-- leave -->
505482
<validation-mode>NONE</validation-mode>
506483
<properties>
507484
<!-- remove --> \s
@@ -572,10 +549,8 @@ void set_notset_notset3() {
572549
"""
573550
<?xml version="1.0" encoding="UTF-8"?>
574551
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
575-
<persistence-unit name="set_notset_notset3">
576-
<!-- flag -->
577-
<shared-cache-mode>NONE</shared-cache-mode>
578-
<!-- change to NONE -->
552+
<persistence-unit name="set_notset_notset3"><!-- flag -->
553+
<shared-cache-mode>NONE</shared-cache-mode><!-- change to NONE -->
579554
<validation-mode>NONE</validation-mode>
580555
</persistence-unit>
581556
</persistence>
@@ -627,8 +602,7 @@ void notset_set_set1() {
627602
"""
628603
<?xml version="1.0" encoding="UTF-8"?>
629604
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
630-
<persistence-unit name="notset_set_set1">
631-
<!-- flag -->
605+
<persistence-unit name="notset_set_set1"><!-- flag -->
632606
<validation-mode>NONE</validation-mode>
633607
<properties>
634608
<!-- Connection properties -->
@@ -665,8 +639,7 @@ void notset_set_set2() {
665639
"""
666640
<?xml version="1.0" encoding="UTF-8"?>
667641
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
668-
<persistence-unit name="notset_set_set2">
669-
<!-- flag -->
642+
<persistence-unit name="notset_set_set2"><!-- flag -->
670643
<validation-mode>NONE</validation-mode>
671644
<properties>
672645
<!-- Connection properties -->
@@ -703,8 +676,7 @@ void notset_set_set3() {
703676
"""
704677
<?xml version="1.0" encoding="UTF-8"?>
705678
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
706-
<persistence-unit name="notset_set_set3">
707-
<!-- flag -->
679+
<persistence-unit name="notset_set_set3"><!-- flag -->
708680
<validation-mode>NONE</validation-mode>
709681
<properties>
710682
<!-- Connection properties -->
@@ -807,8 +779,7 @@ void notset_set_notset3() {
807779
"""
808780
<?xml version="1.0" encoding="UTF-8"?>
809781
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
810-
<persistence-unit name="notset_set_notset3">
811-
<!-- flag -->
782+
<persistence-unit name="notset_set_notset3"><!-- flag -->
812783
<validation-mode>NONE</validation-mode>
813784
<properties>
814785
<!-- Connection properties -->
@@ -1099,10 +1070,8 @@ void openjpa_cache1_flagged() {
10991070
"""
11001071
<?xml version="1.0" encoding="UTF-8"?>
11011072
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1102-
<persistence-unit name="openjpa_cache1_flagged">
1103-
<!-- flag -->
1104-
<shared-cache-mode>NONE</shared-cache-mode>
1105-
<!-- set to NONE -->
1073+
<persistence-unit name="openjpa_cache1_flagged"><!-- flag -->
1074+
<shared-cache-mode>NONE</shared-cache-mode><!-- set to NONE -->
11061075
<validation-mode>NONE</validation-mode>
11071076
<properties>
11081077
<!-- Connection properties -->
@@ -1136,10 +1105,8 @@ void openjpa_cache2_flagged() {
11361105
"""
11371106
<?xml version="1.0" encoding="UTF-8"?>
11381107
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1139-
<persistence-unit name="openjpa_cache2_flagged">
1140-
<!-- flag -->
1141-
<shared-cache-mode>ALL</shared-cache-mode>
1142-
<!-- set to ALL -->
1108+
<persistence-unit name="openjpa_cache2_flagged"><!-- flag -->
1109+
<shared-cache-mode>ALL</shared-cache-mode><!-- set to ALL -->
11431110
<validation-mode>NONE</validation-mode>
11441111
<properties>
11451112
<!-- remove -->
@@ -1207,8 +1174,7 @@ void openjpa_cache4_flagged() {
12071174
"""
12081175
<?xml version="1.0" encoding="UTF-8"?>
12091176
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1210-
<persistence-unit name="openjpa_cache4_flagged">
1211-
<!-- flag -->
1177+
<persistence-unit name="openjpa_cache4_flagged"> <!-- flag -->
12121178
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
12131179
<validation-mode>NONE</validation-mode>
12141180
<properties>
@@ -1242,8 +1208,7 @@ void openjpa_cache5_flagged() {
12421208
"""
12431209
<?xml version="1.0" encoding="UTF-8"?>
12441210
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1245-
<persistence-unit name="openjpa_cache5_flagged">
1246-
<!-- flag -->
1211+
<persistence-unit name="openjpa_cache5_flagged"> <!-- flag -->
12471212
<shared-cache-mode>DISABLE_SELECTIVE</shared-cache-mode>
12481213
<validation-mode>NONE</validation-mode>
12491214
<properties>
@@ -1276,10 +1241,8 @@ void openjpa_cache6_flagged() {
12761241
"""
12771242
<?xml version="1.0" encoding="UTF-8"?>
12781243
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1279-
<persistence-unit name="openjpa_cache6_flagged">
1280-
<!-- flag -->
1281-
<shared-cache-mode>NONE</shared-cache-mode>
1282-
<!-- change to NONE -->
1244+
<persistence-unit name="openjpa_cache6_flagged"><!-- flag -->
1245+
<shared-cache-mode>NONE</shared-cache-mode><!-- change to NONE -->
12831246
<validation-mode>NONE</validation-mode>
12841247
<properties>
12851248
</properties>
@@ -1355,8 +1318,7 @@ void openjpa_cache9_flagged() {
13551318
"""
13561319
<?xml version="1.0" encoding="UTF-8"?>
13571320
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
1358-
<persistence-unit name="openjpa_cache9_flagged">
1359-
<!-- flag -->
1321+
<persistence-unit name="openjpa_cache9_flagged"> <!-- flag -->
13601322
<shared-cache-mode>NONE</shared-cache-mode>
13611323
<validation-mode>NONE</validation-mode>
13621324
<properties>

0 commit comments

Comments
 (0)