Ensure StandaloneContextSensitiveTest works with current version of O…

…penMRS
PIH · Jul 30, 2024 · 32cfb0f · 32cfb0f
1 parent 50ca821
commit 32cfb0f
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/api/src/test/java/org/openmrs/module/rwandareports/StandaloneContextSensitiveTest.java b/api/src/test/java/org/openmrs/module/rwandareports/StandaloneContextSensitiveTest.java
@@ -17,7 +17,7 @@ public abstract class StandaloneContextSensitiveTest extends BaseModuleContextSe
 	}
 
 	protected static void loadRuntimeProperties() {
-		System.setProperty("databaseUrl", "jdbc:mysql://localhost:3308/rwinkprotest?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false");
+		System.setProperty("databaseUrl", "jdbc:mysql://localhost:3306/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false");
 		System.setProperty("databaseUsername", "root");
 		System.setProperty("databasePassword", "root");
 		System.setProperty("databaseDriver", "com.mysql.jdbc.Driver");
@@ -28,22 +28,23 @@ protected static void loadRuntimeProperties() {
 	protected static void loadRuntimePropertiesFromSdk() {
 		Properties props = new Properties();
 		String serverId = System.getProperty("serverId");
-		if (serverId != null) {
-			File homeDir = new File(System.getProperty("user.home"));
-			File sdkDir = new File(homeDir, "openmrs");
-			File serverDir = new File(sdkDir, serverId);
-			File runtimePropertiesFile = new File(serverDir, "openmrs-runtime.properties");
-			if (!runtimePropertiesFile.exists()) {
-				throw new RuntimeException("No runtime properties file found at: " + runtimePropertiesFile.getAbsolutePath());
-			}
-			props = new Properties();
-			try {
-				props.load(Files.newInputStream(runtimePropertiesFile.toPath()));
-			}
-			catch (Exception e) {
-				throw new RuntimeException("Error loading properties from " + runtimePropertiesFile, e);
-			}
+		if (serverId == null) {
+			throw new RuntimeException("serverId is required as a system property");
 		}
+		File homeDir = new File(System.getProperty("user.home"));
+		File sdkDir = new File(homeDir, "openmrs");
+		File serverDir = new File(sdkDir, serverId);
+		File runtimePropertiesFile = new File(serverDir, "openmrs-runtime.properties");
+		if (!runtimePropertiesFile.exists()) {
+			throw new RuntimeException("No runtime properties file found at: " + runtimePropertiesFile.getAbsolutePath());
+		}
+		try {
+			props.load(Files.newInputStream(runtimePropertiesFile.toPath()));
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Error loading properties from " + runtimePropertiesFile, e);
+		}
+
 		System.setProperty("databaseUrl", props.getProperty("connection.url"));
 		System.setProperty("databaseUsername", props.getProperty("connection.username"));
 		System.setProperty("databasePassword", props.getProperty("connection.password"));