commit 05ededcf2eb04bedd1e5d45765f5609732f97bd8
author Mark McKenna <m4rkmckenna@gmail.com> Fri Sep 29 10:45:42 2017 +0100
committer Mark McKenna <m4rkmckenna@gmail.com> Fri Sep 29 10:45:42 2017 +0100
tree 2c355eea689874df241fe1d7a63904d2f8638593
parent 779269de264d54b95572385a2b119dffe8d8da78
parent 74e2c31296b83db0d09bd5e26c3e31bff4d65194

This closes #129

software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java

diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
index e5d130a..586a569 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
@@ -48,7 +48,7 @@
 
     @AfterMethod(alwaysRun=true)
     public void tearDown() {
-        if ( app != null) {
+        if (app != null) {
             Entities.destroyAll(app.getManagementContext());
             app = null;
         }
@@ -57,7 +57,7 @@
     @Test
     public void shouldSetSensorsOnEntity() throws Exception {
         String contents = getTestYaml();
-        TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+        app = TestApplication.Factory.newManagedInstanceForTests();
         entity = app.createAndManageChild(EntitySpec.create(SaltEntity.class)
             .configure(SaltEntity.START_STATES, ImmutableSet.of("apache")));
 

software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java

diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
index 89b63f3..4c29d5f 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltConfigsTest.java
@@ -37,14 +37,14 @@
     @AfterMethod(alwaysRun=true)
     public void tearDown() {
         if ( app != null) {
-        	Entities.destroyAll(app.getManagementContext());
+            Entities.destroyAll(app.getManagementContext());
             app = null;
         }
     }
 
     @Test
     public void testAddToRunList() {
-        TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+        app = TestApplication.Factory.newManagedInstanceForTests();
         SaltConfigs.addToRunList(app, "a", "b");
         Set<? extends String> runs = app.getConfig(SaltConfig.START_STATES);
         Assert.assertEquals(runs, ImmutableSet.of("a", "b"));
@@ -52,7 +52,7 @@
 
     @Test
     public void testAddLaunchAttributes() {
-        TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+        app = TestApplication.Factory.newManagedInstanceForTests();
         SaltConfigs.addLaunchAttributes(app, ImmutableMap.of("k1", "v1"));
         Map<String, Object> attribs = app.getConfig(SaltConfig.SALT_SSH_LAUNCH_ATTRIBUTES);
         Assert.assertEquals(attribs, ImmutableMap.of("k1", "v1"));
@@ -60,7 +60,7 @@
 
     @Test
     public void testAddToFormulas() {
-        TestApplication app = TestApplication.Factory.newManagedInstanceForTests();
+        app = TestApplication.Factory.newManagedInstanceForTests();
         SaltConfigs.addToFormulas(app, "v1");
         SaltConfigs.addToFormulas(app, "v2");
         final Set<? extends String> formulas = app.getConfig(SaltConfig.SALT_FORMULAS);