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

More fix build

This commit is contained in:
jamesagnew 2015-07-05 17:43:18 -04:00
parent 0f74db0acd
commit 70222ecf15
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/SearchHl7OrgDstu2Test.java
View File

@ -25,7 +25,7 @@ import org.junit.Test;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.rest.annotation.Search; import ca.uhn.fhir.rest.annotation.Search;
import ca.uhn.fhir.util.PatternMatcher; import ca.uhn.fhir.util.PatternMatcherB;
import ca.uhn.fhir.util.PortUtil; import ca.uhn.fhir.util.PortUtil;
/** /**
@ -85,7 +85,7 @@ public class SearchHl7OrgDstu2Test {
ourLog.info(responseContent); ourLog.info(responseContent);
assertEquals(200, status.getStatusLine().getStatusCode()); assertEquals(200, status.getStatusLine().getStatusCode());
assertThat(responseContent, PatternMatcher.pattern("id value..[0-9a-f-]+\\\"")); assertThat(responseContent, PatternMatcherB.pattern("id value..[0-9a-f-]+\\\""));
} }
@Test @Test

4
hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java → hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalHl7OrgDstu2Test.java
View File

@ -41,10 +41,10 @@ import ca.uhn.fhir.util.PortUtil;
/** /**
* Created by dsotnikov on 2/25/2014. * Created by dsotnikov on 2/25/2014.
*/ */
public class UpdateConditionalTest { public class UpdateConditionalHl7OrgDstu2Test {
private static CloseableHttpClient ourClient; private static CloseableHttpClient ourClient;
private static String ourLastConditionalUrl; private static String ourLastConditionalUrl;
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(UpdateConditionalTest.class); private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(UpdateConditionalHl7OrgDstu2Test.class);
private static int ourPort; private static int ourPort;
private static FhirContext ourCtx = FhirContext.forDstu2Hl7Org(); private static FhirContext ourCtx = FhirContext.forDstu2Hl7Org();
private static Server ourServer; private static Server ourServer;

2
hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateDstu2Test.java → hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateHl7OrgDstu2Test.java
View File

@ -40,7 +40,7 @@ import ca.uhn.fhir.util.PortUtil;
/** /**
* Created by dsotnikov on 2/25/2014. * Created by dsotnikov on 2/25/2014.
*/ */
public class ValidateDstu2Test { public class ValidateHl7OrgDstu2Test {
private static CloseableHttpClient ourClient; private static CloseableHttpClient ourClient;
private static EncodingEnum ourLastEncoding; private static EncodingEnum ourLastEncoding;
private static String ourLastResourceBody; private static String ourLastResourceBody;

6
hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcher.java → hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcherB.java
View File

@ -9,7 +9,7 @@ import org.hamcrest.TypeSafeMatcher;
/** /**
* Tests if the argument is a {@link CharSequence} that matches a regular expression. * Tests if the argument is a {@link CharSequence} that matches a regular expression.
*/ */
public class PatternMatcher extends TypeSafeMatcher<CharSequence> { public class PatternMatcherB extends TypeSafeMatcher<CharSequence> {
/** /**
* Creates a matcher that matches if the examined {@link CharSequence} matches the specified regular expression. * Creates a matcher that matches if the examined {@link CharSequence} matches the specified regular expression.
@ -42,12 +42,12 @@ public class PatternMatcher extends TypeSafeMatcher<CharSequence> {
*/ */
@Factory @Factory
public static Matcher<CharSequence> pattern(Pattern pattern) { public static Matcher<CharSequence> pattern(Pattern pattern) {
return new PatternMatcher(pattern); return new PatternMatcherB(pattern);
} }
private final Pattern pattern; private final Pattern pattern;
public PatternMatcher(Pattern pattern) { public PatternMatcherB(Pattern pattern) {
this.pattern = pattern; this.pattern = pattern;
} }