From e7d2a19ac685419848cd7d8f9a78dc8af19f2b16 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Tue, 16 Sep 2014 15:25:20 -0400 Subject: [PATCH] Fix broken build - Thanks Jenkins! --- .../IncomingRequestAddressStrategyTest.java | 16 +++++----------- .../.settings/org.eclipse.core.resources.prefs | 1 - 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategyTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategyTest.java index d047a0c84f5..9e96a5100f4 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategyTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategyTest.java @@ -9,6 +9,10 @@ import org.junit.Test; public class IncomingRequestAddressStrategyTest { + /** + * This is an incoming request from an instance of Tomcat on AWS, provided by + * Simon Ling of Systems Made Simple + */ @Test public void testAwsUrl() { @@ -19,18 +23,8 @@ public class IncomingRequestAddressStrategyTest { when(req.getContextPath()).thenReturn("/FhirStorm"); IncomingRequestAddressStrategy incomingRequestAddressStrategy = new IncomingRequestAddressStrategy(); - String actual = incomingRequestAddressStrategy.determineServerBase(req); + String actual = incomingRequestAddressStrategy.determineServerBase(null,req); assertEquals("http://fhirstorm.dyndns.org:8080/FhirStorm/fhir", actual); } - /* - IncomingRequestAddressStrategy15:29:02.876 [http-bio-8080-exec-3] TRACE c.uhn.fhir.rest.server.RestfulServer - - Request FullPath: /FhirStorm/fhir/Patient/_search - 15:29:02.876 [http-bio-8080-exec-3] TRACE c.uhn.fhir.rest.server.RestfulServer - - Servlet Path: /fhir - 15:29:02.876 [http-bio-8080-exec-3] TRACE c.uhn.fhir.rest.server.RestfulServer - - Request Url: http://fhirstorm.dyndns.org:8080/FhirStorm/fhir/Patient/_search - 15:29:02.876 [http-bio-8080-exec-3] TRACE c.uhn.fhir.rest.server.RestfulServer - - Context Path: /FhirStorm - */ } diff --git a/hapi-fhir-base/testmindeps/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-base/testmindeps/.settings/org.eclipse.core.resources.prefs index e9441bb123e..99f26c0203a 100644 --- a/hapi-fhir-base/testmindeps/.settings/org.eclipse.core.resources.prefs +++ b/hapi-fhir-base/testmindeps/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 encoding/=UTF-8