Repository navigation
Concept codes comparison adjusted - #100
Closed
bryantaustin13 wants to merge 3 commits into
Closed
bryantaustin13 wants to merge 3 commits into
bryantaustin13 wants to merge 3 commits into
Conversation
Two conflicts, both fallout from cqframework#109 landing on main. src/shared/results-utils.ts: the conflict presents as a docblock, but main's side carries the whole longEquals function (cqframework#106, Long returned as valueString) and the auto-merged body below already calls it. Taking either side alone breaks the build. Kept longEquals together with this branch's expanded resultsEqual docblock. Concept comparison normalization is unchanged. src/test-results/cql-test-results.ts: cqframework#109 added a module-level formatActualValue that duplicated CQLTestResults.formatActualValue and its seven private statics. Resolved to one implementation: keep main's (recursive lists, quantities, interval boundary recursion), fold in this branch's Code and Concept rendering, and drop the duplicate statics. Arrays of Codes now render as CQL rather than falling back to JSON. Carried over the try/catch so a nested Long or a circular value no longer throws, and exported the function so displayFixes converges on the same one.
Both branches independently reworded this docblock and the equalizeValueTypes comment, which made them conflict with each other for no functional reason. Use wording that is accurate on either branch (no enumeration of the specific shapes each one handles) so whichever lands on main second merges cleanly.
Contributor
Author
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Server returning correct code, but test is failing due to format and test evaluation.
To duplicate the test that fails, run the following