Fix double initiation error on EngineServiceFacade

The engineServiceFacade allows it's init() method to be called twice,
the second call should return that the facade is already initialized.

Issue-ID: POLICY-2720
Change-Id: Id241e232163a8812a72f92841ce7b11f59358d45
Signed-off-by: liamfallon <liam.fallon@est.tech>

4 files changed, 129 insertions, 171 deletions

diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
index 5871204b5..000acab75 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/BatchDeployerTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -28,6 +29,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
+import java.time.Duration;
+import org.awaitility.Awaitility;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.model.basicmodel.handling.ApexModelException;
@@ -41,8 +44,7 @@ public class BatchDeployerTest {
     @Test
     public void testBatchDeployerBad() {
         try {
-            final String[] eventArgs =
-                { "-h" };
+            final String[] eventArgs = { "-h" };
 
             BatchDeployer.main(eventArgs);
             fail("test should throw an exception");
@@ -54,8 +56,7 @@ public class BatchDeployerTest {
     @Test
     public void testBatchDeployerBadPort() {
         try {
-            final String[] eventArgs =
-                { "localhost", "aport", "afile" };
+            final String[] eventArgs = { "localhost", "aport", "afile" };
 
             BatchDeployer.main(eventArgs);
             fail("test should throw an exception");
@@ -67,88 +68,91 @@ public class BatchDeployerTest {
     @Test
     public void testBatchDeployerOk() {
         try {
-            final String[] eventArgs =
-                { "Host", "43443", "src/test/resources/models/SamplePolicyModelJAVASCRIPT.json" };
+            final String[] eventArgs = { "Host", "43443",
+                "src/test/resources/models/SamplePolicyModelJAVASCRIPT.json" };
 
             BatchDeployer.main(eventArgs);
+            fail("test should throw an exception");
         } catch (Exception exc) {
             assertEquals("model deployment failed on parameters Host 43443", exc.getMessage());
         }
     }
-    
+
     @Test
-    public void testBatchDeployerDeployString() {
+    public void testBatchDeployerDeployString() throws ApexException {
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         BatchDeployer deployer = new BatchDeployer("localhost", 12345, new PrintStream(baosOut, true));
-        deployer.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+        deployer.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
 
+        // We are testing towards a dummy client, make it return a failed initiation
+        dummyDeploymentClient.setInitSuccessful(false);
         try {
             deployer.init();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
-            assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+            assertEquals("model deployment failed on parameters localhost 12345", ade.getMessage());
         }
 
-        try {
-            deployer.init();
-        } catch (ApexDeploymentException ade) {
-            ade.printStackTrace();
-            fail("test should not throw an exception");
-        }
+        // Wait until the connection to the server closes following the bad connection
+        // attempt
+        Awaitility.await().atLeast(Duration.ofMillis(100));
+
+        // We are testing towards a dummy client, make it return a successful initiation
+        dummyDeploymentClient.setInitSuccessful(true);
+        deployer.init();
 
         try {
             deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
+            fail("test should throw an exception");
         } catch (ApexException ade) {
             assertEquals("could not deploy apex model from src/test/resources/models/SmallModel.json",
-                            ade.getMessage());
+                ade.getMessage());
         }
 
-        try {
-            deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
-        } catch (ApexException ade) {
-            fail("test should not throw an exception");
-        }
+        deployer.deployModel("src/test/resources/models/SmallModel.json", false, false);
 
         deployer.close();
     }
 
     @Test
-    public void testBatchDeployerStream() throws ApexModelException, FileNotFoundException {
+    public void testBatchDeployerStream() throws FileNotFoundException, ApexException {
 
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         BatchDeployer deployer = new BatchDeployer("localhost", 12345, new PrintStream(baosOut, true));
-        deployer.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+        deployer.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
 
+        dummyDeploymentClient.setInitSuccessful(false);
         try {
             deployer.init();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
-            assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+            assertEquals("model deployment failed on parameters localhost 12345", ade.getMessage());
         }
 
-        try {
-            deployer.init();
-        } catch (ApexDeploymentException ade) {
-            ade.printStackTrace();
-            fail("test should not throw an exception");
-        }
+        // Wait until the connection to the server closes following the bad connection
+        // attempt
+        Awaitility.await().atLeast(Duration.ofMillis(100));
+
+        dummyDeploymentClient.setInitSuccessful(true);
+        deployer.init();
 
         final ApexModelReader<AxPolicyModel> modelReader = new ApexModelReader<>(AxPolicyModel.class);
         modelReader.setValidateFlag(false);
-        final AxPolicyModel apexPolicyModel = modelReader.read(
-                        new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
+        final AxPolicyModel apexPolicyModel = modelReader
+            .read(new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
 
         try {
             deployer.deployModel(apexPolicyModel, false, false);
+            fail("test should throw an exception");
         } catch (ApexException ade) {
             assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
         }
 
-        try {
-            deployer.deployModel(apexPolicyModel, false, false);
-        } catch (ApexException ade) {
-            fail("test should not throw an exception");
-        }
+        deployer.deployModel(apexPolicyModel, false, false);
 
         deployer.close();
     }
@@ -164,14 +168,14 @@ public class BatchDeployerTest {
             deployer.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
             fail("test should throw an exception");
         } catch (ApexException ade) {
-            assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+            assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
         }
 
         try {
             deployer.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
             fail("test should throw an exception");
         } catch (ApexException ade) {
-            assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+            assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
         }
 
         deployer.close();
@@ -186,8 +190,8 @@ public class BatchDeployerTest {
 
         final ApexModelReader<AxPolicyModel> modelReader = new ApexModelReader<>(AxPolicyModel.class);
         modelReader.setValidateFlag(false);
-        final AxPolicyModel apexPolicyModel = modelReader.read(
-                        new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
+        final AxPolicyModel apexPolicyModel = modelReader
+            .read(new FileInputStream(new File("src/test/resources/models/SmallModel.json")));
 
         try {
             deployer.deployModel(apexPolicyModel, false, false);
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
index 4432a38a6..ffb3d2c63 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/DummyDeploymentClient.java
@@ -29,6 +29,8 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import lombok.Getter;
+import lombok.Setter;
 import org.onap.policy.apex.core.protocols.Message;
 import org.onap.policy.apex.core.protocols.engdep.messages.EngineServiceInfoResponse;
 import org.onap.policy.apex.core.protocols.engdep.messages.GetEngineInfo;
@@ -46,6 +48,8 @@ import org.onap.policy.common.utils.resources.TextFileUtils;
 /**
  * Dummy deployment client.
  */
+@Getter
+@Setter
 public class DummyDeploymentClient extends DeploymentClient implements Runnable {
     private static final AxArtifactKey MODEL_KEY = new AxArtifactKey("Model", "0.0.1");
     private static final AxArtifactKey ENGINE_KEY = new AxArtifactKey("Engine", "0.0.1");
@@ -130,14 +134,12 @@ public class DummyDeploymentClient extends DeploymentClient implements Runnable
         infoResponse.setEngineServiceKey(ENGINE_SERVICE_KEY);
 
         receiveQueue.add(infoResponse);
-
-        initSuccessful = !initSuccessful;
     }
 
     /**
      * Handle and return the response to the engine status message.
      *
-     * @param message the incoming status message
+     * @param message     the incoming status message
      * @param successFlag true if the result should be successful
      * @return engine status success or not
      */
@@ -203,17 +205,8 @@ public class DummyDeploymentClient extends DeploymentClient implements Runnable
     }
 
     /**
-     * Checks if the client thread is started.
-     *
-     * @return true, if the client thread is started
-     */
-    @Override
-    public boolean isStarted() {
-        return started;
-    }
-
-    /**
-     * Allows users of this class to get a reference to the receive queue to receove messages.
+     * Allows users of this class to get a reference to the receive queue to receove
+     * messages.
      *
      * @return the receive queue
      */
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
index 6d2015562..fb2ef4459 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/EngineServiceFacadeTest.java
@@ -1,19 +1,20 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
@@ -37,10 +38,17 @@ public class EngineServiceFacadeTest {
     public void testEngineServiceFacade() throws Exception {
         EngineServiceFacade facade = new EngineServiceFacade("localhost", 51273);
 
-        facade.setDeploymentClient(new DummyDeploymentClient("localhost", 51273));
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+        facade.setDeploymentClient(dummyDeploymentClient);
 
-        // First init should fail
-        facade.init();
+        // First init should fail due to our dummy client
+        dummyDeploymentClient.setInitSuccessful(false);
+        try {
+            facade.init();
+            fail("could not handshake with server localhost:51273");
+        } catch (final Exception ade) {
+            assertEquals("could not handshake with server localhost:51273", ade.getMessage());
+        }
 
         assertNull(facade.getKey());
         assertNull(facade.getApexModelKey());
@@ -50,10 +58,11 @@ public class EngineServiceFacadeTest {
             facade.deployModel("src/test/resources/models/SamplePolicyModelJAVASCRIPT.json", false, false);
             fail("test should throw an exception here");
         } catch (final Exception ade) {
-            assertEquals("cound not deploy apex model, deployer is not initialized", ade.getMessage());
+            assertEquals("could not deploy apex model, deployer is not initialized", ade.getMessage());
         }
 
         // Second init should work
+        dummyDeploymentClient.setInitSuccessful(true);
         facade.init();
 
         assertEquals("EngineService:0.0.1", facade.getKey().getId());
@@ -64,8 +73,8 @@ public class EngineServiceFacadeTest {
             facade.deployModel("src/test/resources/models/NonExistantModel.json", false, false);
             fail("test should throw an exception here");
         } catch (final Exception ade) {
-            assertEquals("cound not create apex model, could not read from file "
-                            + "src/test/resources/models/NonExistantModel.json", ade.getMessage());
+            assertEquals("could not create apex model, could not read from file "
+                + "src/test/resources/models/NonExistantModel.json", ade.getMessage());
         }
 
         try {
@@ -97,14 +106,10 @@ public class EngineServiceFacadeTest {
             fail("test should throw an exception here");
         } catch (final Exception ade) {
             assertEquals("could not deploy apex model from src/test/resources/models/SmallModel.json",
-                            ade.getMessage());
+                ade.getMessage());
         }
 
-        try {
-            facade.deployModel("src/test/resources/models/SmallModel.json", false, false);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.deployModel("src/test/resources/models/SmallModel.json", false, false);
 
         try {
             facade.startEngine(facade.getEngineKeyArray()[0]);
@@ -113,11 +118,7 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.startEngine(facade.getEngineKeyArray()[0]);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.startEngine(facade.getEngineKeyArray()[0]);
 
         try {
             facade.stopEngine(facade.getEngineKeyArray()[0]);
@@ -126,11 +127,7 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.stopEngine(facade.getEngineKeyArray()[0]);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.stopEngine(facade.getEngineKeyArray()[0]);
 
         try {
             facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
@@ -139,11 +136,7 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.startPerioidicEvents(facade.getEngineKeyArray()[0], 1000);
 
         try {
             facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
@@ -152,11 +145,7 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.stopPerioidicEvents(facade.getEngineKeyArray()[0]);
 
         try {
             facade.getEngineStatus(facade.getEngineKeyArray()[0]);
@@ -165,11 +154,7 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.getEngineStatus(facade.getEngineKeyArray()[0]);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.getEngineStatus(facade.getEngineKeyArray()[0]);
 
         try {
             facade.getEngineInfo(facade.getEngineKeyArray()[0]);
@@ -178,19 +163,15 @@ public class EngineServiceFacadeTest {
             assertEquals("failed response Operation failed received from serverlocalhost:51273", ade.getMessage());
         }
 
-        try {
-            facade.getEngineInfo(facade.getEngineKeyArray()[0]);
-        } catch (final Exception ade) {
-            fail("test should not throw an exception here");
-        }
+        facade.getEngineInfo(facade.getEngineKeyArray()[0]);
 
         try {
             facade.getEngineStatus(new AxArtifactKey("ReturnBadMessage", "0.0.1"));
             fail("test should throw an exception here");
         } catch (final Exception ade) {
             assertEquals("response received from server is of incorrect type "
-                            + "org.onap.policy.apex.core.protocols.engdep.messages.GetEngineStatus, should be of type "
-                            + "org.onap.policy.apex.core.protocols.engdep.messages.Response", ade.getMessage());
+                + "org.onap.policy.apex.core.protocols.engdep.messages.GetEngineStatus, should be of type "
+                + "org.onap.policy.apex.core.protocols.engdep.messages.Response", ade.getMessage());
         }
 
         try {
@@ -198,7 +179,7 @@ public class EngineServiceFacadeTest {
             fail("test should throw an exception here");
         } catch (final Exception ade) {
             assertEquals("response received is not correct response to sent message GET_ENGINE_STATUS",
-                            ade.getMessage());
+                ade.getMessage());
         }
 
         try {
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
index 22344cfc4..3444eb7fd 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/PeriodicEventManagerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,7 @@ public class PeriodicEventManagerTest {
     @Test
     public void testPeroidicEventManagerBad() {
         try {
-            final String[] eventArgs =
-                { "-h" };
+            final String[] eventArgs = { "-h" };
 
             PeriodicEventManager.main(eventArgs);
             fail("test should throw an exception");
@@ -51,8 +50,7 @@ public class PeriodicEventManagerTest {
     @Test
     public void testPeroidicEventManagerOk() {
         try {
-            final String[] eventArgs =
-                { "Host", "43443", "start", "1000" };
+            final String[] eventArgs = { "Host", "43443", "start", "1000" };
 
             PeriodicEventManager.main(eventArgs);
             fail("test should throw an exception");
@@ -63,30 +61,27 @@ public class PeriodicEventManagerTest {
 
     @Test
     public void testPeroidicEventManagerNoOptions() {
-        final String[] eventArgs = new String[]
-            {};
+        final String[] eventArgs = new String[] {};
 
         final String outputString = testPeriodicEventManagerConstructor(eventArgs);
 
-        assertTrue(outputString.contains(
-                        "usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
+        assertTrue(outputString
+            .contains("usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
     }
 
     @Test
     public void testPeroidicEventManagerBadOptions() {
-        final String[] eventArgs =
-            { "-zabbu" };
+        final String[] eventArgs = { "-zabbu" };
 
         final String outputString = testPeriodicEventManagerConstructor(eventArgs);
 
-        assertTrue(outputString.contains(
-                        "usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
+        assertTrue(outputString
+            .contains("usage: PeriodicEventManager <server address> <port address> <start/stop> <periods in ms>"));
     }
 
     @Test
     public void testPeroidicEventManagerNonNumeric3() {
-        final String[] eventArgs =
-            { "aaa", "bbb", "ccc", "ddd" };
+        final String[] eventArgs = { "aaa", "bbb", "ccc", "ddd" };
 
         final String outputString = testPeriodicEventManagerConstructor(eventArgs);
 
@@ -95,8 +90,7 @@ public class PeriodicEventManagerTest {
 
     @Test
     public void testPeroidicEventManagerNonNumeric2() {
-        final String[] eventArgs =
-            { "aaa", "12345", "start", "stop" };
+        final String[] eventArgs = { "aaa", "12345", "start", "stop" };
 
         final String outputString = testPeriodicEventManagerConstructor(eventArgs);
 
@@ -105,8 +99,7 @@ public class PeriodicEventManagerTest {
 
     @Test
     public void testPeroidicEventManagerNotStartStop() {
-        final String[] eventArgs =
-            { "aaa", "12345", "1000", "1000" };
+        final String[] eventArgs = { "aaa", "12345", "1000", "1000" };
 
         final String outputString = testPeriodicEventManagerConstructor(eventArgs);
 
@@ -115,25 +108,28 @@ public class PeriodicEventManagerTest {
 
     @Test
     public void testPeroidicEventManagerStart() {
-        final String[] eventArgs =
-            { "localhost", "12345", "start", "1000" };
+        final String[] eventArgs = { "localhost", "12345", "start", "1000" };
 
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         PeriodicEventManager peManager = null;
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
         try {
             peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
-            peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
+            peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
         } catch (ApexDeploymentException ade) {
             fail("test should not throw an exception");
         }
 
+        dummyDeploymentClient.setInitSuccessful(false);
         try {
             peManager.init();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
-            assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+            assertEquals("periodic event setting failed on parameters localhost 12345 true", ade.getMessage());
         }
 
+        dummyDeploymentClient.setInitSuccessful(true);
         try {
             peManager.init();
         } catch (ApexDeploymentException ade) {
@@ -143,6 +139,7 @@ public class PeriodicEventManagerTest {
 
         try {
             peManager.runCommand();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
             assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
         }
@@ -157,63 +154,51 @@ public class PeriodicEventManagerTest {
     }
 
     @Test
-    public void testPeroidicEventManagerStop() {
-        final String[] eventArgs =
-            { "localhost", "12345", "stop", "1000" };
+    public void testPeroidicEventManagerStop() throws ApexDeploymentException {
+        final String[] eventArgs = { "localhost", "12345", "stop", "1000" };
 
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         PeriodicEventManager peManager = null;
-        try {
-            peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
-            peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
-        } catch (ApexDeploymentException ade) {
-            fail("test should not throw an exception");
-        }
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+        peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+        peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
 
+        dummyDeploymentClient.setInitSuccessful(false);
         try {
             peManager.init();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
-            assertEquals("model deployment failed on parameters localhost 12345 true", ade.getMessage());
+            assertEquals("periodic event setting failed on parameters localhost 12345 false", ade.getMessage());
         }
 
-        try {
-            peManager.init();
-        } catch (ApexDeploymentException ade) {
-            ade.printStackTrace();
-            fail("test should not throw an exception");
-        }
+        dummyDeploymentClient.setInitSuccessful(true);
+        peManager.init();
 
         try {
             peManager.runCommand();
+            fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
             assertEquals("failed response Operation failed received from serverlocalhost:12345", ade.getMessage());
         }
 
-        try {
-            peManager.runCommand();
-        } catch (ApexDeploymentException ade) {
-            fail("test should not throw an exception");
-        }
+        peManager.runCommand();
 
         peManager.close();
     }
 
     @Test
-    public void testPeroidicEventManagerStartUninitialized() {
-        final String[] eventArgs =
-            { "localhost", "12345", "start", "1000" };
+    public void testPeroidicEventManagerStartUninitialized() throws ApexDeploymentException {
+        final String[] eventArgs = { "localhost", "12345", "start", "1000" };
 
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         PeriodicEventManager peManager = null;
-        try {
-            peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
-            peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
-        } catch (ApexDeploymentException ade) {
-            fail("test should not throw an exception");
-        }
+        final DummyDeploymentClient dummyDeploymentClient = new DummyDeploymentClient("aHost", 54553);
+        peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+        peManager.getEngineServiceFacade().setDeploymentClient(dummyDeploymentClient);
 
+        dummyDeploymentClient.setInitSuccessful(false);
         try {
             peManager.runCommand();
             fail("test should throw an exception");
@@ -221,31 +206,26 @@ public class PeriodicEventManagerTest {
             assertEquals("connection to apex is not initialized", ade.getMessage());
         }
 
+        dummyDeploymentClient.setInitSuccessful(true);
         try {
             peManager.runCommand();
             fail("test should throw an exception");
         } catch (ApexDeploymentException ade) {
             assertEquals("connection to apex is not initialized", ade.getMessage());
-            ade.printStackTrace();
         }
 
         peManager.close();
     }
 
     @Test
-    public void testPeroidicEventManagerStopUninitialized() {
-        final String[] eventArgs =
-            { "localhost", "12345", "stop", "1000" };
+    public void testPeroidicEventManagerStopUninitialized() throws ApexDeploymentException {
+        final String[] eventArgs = { "localhost", "12345", "stop", "1000" };
 
         final ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
 
         PeriodicEventManager peManager = null;
-        try {
-            peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
-            peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
-        } catch (ApexDeploymentException ade) {
-            fail("test should not throw an exception");
-        }
+        peManager = new PeriodicEventManager(eventArgs, new PrintStream(baosOut, true));
+        peManager.getEngineServiceFacade().setDeploymentClient(new DummyDeploymentClient("aHost", 54553));
 
         try {
             peManager.runCommand();
@@ -282,6 +262,6 @@ public class PeriodicEventManagerTest {
         String errString = baosErr.toString();
 
         return "*** StdOut ***\n" + outString + "\n*** StdErr ***\n" + errString + "\n*** exception ***\n"
-                        + exceptionString;
+            + exceptionString;
     }
 }