Skip to content

merge two UpgradeDependencyVersionTest.java test classes #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

merge two UpgradeDependencyVersionTest.java test classes #1050

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e491dd5
Fix calculation of base package
soumyaPrakashB Jan 17, 2023
0c57214
Merge branch 'main' into main
fabapp2 Jan 25, 2023
c4e981a
Merge branch 'main' into main
fabapp2 Jan 29, 2023
454ff7f
Add and modify test cases
soumyaPrakashB Jan 30, 2023
280e04c
merge two UpgradeDependencyVersionTest.java test classes
soumyaPrakashB Aug 22, 2024
8537645
Merge branch 'spring-projects-experimental:main' into main
soumyaPrakashB Aug 22, 2024
e938690
merge two UpgradeDependencyVersionTest.java test classes
soumyaPrakashB Aug 25, 2024
02598db
Merge pull request #1 from soumyaPrakashB/merge-test-classes
soumyaPrakashB Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions ...st/java/org/springframework/sbm/support/openrewrite/api/UpgradeDependencyVersionTest.java
View file
Original file line number Diff line number Diff line change
@@ -17,11 +17,13 @@

import org.intellij.lang.annotations.Language;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.RecipeRun;
import org.openrewrite.maven.MavenParser;
import org.openrewrite.maven.UpgradeDependencyVersion;
import org.openrewrite.maven.UpgradeParentVersion;
import org.openrewrite.xml.tree.Xml;
import org.springframework.sbm.helpers.DependencyVersionHelper;

@@ -223,4 +225,57 @@ void testUpgradeDependency_nullVersion() {
// assertThat(exceptionThrown).isTrue();

}

@Test
@Tag("integration")
void upgradeDependencyOfParent() {
String pomXml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <parent>\n" +
" <groupId>org.springframework.boot</groupId>\n" +
" <artifactId>spring-boot-starter-parent</artifactId>\n" +
" <version>2.4.12</version>\n" +
" <relativePath/> <!-- lookup parent from repository -->\n" +
" </parent>\n" +
" <groupId>com.example</groupId>\n" +
" <artifactId>spring-boot-24-to-25-example</artifactId>\n" +
" <version>0.0.1-SNAPSHOT</version>\n" +
" <name>spring-boot-2.4-to-2.5-example</name>\n" +
" <description>spring-boot-2.4-to-2.5-example</description>\n" +
" <properties>\n" +
" <java.version>11</java.version>\n" +
" </properties>\n" +
"</project>";

Xml.Document maven = MavenParser.builder()
.build()
.parse(pomXml)
.get(0);

RecipeRun recipeRun = new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", "2.5.6", null).run(List.of(maven));

assertThat(recipeRun.getResults().get(0).getAfter().printAll()).isEqualTo(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <parent>\n" +
" <groupId>org.springframework.boot</groupId>\n" +
" <artifactId>spring-boot-starter-parent</artifactId>\n" +
" <version>2.5.6</version>\n" +
" <relativePath/> <!-- lookup parent from repository -->\n" +
" </parent>\n" +
" <groupId>com.example</groupId>\n" +
" <artifactId>spring-boot-24-to-25-example</artifactId>\n" +
" <version>0.0.1-SNAPSHOT</version>\n" +
" <name>spring-boot-2.4-to-2.5-example</name>\n" +
" <description>spring-boot-2.4-to-2.5-example</description>\n" +
" <properties>\n" +
" <java.version>11</java.version>\n" +
" </properties>\n" +
"</project>");
}
}
83 changes: 0 additions & 83 deletions .../java/org/springframework/sbm/support/openrewrite/maven/UpgradeDependencyVersionTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,83 +0,0 @@
/*
* Copyright 2021 - 2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.sbm.support.openrewrite.maven;

import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.openrewrite.RecipeRun;
import org.openrewrite.maven.MavenParser;
import org.openrewrite.maven.UpgradeParentVersion;
import org.openrewrite.xml.tree.Xml;

import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

public class UpgradeDependencyVersionTest {

@Test
@Tag("integration")
void upgradeDependencyOfParent() {
String pomXml =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <parent>\n" +
" <groupId>org.springframework.boot</groupId>\n" +
" <artifactId>spring-boot-starter-parent</artifactId>\n" +
" <version>2.4.12</version>\n" +
" <relativePath/> <!-- lookup parent from repository -->\n" +
" </parent>\n" +
" <groupId>com.example</groupId>\n" +
" <artifactId>spring-boot-24-to-25-example</artifactId>\n" +
" <version>0.0.1-SNAPSHOT</version>\n" +
" <name>spring-boot-2.4-to-2.5-example</name>\n" +
" <description>spring-boot-2.4-to-2.5-example</description>\n" +
" <properties>\n" +
" <java.version>11</java.version>\n" +
" </properties>\n" +
"</project>";

Xml.Document maven = MavenParser.builder()
.build()
.parse(pomXml)
.get(0);

RecipeRun recipeRun = new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", "2.5.6", null).run(List.of(maven));

assertThat(recipeRun.getResults().get(0).getAfter().printAll()).isEqualTo(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd\">\n" +
" <modelVersion>4.0.0</modelVersion>\n" +
" <parent>\n" +
" <groupId>org.springframework.boot</groupId>\n" +
" <artifactId>spring-boot-starter-parent</artifactId>\n" +
" <version>2.5.6</version>\n" +
" <relativePath/> <!-- lookup parent from repository -->\n" +
" </parent>\n" +
" <groupId>com.example</groupId>\n" +
" <artifactId>spring-boot-24-to-25-example</artifactId>\n" +
" <version>0.0.1-SNAPSHOT</version>\n" +
" <name>spring-boot-2.4-to-2.5-example</name>\n" +
" <description>spring-boot-2.4-to-2.5-example</description>\n" +
" <properties>\n" +
" <java.version>11</java.version>\n" +
" </properties>\n" +
"</project>");
}
}