Retool rules tests 99/103399/6
authorJim Hahn <jrh3@att.com>
Mon, 9 Mar 2020 19:15:05 +0000 (15:15 -0400)
committerJim Hahn <jrh3@att.com>
Thu, 12 Mar 2020 16:12:48 +0000 (12:12 -0400)
commitaa8225b5211485b3c1150c21e51fd3e93b7f31d3
tree922b78d2c8a4c657d4c32604a0b73df40d2fb330
parent0e658768fc0573bf6acf7f849a49c9da98c8e47f
Retool rules tests

Extracted common code from various XxxBaseTest classes into:
- Topics class to manage messages for test topics
- HttpClients class to manage HttpClient objects for tests
- Simulators class to manage simulators for tests
- Rules class to manage start up and shutdown of rules

Merged remaining code from XxxBaseTest classes into a single
class.  Modified the Frankfurt and Usescases tests to subclass
from this new class and specify just the relevant tests to be
executed.

Issue-ID: POLICY-2385
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Iaf83c9d2b205a4c343e0dde23ec86508f5773693
76 files changed:
controlloop/common/controller-frankfurt/pom.xml
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtBase.java [deleted file]
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtTest.java [new file with mode: 0644]
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VcpeTest.java [deleted file]
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VdnsTest.java [deleted file]
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VfwTest.java [deleted file]
controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VlbTest.java [deleted file]
controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties
controlloop/common/controller-frankfurt/src/test/resources/vcpe/tosca-legacy-vcpe.json [deleted file]
controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json [deleted file]
controlloop/common/controller-frankfurt/src/test/resources/vlb/tosca-compliant-vlb.json [deleted file]
controlloop/common/controller-usecases/pom.xml
controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java [deleted file]
controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java [new file with mode: 0644]
controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java [deleted file]
controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java [deleted file]
controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java [deleted file]
controlloop/common/controller-usecases/src/test/resources/config/usecases-controller.properties
controlloop/common/controller-usecases/src/test/resources/vfw/tosca-vfw.json [deleted file]
controlloop/common/controller-usecases/src/test/resources/vfw/vfw.appc.success.json [deleted file]
controlloop/common/controller-usecases/src/test/resources/vlb/tosca-vlb.json [deleted file]
controlloop/common/controller-usecases/src/test/resources/vlb/vlb.onset.json [deleted file]
controlloop/common/pom.xml
controlloop/common/rules-test/pom.xml [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/BaseRuleTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/HttpClients.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Listener.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/NamedRunner.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/SimulatorException.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Simulators.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/TestNames.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/TopicException.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Topics.java [new file with mode: 0644]
controlloop/common/rules-test/src/main/resources/duplicates/duplicates.appc.success.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.appc.success.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.1.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json with 62% similarity]
controlloop/common/rules-test/src/main/resources/duplicates/duplicates.onset.2.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/vcpe.onset.1.json with 83% similarity]
controlloop/common/rules-test/src/main/resources/duplicates/tosca-compliant-duplicates.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vfw/tosca-compliant-vfw.json with 50% similarity]
controlloop/common/rules-test/src/main/resources/service123/service123.appc.migrate.success.json [new file with mode: 0644]
controlloop/common/rules-test/src/main/resources/service123/service123.appc.rebuild.failure.json [new file with mode: 0644]
controlloop/common/rules-test/src/main/resources/service123/service123.appc.restart.failure.json [new file with mode: 0644]
controlloop/common/rules-test/src/main/resources/service123/service123.onset.json [moved from controlloop/common/controller-usecases/src/test/resources/vfw/vfw.onset.json with 64% similarity]
controlloop/common/rules-test/src/main/resources/service123/tosca-compliant-service123.json [new file with mode: 0644]
controlloop/common/rules-test/src/main/resources/vcpe/tosca-compliant-vcpe.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vcpe/tosca-compliant-vcpe.json with 95% similarity]
controlloop/common/rules-test/src/main/resources/vcpe/tosca-legacy-vcpe.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/tosca-legacy-vcpe.json with 99% similarity]
controlloop/common/rules-test/src/main/resources/vcpe/vcpe.appc.success.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/vcpe.appc.success.json with 92% similarity]
controlloop/common/rules-test/src/main/resources/vcpe/vcpe.onset.1.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.1.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/vcpe/vcpe.onset.2.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/vcpe.onset.2.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/vcpe/vcpe.onset.3.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/vcpe.onset.3.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/vdns/tosca-compliant-vdns.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json with 97% similarity]
controlloop/common/rules-test/src/main/resources/vdns/vdns.onset.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/vfw/tosca-compliant-vfw.json [moved from controlloop/common/controller-usecases/src/test/resources/vfw/tosca-compliant-vfw.json with 96% similarity]
controlloop/common/rules-test/src/main/resources/vfw/tosca-vfw.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vfw/tosca-vfw.json with 99% similarity]
controlloop/common/rules-test/src/main/resources/vfw/vfw.appc.success.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vfw/vfw.appc.success.json with 99% similarity]
controlloop/common/rules-test/src/main/resources/vfw/vfw.onset.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vfw/vfw.onset.json with 100% similarity]
controlloop/common/rules-test/src/main/resources/vlb/tosca-compliant-vlb.json [moved from controlloop/common/controller-usecases/src/test/resources/vlb/tosca-compliant-vlb.json with 97% similarity]
controlloop/common/rules-test/src/main/resources/vlb/tosca-vlb.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vlb/tosca-vlb.json with 99% similarity]
controlloop/common/rules-test/src/main/resources/vlb/vlb.onset.json [moved from controlloop/common/controller-frankfurt/src/test/resources/vlb/vlb.onset.json with 99% similarity]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/BaseRuleTestTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/ExceptionsTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/HttpClientsTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/ListenerTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/NamedRunnerTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/NamedRunnerTest2.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/RulesTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/SimulatorsTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/java/org/onap/policy/controlloop/common/rules/test/TopicsTest.java [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/META-INF/kmodule.xml [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/config/rulesTest-controller.properties [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/my-http-client.properties [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/rulesTest.drl [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/rulesTest.pom [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/topics.json [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/topicsReplaced.json [new file with mode: 0644]
controlloop/common/rules-test/src/test/resources/tosca-policy.json [moved from controlloop/common/controller-usecases/src/test/resources/vcpe/tosca-compliant-vcpe.json with 95% similarity]
controlloop/common/rules-test/src/test/resources/tosca-template.json [new file with mode: 0644]