Merge "Modify AAI simulator to support new requests"

5 files changed, 7 insertions, 7 deletions

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
index d1fa4fc10..64ad490b2 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
@@ -60,7 +60,7 @@ public class ControlLoopXacmlGuardTest {
     public static void setUpSimulator() {
         try {
             Util.buildAaiSim();
-        } catch (InterruptedException e) {
+        } catch (Exception e) {
             fail(e.getMessage());
         }
     }
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
index 16ad7a8b0..08f73f4bc 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/TestSO.java
@@ -71,7 +71,7 @@ public class TestSO {
 		try {
 			Util.buildAaiSim();
 			Util.buildSoSim();
-		} catch (InterruptedException e) {
+		} catch (Exception e) {
 			fail(e.getMessage());
 		}
 	}
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
index 5a96e1667..715b8f795 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/Util.java
@@ -113,15 +113,15 @@ public final class Util {
 		return null;
 	}
 	
-	public static HttpServletServer buildAaiSim() throws InterruptedException {
+	public static HttpServletServer buildAaiSim() throws InterruptedException, IOException {
 		return org.onap.policy.simulators.Util.buildAaiSim();
 	}
 	
-	public static HttpServletServer buildSoSim() throws InterruptedException {
+	public static HttpServletServer buildSoSim() throws InterruptedException, IOException {
 		return org.onap.policy.simulators.Util.buildSoSim();
 	}
 	
-	public static HttpServletServer buildVfcSim() throws InterruptedException {
+	public static HttpServletServer buildVfcSim() throws InterruptedException, IOException {
 		return org.onap.policy.simulators.Util.buildVfcSim();
 	}
 	
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
index e107e2e7c..9608f7cf0 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
@@ -63,7 +63,7 @@ public class VDNSControlLoopTest {
 		try {
 			Util.buildAaiSim();
 			Util.buildSoSim();
-		} catch (InterruptedException e) {
+		} catch (Exception e) {
 			fail(e.getMessage());
 		}
 	}
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
index 49cbf5227..a19d9267c 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
@@ -60,7 +60,7 @@ public class VFWControlLoopTest {
     public static void setUpSimulator() {
         try {
             Util.buildAaiSim();
-        } catch (InterruptedException e) {
+        } catch (Exception e) {
             fail(e.getMessage());
         }
     }