Skip to content

Conversation

@gpeacock
Copy link
Collaborator

This is required for 2.2 compliance

gpeacock added 8 commits July 11, 2025 12:32
…ison

- Enhanced assertion array comparison to report reordering, additions, and removals separately
- Added action array comparison for c2pa.actions assertions with same logic
- Simplified identifier matching to use only 'label' field for assertions and 'action' field for actions
- Both assertion and action comparisons now report:
  * 'Assertion/Action order changed' when items are reordered
  * 'Assertion/Action added/removed' when items are added or removed
  * Individual content changes within matched items
- Improved path matching to properly detect actions arrays within assertions
- Maintains detailed content comparison for matched items even when reordered
- Fixed duplicate val2.is_null() condition in compare_json_values
- Ensured proper detection of content changes within matched assertions/actions
- Hash values and other ignorable fields are properly ignored during comparison
- Content changes in non-ignorable fields are correctly detected and reported
@codecov
Copy link

codecov bot commented Jul 14, 2025

Codecov Report

❌ Patch coverage is 15.81197% with 197 lines in your changes missing coverage. Please review.
✅ Project coverage is 79.26%. Comparing base (e44e031) to head (f80bd68).
⚠️ Report is 21 commits behind head on main.

Files with missing lines Patch % Lines
make_test_images/src/compare_manifests.rs 0.00% 180 Missing ⚠️
sdk/src/ingredient.rs 53.33% 7 Missing ⚠️
sdk/src/resource_store.rs 73.91% 6 Missing ⚠️
sdk/src/reader.rs 0.00% 3 Missing ⚠️
make_test_images/src/main.rs 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1235      +/-   ##
==========================================
- Coverage   79.41%   79.26%   -0.16%     
==========================================
  Files         148      148              
  Lines       41397    41534     +137     
==========================================
+ Hits        32877    32923      +46     
- Misses       8520     8611      +91     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@ok-nick ok-nick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good the only thing I'd say is that we make sure #1234 is merged before this one.

@gpeacock gpeacock merged commit 0b92261 into main Jul 15, 2025
36 of 38 checks passed
@gpeacock gpeacock deleted the gpeacock/icon_assertions branch July 15, 2025 22:07
@caiopensrc caiopensrc mentioned this pull request Jul 15, 2025
@crandmck crandmck added the needs-doc Any change that affects user documentation label Jul 30, 2025
ok-nick pushed a commit that referenced this pull request Aug 11, 2025
…of using data_boxes. (#1235)

* Improve manifest comparison: better assertion and action array comparison

- Enhanced assertion array comparison to report reordering, additions, and removals separately
- Added action array comparison for c2pa.actions assertions with same logic
- Simplified identifier matching to use only 'label' field for assertions and 'action' field for actions
- Both assertion and action comparisons now report:
  * 'Assertion/Action order changed' when items are reordered
  * 'Assertion/Action added/removed' when items are added or removed
  * Individual content changes within matched items
- Improved path matching to properly detect actions arrays within assertions
- Maintains detailed content comparison for matched items even when reordered

* Fix null comparison logic in manifest comparison

- Fixed duplicate val2.is_null() condition in compare_json_values
- Ensured proper detection of content changes within matched assertions/actions
- Hash values and other ignorable fields are properly ignored during comparison
- Content changes in non-ignorable fields are correctly detected and reported

* fix: Enhance manifest comparison,
Update baseline v1

* chore: save v1 json results separately

* chore: change make_test_images default to v2 claims
Update known good v2 baseline

* chore: catch changes in remainder of jumbf urls

* chore: clean up clippy errors

* feat: generate icons as EmbededData assertions instead data_boxes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-doc Any change that affects user documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants