refactor(relation): update tests patterns #19465
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hmlanigan
reviewed
Apr 8, 2025
hmlanigan
approved these changes
Apr 8, 2025
Aflynn50
approved these changes
Apr 9, 2025
…onStatus` Even if set relation status is actually inserting a row in the relation_status table, this row isn't an entity (no uuid). Better naming is `setRelationStatus`. I also handle the update usecase for convenience and easier maintainability. - `domain/relation/state/relation_test.go`: Updated tests to replace usage of `addRelationStatus` with `setRelationStatus`. - `domain/relation/state/relation.go`: Removed the `addRelationStatus` function and introduced `setRelationStatus` with conflict handling for better idempotency.
gfouillet
force-pushed
the
v4/dqlite/relation/refactor-test
branch
from
e5457af to
83a689e
Compare
Helpers in relation_test add object from an UUID given as argument. This PR inverse the logic and make all the helpers prefixed by "add" and inserting an actual entity in the db (something that have a uuid) return the inserted UUID. It reduce the clutter in the arrange phase of test and provide more flexibility. - `domain/relation/state/relation_test.go`: - Replaced manual UUID generation and variable assignments like `GenRelationUUID` with test helper functions (`addCharm`, `addRelation`, and others) for clarity and consistency. - Removed unused imports and redundant declarations, simplifying the overall test structure.
gfouillet
force-pushed
the
v4/dqlite/relation/refactor-test
branch
from
83a689e to
9b9a5c9
Compare
|
/merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
addRelationStatustosetRelationStatus: even if set relation status is actually inserting a row in the relation_status table, this row isn't an entity (no uuid). Better naming issetRelationStatus. I also handle the update usecase for convenience and easier maintainability.More improvement can be done, however it is the most widespread. I don't want to push more in this PR, due to limited time and to avoid conflicts.
QA steps
Unit test still passes