From fbcd15a16d4408795ab6d13dc3822a28beabc64e Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Tue, 12 May 2015 18:08:10 -0400
Subject: [PATCH] Test updates

---
 hapi-fhir-jpaserver-base/pom.xml                      | 11 +++++++++++
 .../ca/uhn/fhir/jpa/provider/SystemProviderTest.java  |  4 +++-
 .../ca/uhn/fhir/validation/ResourceValidatorTest.java |  3 +--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index a25defa1756..73bcc29e16a 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -303,6 +303,17 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<!--
+					These tests all use a shared database, so it's easier if
+					they run in a predictable order 
+					-->
+					<runOrder>alphabetical</runOrder>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>de.juplo</groupId>
 				<artifactId>hibernate4-maven-plugin</artifactId>
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java
index bb086dc2e02..d6e6c468eba 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderTest.java
@@ -46,7 +46,9 @@ public class SystemProviderTest {
 		ourLog.info(response);
 	}
 	
-	// TODO: enable!
+	/**
+	 * This is Gramahe's test transaction - it requires some set up in order to work
+	 */
 //	@Test
 	public void testTransactionFromBundle3() throws Exception {
 
diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java
index b9223fd4e2c..456b00d214f 100644
--- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java
+++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java
@@ -60,8 +60,7 @@ public class ResourceValidatorTest {
 		 */
 		ourDefaultLocale = Locale.getDefault();
 		
-		Locale[] available = Locale.getAvailableLocales();
-		Locale newLocale = available[(int)(Math.random() * available.length)];
+		Locale newLocale = Locale.GERMANY;
 		Locale.setDefault(newLocale);
 		
 		ourLog.info("Tests are running in locale: " + newLocale.getDisplayName());