fix test

Author: asalan316

src/autoscaler/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/conf/CloudFoundryConfigurationProcessor.java

@@ -54,7 +54,12 @@ public void postProcessEnvironment(
 
       Map<String, Object> vcapOrgAndGuid = getOrgAndSpaceGuidFromVcap(environment);
       Map<String, Object> cfServerConfig = (Map<String, Object>) allConfigs.get("cfserver");
-      cfServerConfig.putAll(vcapOrgAndGuid);
+      if (cfServerConfig != null && !cfServerConfig.isEmpty()) {
+        logger.info(
+            "Found org and space guid service in VCAP_APPLICATIONS, applying configuration"
+                + " overrides");
+        cfServerConfig.putAll(vcapOrgAndGuid);
+      }
 
       // Process database services
       Map<String, Object> databaseConfigs = extractDatabaseConfigs(vcapServices);

src/autoscaler/scheduler/src/test/java/org/cloudfoundry/autoscaler/scheduler/conf/CloudFoundryConfigurationProcessorTest.java

@@ -356,11 +356,24 @@ public void testVcapServicesPrefersSslcertOverClientCert() {
   @Test
   public void testVcapApplicationWithOrgGuid() {
     String vcapServices =
-        """
-        {
-          "user-provided": []
-        }
-        """;
+      """
+      {
+        "user-provided": [
+          {
+            "name": "scheduler-config-service",
+            "tags": ["scheduler-config"],
+            "credentials": {
+              "cfserver": {
+                "healthserver": {
+                  "username": "health-user",
+                  "password": "health-password"
+                }
+              }
+            }
+          }
+        ]
+      }
+      """;
 
     String vcapApplication =
         """
@@ -390,11 +403,24 @@ public void testVcapApplicationWithOrgGuid() {
   @Test
   public void testVcapApplicationWithoutOrgGuid() {
     String vcapServices =
-        """
-        {
-          "user-provided": []
-        }
-        """;
+      """
+      {
+        "user-provided": [
+          {
+            "name": "scheduler-config-service",
+            "tags": ["scheduler-config"],
+            "credentials": {
+              "cfserver": {
+                "healthserver": {
+                  "username": "health-user",
+                  "password": "health-password"
+                }
+              }
+            }
+          }
+        ]
+      }
+      """;
 
     String vcapApplication =
         """
@@ -544,11 +570,24 @@ public void testVcapApplicationOverridesSchedulerConfig() {
   @Test
   public void testVcapApplicationWithOnlySpaceGuid() {
     String vcapServices =
-        """
-        {
-          "user-provided": []
-        }
-        """;
+      """
+      {
+        "user-provided": [
+          {
+            "name": "scheduler-config-service",
+            "tags": ["scheduler-config"],
+            "credentials": {
+              "cfserver": {
+                "healthserver": {
+                  "username": "health-user",
+                  "password": "health-password"
+                }
+              }
+            }
+          }
+        ]
+      }
+      """;
 
     String vcapApplication =
         """
@@ -577,11 +616,24 @@ public void testVcapApplicationWithOnlySpaceGuid() {
   @Test
   public void testVcapApplicationWithEmptySpaceGuid() {
     String vcapServices =
-        """
-        {
-          "user-provided": []
-        }
-        """;
+      """
+      {
+        "user-provided": [
+          {
+            "name": "scheduler-config-service",
+            "tags": ["scheduler-config"],
+            "credentials": {
+              "cfserver": {
+                "healthserver": {
+                  "username": "health-user",
+                  "password": "health-password"
+                }
+              }
+            }
+          }
+        ]
+      }
+      """;
 
     String vcapApplication =
         """
@@ -611,12 +663,24 @@ public void testVcapApplicationWithEmptySpaceGuid() {
   @Test
   public void testVcapApplicationWithoutSpaceGuid() {
     String vcapServices =
-        """
-        {
-          "user-provided": []
-        }
-        """;
-
+      """
+      {
+        "user-provided": [
+          {
+            "name": "scheduler-config-service",
+            "tags": ["scheduler-config"],
+            "credentials": {
+              "cfserver": {
+                "healthserver": {
+                  "username": "health-user",
+                  "password": "health-password"
+                }
+              }
+            }
+          }
+        ]
+      }
+      """;
     String vcapApplication =
         """
         {