Skip to content

fix issue #122 #214

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
tbarabanov wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix issue #122 #214

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1f348b
fix issue #122
Aug 28, 2023
e2e4d1b
Merge branch 'main' into issue_122
Sep 17, 2024
3254b16
issue_122 use generated asseertion package or default
Sep 17, 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
10 changes: 8 additions & 2 deletions src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,17 +497,23 @@ private String generateAssertionEntryPointMethodsFor(final Set<ClassDescription>
// resolve class assert (ex: PlayerAssert)
// in case of inner classes like Movie.PublicCategory, class assert will be MoviePublicCategoryAssert
assertionEntryPointMethodContent = replace(assertionEntryPointMethodContent, CUSTOM_ASSERTION_CLASS,
classDescription.getFullyQualifiedAssertClassName());
getAssertClassName(classDescription));
// resolve class (ex: Player)
// in case of inner classes like Movie.PublicCategory use class name with outer class i.e. Movie.PublicCategory.
assertionEntryPointMethodContent = replace(assertionEntryPointMethodContent, CLASS_TO_ASSERT,
classDescription.getFullyQualifiedClassName());
classDescription.getFullyQualifiedClassName());

allAssertThatsContentBuilder.append(lineSeparator).append(assertionEntryPointMethodContent);
}
return allAssertThatsContentBuilder.toString();
}

private String getAssertClassName(final ClassDescription classDescription) {
return generatedAssertionsPackage == null ?
classDescription.getFullyQualifiedAssertClassName() :
generatedAssertionsPackage + "." + classDescription.getAssertClassName();
}

private String determineBestEntryPointsAssertionsClassPackage(final Set<ClassDescription> classDescriptionSet) {
if (generatedAssertionsPackage != null) {
return generatedAssertionsPackage;
Expand Down