Skip to content
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.

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

Alter test assertion to allow for ocfl 1.0 and 1.1 #192

Merged
merged 1 commit into from
Nov 14, 2022

Conversation

whikloj
Copy link
Contributor

@whikloj whikloj commented Nov 4, 2022

JIRA Ticket: https://fedora-repository.atlassian.net/browse/FCREPO-3863

What does this Pull Request do?

Tests in PicocliIT were matching against the namaste file 0=ocfl_1.0. With fcrepo-storage-ocfl upgrading to ocfl-java 1.5.0 all newly migrated OCFL objects are version 1.1.

This modifies the test to instead grab the last part of the Path object (filename or directory), convert it to a String (otherwise it uses a Path match which is the whole filename) and match against 0=ocfl_1.

How should this be tested?

Tests pass

Additional Notes:

Any additional information that you think would be helpful when reviewing this PR.

Example:

  • Does this change require documentation to be updated?
  • Does this change add any new dependencies?
  • Does this change require any other modifications to be made to the repository (ie. Regeneration activity, etc.)?
  • Could this change impact execution of existing code?

Interested parties

Tag (@ mention) interested parties or, if unsure, @fcrepo/committers

@dbernstein dbernstein merged commit 894927f into fcrepo-exts:main Nov 14, 2022
whikloj added a commit that referenced this pull request Feb 16, 2023
* added test for DISABLED digest type

* Adding Integration Test and a new exceptin for disabled digests

* checkstyle fixes

* changing index to match inline-it et al

* seperating test index in case of clash

* fixing issues with the disabled integration test

* removing superflous log message as we throw an exception now

* git wasn't adding an empty dir. used .gitkeep and now the test should parse tge datastream dir

* .gitkeep broke the indexer. copying a datastream from another test

* reverting to logging rather than throwing exception

* improved DISABLED fixity Integration Test to use fcrepo-storage-ocfl session object

* Switch from assembly to shade plugin to correct Jena re-packaging (#189)

Resolves:  https://fedora-repository.atlassian.net/browse/FCREPO-3836

* Alter test assertion to allow for ocfl 1.0 and 1.1 (#192)

Resolves: https://fedora-repository.atlassian.net/browse/FCREPO-3863

* Bump woodstox-core from 6.2.3 to 6.4.0 (#191)

Bumps [woodstox-core](https://github.com/FasterXML/woodstox) from 6.2.3 to 6.4.0.
- [Release notes](https://github.com/FasterXML/woodstox/releases)
- [Commits](FasterXML/woodstox@woodstox-core-6.2.3...woodstox-core-6.4.0)

---
updated-dependencies:
- dependency-name: com.fasterxml.woodstox:woodstox-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Increment version to 6.3.1-SNAPSHOT

* fixing issues with the disabled integration test

* removing superflous log message as we throw an exception now

* git wasn't adding an empty dir. used .gitkeep and now the test should parse tge datastream dir

* .gitkeep broke the indexer. copying a datastream from another test

* reverting to logging rather than throwing exception

* improved DISABLED fixity Integration Test to use fcrepo-storage-ocfl session object

* fixed test to look for a DISABLED digest

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Dan Field <[email protected]>
Co-authored-by: Dan Field <[email protected]>
Co-authored-by: Jared Whiklo <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Bernstein <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants