refactor indexer to rounte saves and loads through a generic Versione… #540
+153
−97
Conversation
This file contains 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
…dObject form of each method
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## next #540 +/- ##
==========================================
- Coverage 95.98% 95.75% -0.23%
==========================================
Files 68 68
Lines 5152 5164 +12
==========================================
Hits 4945 4945
- Misses 207 219 +12 ☔ View full report in Codecov by Sentry. |
walshmm
commented
Jan 30, 2025
Comment on lines
+930
to
+987
| # def test_readParameters_nope(self): | ||
| # indexer = self.initIndexer() | ||
| # assert not indexer.parametersPath(1).exists() | ||
| # with pytest.raises(FileNotFoundError): | ||
| # indexer.readParameters(1) | ||
|
|
||
| # def test_readWriteParameters(self): | ||
| # version = randint(1, 10) | ||
| # params = self.calculationParameters(version) | ||
|
|
||
| # indexer = self.initIndexer() | ||
| # indexer.writeParameters(params) | ||
| # res = indexer.readParameters(version) | ||
| # assert res.version == version | ||
| # assert res == params | ||
|
|
||
| # def test_readWriteParameters_warn_overwrite(self): | ||
| # version = randint(1, 100) | ||
|
|
||
| # indexer = self.initIndexer() | ||
|
|
||
| # # write some parameters at a version | ||
| # params1 = self.calculationParameters(version) | ||
| # indexer.writeParameters(params1) | ||
| # assert indexer.parametersPath(version).exists() | ||
|
|
||
| # # now try to overwrite parameters at same version | ||
| # # make sure a warning is logged | ||
| # with self.assertLogs(logger=IndexerModule.logger, level=logging.WARNING) as cm: | ||
| # params2 = self.calculationParameters(version) | ||
| # indexer.writeParameters(params2) | ||
| # assert f"Overwriting parameters at {indexer.parametersPath(version)}" in cm.output[0] | ||
|
|
||
| # # make sure the indexer can read/write specific state parameter types # | ||
|
|
||
| # def test_readWriteParameters_calibration(self): | ||
| # params = DAOFactory.calibrationParameters() | ||
| # indexer = self.initIndexer(IndexerType.CALIBRATION) | ||
| # indexer.writeParameters(params) | ||
| # res = indexer.readParameters(params.version) | ||
| # assert type(res) is Calibration | ||
| # assert res == params | ||
|
|
||
| # def test_readWriteParameters_normalization(self): | ||
| # params = DAOFactory.normalizationParameters() | ||
| # indexer = self.initIndexer(IndexerType.NORMALIZATION) | ||
| # indexer.writeParameters(params) | ||
| # res = indexer.readParameters(params.version) | ||
| # assert type(res) is Normalization | ||
| # assert res == params | ||
|
|
||
| # def test_readWriteParameters_reduction(self): | ||
| # params = CalculationParameters(**DAOFactory.calibrationParameters().model_dump()) | ||
| # indexer = self.initIndexer(IndexerType.REDUCTION) | ||
| # indexer.writeParameters(params) | ||
| # res = indexer.readParameters(params.version) | ||
| # assert type(res) is CalculationParameters | ||
| # assert res == params |
There was a problem hiding this comment.
There was an oversight that would let parameters write w/o there being a valid index entry, it would just create its desired folders. These tests are commented out because read/writeParameters just calls the same function as everything else now, so these test are redundant/will be rewritten in the context of Save/LoadVersionedObject if novel.
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.
…dObject form of each method
Description of work
Explanation of work
To test
Dev testing
CIS testing
# replace with your test script belowLink to EWM item
EWM#<ticket_number>
Verification
Acceptance Criteria
This list is for ease of reference, and does not replace reading the EWM story as part of the review. Verify this list matches the EWM story before reviewing.