Commit Graph

1780 Commits

Author SHA1 Message Date
Grahame Grieve c3281340a0 Add Additional Bindings rendering 2022-04-12 09:11:18 +10:00
Grahame Grieve 9385557e04
Merge pull request #783 from gabriel0316/allowOtherDesignations
Allow other designations
2022-04-12 09:08:52 +10:00
Grahame Grieve fcbc13cb9c
Merge pull request #784 from gabriel0316/displayDesignations
Display all designations
2022-04-12 09:08:16 +10:00
dotasek a8da416ee3 Fix xml test + add unit tests 2022-04-11 14:57:10 -04:00
dotasek 2181cb14d5 Change tests to xml + fix breaking test 2022-04-11 14:10:53 -04:00
Gabriel 2fb5c67e32 Display all designations
With this commit all designations (incl. languages) will be displayed
in the Logical Definition and the Expansion of a ValueSet.
2022-04-08 13:39:09 +02:00
Grahame Grieve cdef76bc6d Fix bug where expansions have empty onbjects 2022-04-07 00:20:11 +10:00
Gabriel 51cd908f20 Allow other designations
With returning the url it is possible to allow other
designation.use than only the two specified
SNOMED codes.
2022-04-06 16:09:09 +02:00
Grahame Grieve 76411218ac
Merge pull request #782 from hapifhir/gg-202204-various
various fixes
2022-04-06 09:28:09 +10:00
Grahame Grieve 03bb7d4f5e
Merge pull request #781 from gabriel0316/fixCodeSystemLink
Enable linking to fragment CodeSystems
2022-04-05 15:55:45 +10:00
Grahame Grieve 8a05e4b2b2 various fixes
* Handle reslicing within the same profile
* Fix up wrong handling of context on exists() in FHIRPath
* Add hints to profiles around behavior of pattern on repeating elements
* Ignore all tooling extensions when validating
2022-04-05 15:52:33 +10:00
Gabriel c6fcf165e9 Enable linking to fragment CodeSystems 2022-04-04 15:47:29 +02:00
dotasek 880039c78b
Reorganize TestingUtilities to use expected/actual convention from JUnit (#780)
* Make testing utilities conform to JUnit expected-actual convention

* Refactor to CompareUtilities

* Add tests for CompareUtilities

* RELEASE_NOTES

Co-authored-by: dotasek <david.otasek@smilecdr.com>
2022-04-04 09:44:04 -04:00
markiantorno 87fed0cfc8 Updating version to: 5.6.41-SNAPSHOT and incrementing test cases dependency. 2022-03-30 23:21:31 +00:00
markiantorno f80a28816c Release: v5.6.40
## Validator Changes

* Add further clarification to Value set imports warning message

## Other code changes

* Consistent use of string values for primitive type conversions
* Fix problem with generated NPM Packages
* Fix URls when processing markdown while generating snapshots
* Default output to console, with additional output available via -debug option in CLI.
* Bump jackson-databind version to fix security vulnerability.
***NO_CI***
2022-03-30 23:05:39 +00:00
Grahame Grieve 7c8f5a3d8b
Merge pull request #779 from hapifhir/gg-202203-urls
Gg 202203 urls
2022-03-31 09:34:47 +11:00
Grahame Grieve d2ebb37e9b Fix problem with generated NPM packages 2022-03-31 07:17:00 +11:00
Grahame Grieve 610a7067a1 fix URLs processing in markdown 2022-03-31 07:12:44 +11:00
dotasek 0b5f1dd351
Merge pull request #777 from hapifhir/dotasek-add-terminology-to-testingutilities
Add hl7.terminology to shared worker contexts in tests
2022-03-29 19:07:59 -04:00
dotasek 759ba33bdd Remove v3-NullFlavor from invalid urls 2022-03-29 16:35:26 -04:00
dotasek 927bdffd2e Add hl7.terminology to shared worker contexts in tests 2022-03-29 10:23:54 -04:00
Grahame Grieve 4237554d2c Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-03-29 11:17:14 +11:00
Grahame Grieve 4735d99114 stability fixes 2022-03-29 11:17:01 +11:00
dotasek 86b714bb7b Pass -debug param to default logger + add logger to context builders 2022-03-25 13:38:24 -04:00
dotasek 35f5b96eb7 Use SystemOutLoggingService for logging 2022-03-24 17:33:27 -04:00
dotasek 25d9439fa9 Fix null exception for debug messages in BaseWorkerContext 2022-03-23 14:11:26 -04:00
dotasek 6e45dd522e Merge remote-tracking branch 'origin/master' into dotasek-primitivetype-conversion-via-stringvalue 2022-03-18 14:09:12 -04:00
markiantorno b075c5695f Updating version to: 5.6.40-SNAPSHOT and incrementing test cases dependency. 2022-03-18 04:05:44 +00:00
markiantorno e053d5a260 Release: v5.6.39
## Validator Changes

* no changes
* Add messageid to OperationOutcome from Validation
* Add support for new rules around value set interpretation with multiple imported value sets (https://jira.hl7.org/browse/FHIR-25179)

## Other code changes

* Fix for FHIRPathEngine.funcReplaceMatches() incorrectly returning Boolean in DSTU2 & DSTU3
* Fix NPE Processing missing markdown in definitions when generating snapshots
* add support for .matchesFull() and fix .matches() in FHIRPath
* Fix core package identification when loading new R5 core packages
***NO_CI***
2022-03-18 03:46:59 +00:00
Grahame Grieve 48d87a2075
Merge branch 'master' into gg-202203-misc 2022-03-18 12:54:53 +11:00
Grahame Grieve cf95c1a2ba Fix for Jira 25179 - change handling of imports
See https://chat.fhir.org/#narrow/stream/179202-terminology/topic/ValueSet.20defined.20by.20an.20intersection.20.3F
2022-03-18 12:45:40 +11:00
dotasek d0feacaaa8 Add tests and changes for Decimal 2022-03-17 15:41:07 -04:00
dotasek b5b43836eb Add tests and changes for Base64Binary 2022-03-16 12:20:58 -04:00
dotasek 9903d15ecc Add tests for setValueAsString and contructor precision checking 2022-03-15 17:47:23 -04:00
Grahame Grieve def7d5566a Surface message id in OperationOutcome from validator 2022-03-16 08:30:44 +11:00
Grahame Grieve 5ae5e5d4c8 fix PatientRenderer 2022-03-16 08:30:25 +11:00
Grahame Grieve 535a9cd9c9 fix FHIRPath matches() issue, and add support for matchesFull 2022-03-16 08:30:02 +11:00
Grahame Grieve dc84f94a17 fix NPE processing markdown 2022-03-16 08:29:19 +11:00
dotasek 209a5e777b Merge remote-tracking branch 'origin/master' into dotasek-primitivetype-conversion-via-stringvalue 2022-03-15 12:36:09 -04:00
dotasek 4068db73ff WIP Add tests for Primitive Types + use getValueAsString for conversion 2022-03-15 12:35:50 -04:00
markiantorno 8f5db15937 Updating version to: 5.6.39-SNAPSHOT and incrementing test cases dependency. 2022-03-14 21:48:39 +00:00
markiantorno 9ad69aca53 Release: v5.6.38
## Validator Changes

* no changes

## Other code changes

* Fix for FHIRPathEngine.funcReplaceMatches() incorrectly returning Boolean in DSTU2 & DSTU3
***NO_CI***
2022-03-14 21:32:32 +00:00
Grahame Grieve 79d6c7034d Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-03-15 06:45:18 +11:00
Grahame Grieve e8e6337b7c preserve message id in operation outcome 2022-03-15 06:44:10 +11:00
Lloyd McKenzie 4c82c9c738 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into Branch_685ea98d 2022-03-11 11:21:55 -07:00
Lloyd McKenzie a6faece71b Added R4B releases to the R4<->R5 conversion process
Corrected release number for R4B to be 4.3xxx rather than 4.1xxx
2022-03-11 11:16:04 -07:00
markiantorno e4ce145a0b Updating version to: 5.6.38-SNAPSHOT and incrementing test cases dependency. 2022-03-11 03:21:07 +00:00
markiantorno e86c9afc7a Release: v5.6.37
## Validator Changes

* fix handling of xver extensions with choice sub-extensions
* validate consistency of extension modifier flag with extension use in a profile

## Other code changes

* more presenting extensions when rendering.
* Get package id from 'package' field when 'npm-package' unavailable
* Ignore META-INF contents from other dependencies while building Validator jar
* Fix to r5 TestingUtilities to allow NarrativeGenerationTests to pass.
* fix handling to xver extensions generating snapshots
***NO_CI***
2022-03-11 03:04:43 +00:00
Grahame Grieve d23c319a90
Merge branch 'master' into gg-202203-vs-system 2022-03-11 11:30:07 +11:00
Grahame Grieve a3e8fca51a
Merge pull request #759 from hapifhir/R4B-datatypes-and-xml-cleanup
R4 b datatypes and xml cleanup
2022-03-11 10:53:52 +11:00
Lloyd McKenzie 0b3ccbbe37 Reverted lower-casing of version comparison 2022-03-10 16:48:41 -07:00
Grahame Grieve 6b3d7d4eaa infer system when value set has includes 2022-03-11 10:37:10 +11:00
Grahame Grieve 56c52ab7dd make fhir version code case independent 2022-03-11 10:34:18 +11:00
Grahame Grieve 791f16a05d fix failing tests. 2022-03-10 11:18:03 +11:00
Grahame Grieve 33f6c57d48 fix NPE 2022-03-10 06:52:44 +11:00
Grahame Grieve 89b912dde2 Fix cross version extension validation, and check that extensions are consistent wrt isModifier in profiles 2022-03-09 17:37:26 +11:00
Grahame Grieve d7754a321f Fix snapshot generation - always populate constraint source properly 2022-03-09 17:36:39 +11:00
Grahame Grieve 2ff53e9bf1 merge
# Conflicts:
#	RELEASE_NOTES.md
2022-03-08 13:25:16 +11:00
Lloyd McKenzie 478663cdf8 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into R4B-datatypes-and-xml-cleanup 2022-03-07 19:20:19 -07:00
Grahame Grieve cc983073cd more cross version extensions 2022-03-08 13:19:19 +11:00
Grahame Grieve 32c2ad96b7
Merge pull request #755 from hapifhir/gg-202203-extensions
Gg 202203 extensions
2022-03-08 09:39:54 +11:00
Lloyd McKenzie 074da98066 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into R4B-datatypes-and-xml-cleanup
# Conflicts:
#	org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java
2022-03-04 22:01:48 -07:00
Lloyd McKenzie 9f01f7c9f2 Per FHIR-31722 and FHIR-34453, ensure that CodeableReference and RatioRange aren't allowed in extensions Parameters, etc. in R4B 2022-03-04 21:58:17 -07:00
Lloyd McKenzie ca91cfad1a When running in Eclipse, the version comes in as upper-case, and the enum comparison needs it to be lower-case, so fold it to be that way. 2022-03-04 21:56:27 -07:00
dotasek 6f57013f98 Fix intermittent failures in NarrativeGenerationTests 2022-03-03 16:19:39 -05:00
Grahame Grieve 38e84a46f2
Merge pull request #750 from cqframework/master
Fix include resolution in LiquidRenderer
2022-03-03 07:46:12 +11:00
Grahame Grieve 64aed90f1e fix handling of xver extensions with choice sub-extensions 2022-03-03 07:43:43 +11:00
Grahame Grieve 4f652bceee more presenting extensions when rendering. 2022-03-03 07:43:09 +11:00
Grahame Grieve 862c8de664 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-03-01 11:38:53 +11:00
markiantorno 4909286a4b Updating version to: 5.6.37-SNAPSHOT and incrementing test cases dependency. 2022-02-26 05:00:46 +00:00
markiantorno 17bf21ecf8 Release: v5.6.36
## Validator Changes

* No changes

## Other code changes

* fix expansions where inactive = false (was wrongly including inactive codes)
***NO_CI***
2022-02-26 04:42:17 +00:00
Grahame Grieve 23fe900624 Merge branch 'gg-202202-various' of https://github.com/hapifhir/org.hl7.fhir 2022-02-26 08:09:27 +11:00
Grahame Grieve df89ca1df3 remdering work 2022-02-26 08:09:15 +11:00
dotasek 6975397675 Fix breaking SimpleWorkerContextTests 2022-02-25 15:36:04 -05:00
Grahame Grieve a5060d9475 fix failing JUnit test 2022-02-26 06:42:43 +11:00
Grahame Grieve c918f724ee fix problem missing profiles on references in discriminators 2022-02-26 06:22:42 +11:00
Grahame Grieve f32895da67 Fix ValueSet presentation 2022-02-26 06:21:14 +11:00
Grahame Grieve c5b3e022a4 fix bug where inactive codes always put in expansions, and add unit tests for this 2022-02-25 13:07:07 +11:00
Bryn Rhodes 778738d3ac Fix constructor argument 2022-02-23 20:20:38 -07:00
Bryn Rhodes 8212604250 Fix missing argument 2022-02-23 20:09:17 -07:00
Bryn Rhodes 5544460d20 Added documentation 2022-02-23 19:44:21 -07:00
Bryn Rhodes ab329c8c63 Added a Liquid template resolver to narrative generation to support include resolution in the publisher 2022-02-21 15:05:42 -07:00
markiantorno 9e693b6a03 Updating version to: 5.6.36-SNAPSHOT and incrementing test cases dependency. 2022-02-19 22:00:05 +00:00
markiantorno 685ea98d37 Release: v5.6.35
## Validator Changes

* no changes

## Other code changes

* fix various rendering issues from core spec
***NO_CI***
2022-02-19 21:28:34 +00:00
Grahame Grieve 905f8a7197
Merge pull request #746 from lmckenzi/Suppress-ignoring-ignore-messages
When you have a dependency on the R4 examples package, you get 100s o…
2022-02-20 08:00:04 +11:00
Grahame Grieve 98ba40748e Follow content reference when rendering XML resources 2022-02-19 21:46:05 +11:00
Grahame Grieve a1912cd423 fix various rendering issues from core spec 2022-02-19 21:41:50 +11:00
Lloyd McKenzie 4d26ca64fb When you have a dependency on the R4 examples package, you get 100s of messages about every value set, profile, etc. that's being ignored. Changed this so it's only a debug log message rather than something that happens all the time. 2022-02-16 23:17:09 -07:00
Grahame Grieve c9b6ab4e64 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-02-17 02:07:00 +11:00
Grahame Grieve 84f7133cf1 remove debugging statements 2022-02-17 02:05:02 +11:00
markiantorno 73baca035e Updating version to: 5.6.35-SNAPSHOT and incrementing test cases dependency. 2022-02-16 05:52:52 +00:00
markiantorno edd2c43e64 Release: v5.6.34
## Validator Changes

* Improve code validation error when value set can't be supported on tx.fhir.org
* Hide error about regex in core package

## Other code changes

* Fix wrong URL links in processed markdown
* Don't let txCache errors stop the process
* Fix broken links in questionnaire +
***NO_CI***
2022-02-16 05:32:34 +00:00
Grahame Grieve db19b0dd00 Fix broken links + remove error about regex in core package 2022-02-16 14:04:35 +11:00
Grahame Grieve 647d3efcee Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-02-16 13:15:19 +11:00
Grahame Grieve 0f1d9db24f Fix wrong URL links + txCache errors + questionnaire rendering at root 2022-02-16 13:14:55 +11:00
markiantorno 1d02e04edd Updating version to: 5.6.34-SNAPSHOT and incrementing test cases dependency. 2022-02-15 11:21:29 +00:00
Grahame Grieve fd36a5b0d2 Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir 2022-02-15 22:17:36 +11:00
Grahame Grieve c13193835e Preserve code validation error 2022-02-15 22:17:08 +11:00
markiantorno cf7415b33e Release: v5.6.33
## Validator Changes

* no changes

## Other code changes

* Fix error access experimental on canonical
***NO_CI***
2022-02-15 11:00:55 +00:00
Grahame Grieve 4983b0122c Fix error accessing experimental on NamingSystem 2022-02-15 19:32:04 +11:00
markiantorno e1613a7087 Updating version to: 5.6.33-SNAPSHOT and incrementing test cases dependency. 2022-02-14 06:57:10 +00:00
markiantorno 4a8aeda4e9 Release: v5.6.32
## Validator Changes

* no changes

## Other code changes

* Fix NPE error in Patient renderer
***NO_CI***
2022-02-14 06:25:49 +00:00
Grahame Grieve d91f6a450b Fix Patient Renderer 2022-02-14 16:23:22 +11:00
markiantorno 4ab3fea400 Updating version to: 5.6.32-SNAPSHOT and incrementing test cases dependency. 2022-02-14 01:27:51 +00:00
markiantorno 04bb17783e Release: v5.6.31
## Validator Changes

* accept regex on ElementDefinition and ElementDefinition.type, and an error for regex on ElementDefintion.type (though core packages have it on the wrong place)
* fix handling of cross-version extensions on choice elements
* fix OID validation (accept 1.3.88 GTIN OID)
* only consider bindable types when checking for multi-type bindings

## Other code changes

* Fix definitions in ListResource ("List" not "ListResource")
* introduce fhir-tools-settings.conf (see https://confluence.hl7.org/display/FHIR/Using+fhir-tool-settings.conf)
* Rendering fixes & improvements for Questionnaire and Patient and partial dates
* improvements to relative link handling in markdown when generating snapshots
* updates to package tools for changes to package.json#type (see https://confluence.hl7.org/pages/viewpage.action?pageId=35718629#NPMPackageSpecification-Packagemanifest)
* fix semver handling for tags in versions
* Bump mockito and bytebuddy versions for Java 17 compatibility & fix Kotlin ref
***NO_CI***
2022-02-14 01:08:37 +00:00
Grahame Grieve 6310b1158e #722 fix ListResource name misuse 2022-02-13 08:29:01 +11:00
Grahame Grieve b861ca4744 clean up 2022-02-12 09:07:07 +11:00
Grahame Grieve 7700a0cb11 missed rendering fix 2022-02-12 08:29:00 +11:00
Grahame Grieve e4d886dfec Fix handling of cross version extensions on choice types 2022-02-12 08:27:56 +11:00
Grahame Grieve fb1a08dca8 Rendering improvements: partial dates, questionnaire links, and patient renderer 2022-02-12 08:27:29 +11:00
Grahame Grieve 76ed4abba7 Changes for debugging on OSX (fhir-tools-settings.conf) 2022-02-12 07:55:59 +11:00
Grahame Grieve 0fa757b426 Fix markdown relative link issues + start working on additional bindings extension 2022-02-12 07:53:23 +11:00
Grahame Grieve b49e791cd1 Updates for changes to package.json type 2022-02-11 09:36:47 +11:00
markiantorno 045299ae7a Updating version to: 5.6.31-SNAPSHOT and incrementing test cases dependency. 2022-02-07 15:56:51 +00:00
markiantorno 7ee476a9b6 Release: v5.6.30
## Validator Changes

* no changes

## Other code changes

* Use builders for SimpleWorkerContext and ValidationEngine to enforce initialization order for caches and capabilities
***NO_CI***
2022-02-07 15:07:54 +00:00
dotasek 0e3e410ea1 Merge branch 'master' into simpleworkercontextbuilder 2022-02-04 09:50:42 -05:00
markiantorno 703f907289 Updating version to: 5.6.30-SNAPSHOT and incrementing test cases dependency. 2022-02-03 23:15:06 +00:00
markiantorno 9a89045bac Release: v5.6.29
## Validator Changes

* no changes

## Other code changes

* Fix package location for CacheVerificationLogger
***NO_CI***
2022-02-03 22:42:27 +00:00
dotasek e0bdbda5b7 Fix package location for CacheVerificationLogger 2022-02-03 16:35:26 -05:00
dotasek 239c436ca5 Code cleanup 2022-02-02 10:07:13 -05:00
dotasek 847ede5f88 Refactor SimpleWorkerContext and ValidationEngine 2022-02-01 15:28:19 -05:00
dotasek 5092be9a1d Clean txCache + update CacheVerificationLogger output 2022-02-01 10:09:23 -05:00
markiantorno c41fcf9fa9 Updating version to: 5.6.29-SNAPSHOT and incrementing test cases dependency. 2022-02-01 02:57:54 +00:00
markiantorno fe073b6a8a Release: v5.6.28
## Validator Changes

* no changes
* Add ability to [compile a map file to a StructureDefinition](https://confluence.hl7.org/display/FHIR/Using+the+FHIR+Mapping+Language#UsingtheFHIRMappingLanguage-runtransformsjavavalidator)
* Add knowledge of additional R5 extensions for StructureDefinitions
* Fix problem validating extension context on choice types
* Add hint when binding found on element with multiple types
* Fix validator to guess system on all uses of code (not just most)

## Other code changes

* Use cached terminology server responses for unit and integration tests.
* Add more HTTP logging
* Clean up various issues with graphQL and polymorphic elements
* Add better support for date/time rendering
* Significant speed improvement for terminology caching
***NO_CI***
2022-02-01 02:36:54 +00:00
Grahame Grieve 96538ba249
Merge pull request #704 from lmckenzi/Add_map_compile
Add map compile
2022-02-01 11:50:41 +11:00
Grahame Grieve cae92c8621
Merge pull request #727 from hapifhir/ja_20220130_graphql_cleanup
Updates to GraphQL
2022-02-01 11:49:10 +11:00
Grahame Grieve bac81752c8 merge and fix testing bugs 2022-02-01 10:20:56 +11:00
Grahame Grieve 4c48d597a6
Merge pull request #721 from dotasek/tx-server-cache-analysis
TX Server Caching for Tests
2022-02-01 08:09:41 +11:00
jamesagnew 180035d306 One more tweak 2022-01-30 18:37:22 -05:00
jamesagnew 846866472b Updates to GraphQL 2022-01-30 17:04:10 -05:00
Grahame Grieve 1aa1e288ec merge 2022-01-30 07:57:39 +11:00
Grahame Grieve 3559bd6638 fix tests problems with date formats and java versions 2022-01-29 09:16:48 +11:00
Jens Kristian Villadsen 7b24e9d4ee
Update FHIRPathEngine.java
As mentioned on https://github.com/hapifhir/org.hl7.fhir.core/issues/703
2022-01-28 20:44:39 +01:00
Grahame Grieve bd9d486846 Significant speed improvement for terminology cache 2022-01-29 06:06:20 +11:00
Grahame Grieve 42f75dfee0 #703 - fix missing .guessSystem() in opMemberOf 2022-01-29 06:05:51 +11:00
dotasek fdc6e02b49 Don't log requests when rebuilding cache 2022-01-26 09:31:58 -05:00
dotasek 39e30a10c4 Clean up comments 2022-01-26 09:28:19 -05:00
dotasek a41287a74d Additional logging for requests in test 2022-01-25 18:02:16 -05:00
dotasek 9ec63bc1b9 Test capability caching.
Just when I think I'm done...
2022-01-25 16:36:13 -05:00
dotasek 7c58619528 Testing Part 7 2022-01-25 14:43:13 -05:00
dotasek 38728f2c82 Testing part 6 2022-01-25 10:48:42 -05:00
dotasek b5e9a7aa1e Testing Part 5 2022-01-24 18:16:10 -05:00
dotasek 1715574a7e Testing Part 4 2022-01-24 17:00:17 -05:00
dotasek 33cdfffa55 More consistent version management in TerminologyCache 2022-01-23 13:21:40 -05:00
dotasek 97c11a9be0 Testing Part 3 2022-01-23 12:06:44 -05:00
dotasek 09ddd964ff Merge remote-tracking branch 'origin/master' into tx-server-cache-analysis 2022-01-21 17:39:51 -05:00
dotasek 6416ccce36 Testing Part 2 2022-01-21 17:39:43 -05:00
markiantorno f69a30421f Updating version to: 5.6.28-SNAPSHOT and incrementing test cases dependency. 2022-01-21 21:43:26 +00:00
markiantorno 90008b7744 Release: v5.6.27
## Validator Changes

* no changes

## Other code changes

* Fix unnecessary JsonParser/XmlParser class load
***NO_CI***
2022-01-21 21:12:00 +00:00
dotasek f9561f2685 Testing Part 1 2022-01-21 15:29:17 -05:00