Fix WinRmMachineLocationExternalConfigYamlTest

Author: ivanayov

camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WinRmMachineLocationExternalConfigYamlTest.java

@@ -24,6 +24,7 @@
 import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
 import org.apache.brooklyn.entity.stock.BasicApplication;
 import org.apache.brooklyn.location.winrm.WinRmMachineLocation;
+import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.core.internal.winrm.RecordingWinRmTool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +70,7 @@ public void testWindowsMachinesExternalProvider() throws Exception {
 
         BasicApplication app = (BasicApplication) createAndStartApplication(yaml);
         waitForApplicationTasks(app);
-        assertEquals(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.ADDRESS.getName()), "127.0.0.1");
+        assertEquals(RecordingWinRmTool.constructorProps.get(0).get("host"), "127.0.0.1");
         assertEquals(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.USER.getName()), "admin");
         assertEquals(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.PASSWORD.getName()), "passw0rd");
     }
@@ -80,7 +81,7 @@ public void testWindowsMachinesNoExternalProvider() throws Exception {
         final String yaml = Joiner.on("\n").join("location:",
                 "  byon:",
                 "    hosts:",
-                "    - winrm: $brooklyn:external(\"inPlaceSupplier1\", \"ipEmpty\")",
+                "    - winrm: 127.0.0.1",
                 "      user: $brooklyn:external(\"inPlaceSupplier1\", \"byonUserEmpty\")",
                 "      brooklyn.winrm.config.winrmToolClass: org.apache.brooklyn.util.core.internal.winrm.RecordingWinRmTool",
                 "      password: $brooklyn:external(\"inPlaceSupplier1\", \"byonPasswordddd\")",
@@ -93,11 +94,36 @@ public void testWindowsMachinesNoExternalProvider() throws Exception {
 
         BasicApplication app = (BasicApplication) createAndStartApplication(yaml);
         waitForApplicationTasks(app);
-        assertNull(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.ADDRESS.getName()));
         assertNull(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.USER.getName()));
         assertNull(RecordingWinRmTool.constructorProps.get(0).get(WinRmMachineLocation.PASSWORD.getName()));
     }
 
+    @Test()
+    public void testWindowsMachinesNoExternalIPProvider() throws Exception {
+        RecordingWinRmTool.constructorProps.clear();
+        final String yaml = Joiner.on("\n").join("location:",
+                "  byon:",
+                "    hosts:",
+                "    - winrm: $brooklyn:external(\"inPlaceSupplier1\", \"ipEmpty\")",
+                "      user: $brooklyn:external(\"inPlaceSupplier1\", \"byonUserEmpty\")",
+                "      brooklyn.winrm.config.winrmToolClass: org.apache.brooklyn.util.core.internal.winrm.RecordingWinRmTool",
+                "      password: $brooklyn:external(\"inPlaceSupplier1\", \"byonPasswordddd\")",
+                "      osFamily: windows",
+                "services:",
+                "- type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess",
+                "  brooklyn.config:",
+                "    launch.command: echo launch",
+                "    checkRunning.command: echo running");
+
+        try {
+            BasicApplication app = (BasicApplication) createAndStartApplication(yaml);
+            waitForApplicationTasks(app);
+            Asserts.shouldHaveFailedPreviously();
+        } catch (Exception e) {
+            Asserts.expectedFailureOfType(e, NullPointerException.class);
+        }
+    }
+
     @Override
     protected Logger getLogger() {
         return log;