From 1b801bab1e07f5ca67aa41e5c5e684406a8e3a63 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 6 Mar 2019 11:03:57 -0500 Subject: Refactor REST server tests Refactored the REST server tests so that each controller has its own test class. Also ensure things are shutdown by various tests. Added comments. Removed unneeded constant. Updated license. Modified code that restarts the REST server during tests. Modified code to just change the activator's "alive" state to false, leaving the REST server running. Fixed comment. Allocated server port. Removed file that should not have been included. Changed code to throw exceptions if activator methods are called while in the wrong state. Change-Id: I04a3a6654150797c23b3c86a6a39ecf8bb7f5a78 Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn --- main/src/test/resources/parameters/PapConfigParameters.json | 3 ++- .../test/resources/parameters/PapConfigParameters_Https.json | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 main/src/test/resources/parameters/PapConfigParameters_Https.json (limited to 'main/src/test/resources/parameters') diff --git a/main/src/test/resources/parameters/PapConfigParameters.json b/main/src/test/resources/parameters/PapConfigParameters.json index 7e415591..08d4f4a5 100644 --- a/main/src/test/resources/parameters/PapConfigParameters.json +++ b/main/src/test/resources/parameters/PapConfigParameters.json @@ -4,6 +4,7 @@ "host":"0.0.0.0", "port":6969, "userName":"healthcheck", - "password":"zb!XztG34" + "password":"zb!XztG34", + "https":true } } diff --git a/main/src/test/resources/parameters/PapConfigParameters_Https.json b/main/src/test/resources/parameters/PapConfigParameters_Https.json deleted file mode 100644 index 08d4f4a5..00000000 --- a/main/src/test/resources/parameters/PapConfigParameters_Https.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name":"PapGroup", - "restServerParameters":{ - "host":"0.0.0.0", - "port":6969, - "userName":"healthcheck", - "password":"zb!XztG34", - "https":true - } -} -- cgit 1.2.3-korg