Skip to content

Check parent.modules in ParserParityTestHelper #992

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

Merged
merged 3 commits into from
Nov 12, 2023
Merged

Check parent.modules in ParserParityTestHelper #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43c0959
Implement method in TestDummyResource to prevent UME
fabapp2 Nov 12, 2023
9529e64
Check parent.modules in ParserParityTestHelper
fabapp2 Nov 12, 2023
1039b1d
Remove TODO
fabapp2 Nov 12, 2023
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
2 changes: 1 addition & 1 deletion components/sbm-core/src/test/java/org/springframework/sbm/project/TestDummyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private File getFile(TestDummyResource testDummyResource) {

@Override
public long contentLength() {
throw new UnsupportedOperationException();
return content.length();
}

@Override
Expand Down
1 change: 0 additions & 1 deletion ...rite/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.util.ArrayList;

// TODO: Making ProjectResourceSet a scoped bean would allow to remove this class.
@RequiredArgsConstructor
public class ProjectResourceSetHolder {
private ProjectResourceSet projectResourceSet;
Expand Down
43 changes: 41 additions & 2 deletions ...pport-rewrite/src/test/java/org/springframework/sbm/test/util/ParserParityTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.openrewrite.java.tree.JavaType;
import org.openrewrite.marker.Marker;
import org.openrewrite.marker.Markers;
import org.openrewrite.maven.MavenSettings;
import org.openrewrite.maven.tree.MavenResolutionResult;
import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.maven.tree.Scope;
Expand Down Expand Up @@ -237,7 +236,7 @@ static void verifyEqualSourceFileMarkers(SourceFile curExpectedSourceFile, Sourc
}

static void compareMavenResolutionResultMarker(SoftAssertions softAssertions, MavenResolutionResult expected, MavenResolutionResult actual) {
softAssertions.assertThat(actual)
assertThat(actual)
.usingRecursiveComparison()
.withEqualsForFieldsMatchingRegexes(
customRepositoryEquals("mavenSettings.localRepository"),
Expand All @@ -260,6 +259,46 @@ static void compareMavenResolutionResultMarker(SoftAssertions softAssertions, Ma

// verify dependencies
verifyEqualDependencies(softAssertions, expected, actual);

// parent.modules
verifyEqualParentModules(softAssertions, expected, actual);
}

private static void verifyEqualParentModules(SoftAssertions softAssertions, MavenResolutionResult expected, MavenResolutionResult actual) {
if(expected.getParent() == null) {
assertThat(actual.getParent()).isNull();
return;
}


List<MavenResolutionResult> actualParentModules = new ArrayList<>(actual.getParent().getModules());
List<MavenResolutionResult> expectedParentModules = new ArrayList<>(expected.getParent().getModules());
actualParentModules.sort(Comparator.comparing(o -> o.getPom().getGav().toString()));
expectedParentModules.sort(Comparator.comparing(o -> o.getPom().getGav().toString()));

expectedParentModules.forEach(expectedModule -> {
System.out.println(expectedModule.getPom().getGav());
int index = expectedParentModules.indexOf(expectedModule);
MavenResolutionResult actualModule = actualParentModules.get(index);

// compareMavenResolutionResultMarker(softAssertions, expectedModule, actualModule);
assertThat(actualModule)
.usingRecursiveComparison()
.ignoringFieldsOfTypes(UUID.class)
.ignoringFields(
"parent",
"modules",
"pom",
"dependencies"
)
.withEqualsForFields(customRepositoryEquals("mavenSettings.localRepository"), "mavenSettings.localRepository")
.isEqualTo(expectedModule);
// if(actualModule.getParent() != null) {
// compareMavenResolutionResultMarker(softAssertions, actualModule.getParent(), expectedModule.getParent());
// }
//// compareMavenResolutionResultMarker(softAssertions, expectedModule, actualModule);
//// verifyEqualParentModules(softAssertions, expectedModule, actualModule);
});
}

private static void verifyEqualDependencies(SoftAssertions softAssertions, MavenResolutionResult expected, MavenResolutionResult actual) {
Expand Down