honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed a test and removed awaitility excludes 

mvn install completed successfully
This commit is contained in:
Ken Stevens 2019-08-20 09:14:21 -04:00
parent 105d857819
commit daf45db2be
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/pom.xml
View File

@ -146,7 +146,11 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.javassist</groupId> <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>

4
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java
View File

@ -802,7 +802,6 @@ public class XmlParserDstu2Test {
//@formatter:off //@formatter:off
assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">", assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">",
"<meta>",
"<meta>", "<meta>",
"<profile value=\"http://foo/Profile1\"/>", "<profile value=\"http://foo/Profile1\"/>",
"<profile value=\"http://foo/Profile2\"/>", "<profile value=\"http://foo/Profile2\"/>",
@ -817,7 +816,6 @@ public class XmlParserDstu2Test {
"<display value=\"label2\"/>", "<display value=\"label2\"/>",
"</tag>", "</tag>",
"</meta>", "</meta>",
"</meta>",
"<name>", "<name>",
"<family value=\"FAMILY\"/>", "<family value=\"FAMILY\"/>",
"</name>", "</name>",
@ -856,7 +854,6 @@ public class XmlParserDstu2Test {
//@formatter:off //@formatter:off
assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">", assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">",
"<meta>",
"<meta>", "<meta>",
"<tag>", "<tag>",
"<system value=\"scheme1\"/>", "<system value=\"scheme1\"/>",
@ -869,7 +866,6 @@ public class XmlParserDstu2Test {
"<display value=\"label2\"/>", "<display value=\"label2\"/>",
"</tag>", "</tag>",
"</meta>", "</meta>",
"</meta>",
"<name>", "<name>",
"<family value=\"FAMILY\"/>", "<family value=\"FAMILY\"/>",
"</name>", "</name>",

16
pom.xml
View File

@ -1063,22 +1063,6 @@
<groupId>org.awaitility</groupId> <groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId> <artifactId>awaitility</artifactId>
<version>4.0.0-rc1</version> <version>4.0.0-rc1</version>
<!-- TODO KHS With this version bump, these excludes should no longer be necessary
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</exclusion>
</exclusions>
-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>