Skip to content

Commit c0c5d56

Browse files
committed
Fix JavaxMailToJakartaMailTest following new release
1 parent a97a04d commit c0c5d56

File tree

1 file changed

+11
-52
lines changed

1 file changed

+11
-52
lines changed

src/test/java/org/openrewrite/java/migrate/jakarta/JavaxMailToJakartaMailTest.java

Lines changed: 11 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.openrewrite.test.RecipeSpec;
2121
import org.openrewrite.test.RewriteTest;
2222

23+
import static org.assertj.core.api.Assertions.assertThat;
2324
import static org.openrewrite.java.Assertions.*;
2425
import static org.openrewrite.maven.Assertions.pomXml;
2526

@@ -57,23 +58,9 @@ void switchesJavaxMailApiDependencyToJakartaMailApiDependency() {
5758
</dependencies>
5859
</project>
5960
""",
60-
"""
61-
<?xml version="1.0" encoding="UTF-8"?>
62-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
63-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
64-
<modelVersion>4.0.0</modelVersion>
65-
<groupId>com.example</groupId>
66-
<artifactId>demo</artifactId>
67-
<version>0.0.1-SNAPSHOT</version>
68-
<dependencies>
69-
<dependency>
70-
<groupId>jakarta.mail</groupId>
71-
<artifactId>jakarta.mail-api</artifactId>
72-
<version>2.0.1</version>
73-
</dependency>
74-
</dependencies>
75-
</project>
76-
"""
61+
spec -> spec.after(pom -> assertThat(pom)
62+
.contains("jakarta.mail-api")
63+
.actual())
7764
)
7865
),
7966
srcMainJava(
@@ -118,23 +105,9 @@ void switchesJavaxMailDependencyToJakartaMailApiDependency() {
118105
</dependencies>
119106
</project>
120107
""",
121-
"""
122-
<?xml version="1.0" encoding="UTF-8"?>
123-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
124-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
125-
<modelVersion>4.0.0</modelVersion>
126-
<groupId>com.example</groupId>
127-
<artifactId>demo</artifactId>
128-
<version>0.0.1-SNAPSHOT</version>
129-
<dependencies>
130-
<dependency>
131-
<groupId>jakarta.mail</groupId>
132-
<artifactId>jakarta.mail-api</artifactId>
133-
<version>2.0.1</version>
134-
</dependency>
135-
</dependencies>
136-
</project>
137-
"""
108+
spec -> spec.after(pom -> assertThat(pom)
109+
.contains("jakarta.mail-api")
110+
.actual())
138111
)
139112
),
140113
srcMainJava(
@@ -187,23 +160,9 @@ public class TestApplication {
187160
<version>0.0.1-SNAPSHOT</version>
188161
</project>
189162
""",
190-
"""
191-
<?xml version="1.0" encoding="UTF-8"?>
192-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
193-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
194-
<modelVersion>4.0.0</modelVersion>
195-
<groupId>com.example</groupId>
196-
<artifactId>demo</artifactId>
197-
<version>0.0.1-SNAPSHOT</version>
198-
<dependencies>
199-
<dependency>
200-
<groupId>jakarta.mail</groupId>
201-
<artifactId>jakarta.mail-api</artifactId>
202-
<version>2.0.1</version>
203-
</dependency>
204-
</dependencies>
205-
</project>
206-
"""
163+
spec -> spec.after(pom -> assertThat(pom)
164+
.contains("jakarta.mail-api")
165+
.actual())
207166
)
208167
)
209168
);
@@ -228,7 +187,7 @@ void ignoresJakartaMailDependencyIfAlreadyExisting() {
228187
<dependency>
229188
<groupId>jakarta.mail</groupId>
230189
<artifactId>jakarta.mail-api</artifactId>
231-
<version>2.0.1</version>
190+
<version>2.0.2</version>
232191
</dependency>
233192
</dependencies>
234193
</project>

0 commit comments

Comments
 (0)