TRUNK-6464: Test Context should not create new application data directory for each test (#5466)

Apply to legacy BaseContextSensitiveTest

Author: mogoodrich

api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java

@@ -358,18 +358,20 @@ public Properties getRuntimeProperties() {
 			runtimeProperties.setProperty(Environment.HBM2DDL_AUTO, "update");
 		}
 
-		try {
-			File tempappdir = File.createTempFile("appdir-for-unit-tests-", "");
-			tempappdir.delete(); // so we can make it into a directory
-			tempappdir.mkdir(); // turn it into a directory
-			tempappdir.deleteOnExit(); // clean up when we're done with tests
-			
-			runtimeProperties.setProperty(OpenmrsConstants.APPLICATION_DATA_DIRECTORY_RUNTIME_PROPERTY, tempappdir
-			        .getAbsolutePath());
-			OpenmrsUtil.setApplicationDataDirectory(tempappdir.getAbsolutePath());
-		}
-		catch (IOException e) {
-			log.error("Unable to create temp dir", e);
+		String appDataDir = OpenmrsUtil.getApplicationDataDirectory();
+		if (appDataDir == null || !appDataDir.contains("appdir-for-unit-tests-")) {
+			try {
+				File tempappdir = File.createTempFile("appdir-for-unit-tests-", "");
+				tempappdir.delete(); // so we can make it into a directory
+				tempappdir.mkdir(); // turn it into a directory
+				tempappdir.deleteOnExit(); // clean up when we're done with tests
+
+				runtimeProperties.setProperty(OpenmrsConstants.APPLICATION_DATA_DIRECTORY_RUNTIME_PROPERTY, tempappdir
+					.getAbsolutePath());
+				OpenmrsUtil.setApplicationDataDirectory(tempappdir.getAbsolutePath());
+			} catch (IOException e) {
+				log.error("Unable to create temp dir", e);
+			}
 		}
 
 		return runtimeProperties;