aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-uservice-test/src
AgeCommit message (Collapse)AuthorFilesLines
2020-09-04Remove client code from apex-pdpliamfallon2-489/+0
Removal of the deployment and monitoring client from the apex-pdp as the functionality is replaced by the Policy Framework deployment using PAP and the Policy Framework monitoring GUI. Code in the engine proper that was used to administer apex-pdp over the Web Socket port is also removed, as this code was only used by the apex-pdp legacy GUIs. Issue-ID: POLICY-2621 Change-Id: Ib9fc4a667a4bc79377bb7b82fae6a2bd520a3e3d Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-07-21Fix assertTrue in apex-pdp/model apex-pdp/plugins, apex-pdp/services and ↵JvD_Ericsson2-6/+6
apex-pdp/testsuites Replace assertTrue with assertEquals and assertFalse with assertNotEquals in apex-pdp/model, apex-pdp/plugins, apex-pdp/services and apex-pdp/testsuites Issue-ID: POLICY-2690 Change-Id: If088371cf012d5648e04ade2aa4d49b38945f6d2 Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
2020-07-17Replace try/catch with assertj - apex-pdpwaynedunican1-30/+12
Replaced try/catch blocks in apex-pdp with assertj assertions. Part II of changes Issue-ID: POLICY-2451 Change-Id: I29823054fbeb6d1a287d1234859aaf2d4609ef6d Signed-off-by: waynedunican <wayne.dunican@est.tech>
2020-07-13Remove old documentation from buildliamfallon3-127/+0
apex-pdp had an in-line docuemntation build system built on asciidoc. It has proven to be very difficult to maintain and keep up to date and it is incompatible with the ONAP official RST/ReadTheDocs docuementation system. In the Dublin release, we converted the asciidoc documentation to RST format, and hae been updating the RST documentation since. The asciidoc docuemntation system is now so out of date that it is being removed. In this change, the "site" directory is removed from all modules in apex-pdp and a profile called "apexSite" is removed from the pom.xml file in all modules. Issue-ID: POLICY-2686 Change-Id: I645f3ed101159d356cd90e619cef791067ad5eb5 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-07-06Fix URL checking on REST pluginsliamfallon1-13/+13
The URL parameter must always be provided on the REST client carrier plugin The URL parameter must always be provided on the REST requestor consumer The URL parameter is not required on the REST requestor producer This patch fixes the implementation to always checks the URL for existence on the REST Client plugin. The current checks on the REST Requestor are correct for the REST requestor plugin consumer and producer classes, so the checks are not required in the REST Requestor parameters. Issue-ID: POLICY-2692 Change-Id: I4e1534202002cf4a03bd159ac97b2a4f5b1746ab Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-06-19Changes for checkstyle 8.32liamfallon35-48/+1
Issue-ID: POLICY-2188 Change-Id: I56bbf3aa3bd9e1ef433cc93ad2be0c54d141a2a5 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-04-03Fix failing Kafka testsliamfallon5-63/+86
All the Kafka components need something near 10 seconds to come up completely. This review tweaks the timing to allow the test Kafka server to come up and to allow the consumers to connect to it. Issue-ID: POLICY-2106 Change-Id: I6dd8ace0848bdc2549e658ef8908b4d85d5ea789 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-04-02Fix hanging timeout on Executor testliamfallon10-74/+116
Issue-ID: POLICY-2106 Change-Id: I7bd44f8dfe349d73a4c8c4f978a30b455c45b2c7 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-09Use Rhino javascript executor in apex-pdpliamfallon20-96/+105
Integation unit tests resultd in StackOverflowException errors in the Graal Javascript interpreter. Following extensive testing and trouobleshooting, it proved very difficult to fix these issues in Graal as the stck overflow errors were occurring in native class instantiation methods being invoked by Grall on the JVM. The alternative Rhino Javascript engine is developed by mozilla, and was incorporated into the Java 6 JVM and evolved into Nashorn in the Java 8 JVM. Oracle dropped Nashorn in Java 11. However, in parallel, Rhino development has continued. This review brings in the Rhino javascript engine into apex-pdp as the replacement for Nashorn and instead of Graal. Graal seems to be pretty unstable as yet so we may bring it in in future releases but for now Rhino is a more stable and reliable alternative. Issue-ID: POLICY-2106 Change-Id: I0edeff3b0bee404b38e3ebe22001a6e3375a44dc Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-03-04Preparing integration tests for Graal Javascriptliamfallon18-110/+99
Graal enforces Javascript more strictly than Nashorn does. This review changes the tests in apex-pdp to comply with the stricter -Javascript checking, re-enabling the integration test module. - All log calls must be passed as strings, using toString() - Byte/Float/Long Java types not supported in Javascript Disable integration tests so that other changes can be brought in. JMS integration test is disabled for now, it will be re-enabled in a review shortly. Issue-ID: POLICY-2106 Change-Id: I14bdb930eff735e862b51802cf72e4793cec3699 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-02-27Merge "Add integration tests for Parameter passing in APEX"Liam Fallon8-0/+682
2020-02-27Add integration tests for Parameter passing in APEXa.sreekumar8-0/+682
Change-Id: I5d01766ffb0104f632bebc9b553e7dca83b4829f Issue-ID: POLICY-2364 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2020-02-26Fix Java 11/Checkstyle/Sonar warningsliamfallon3-50/+52
A number of Java 11, checkstyle, and SONAR warnings have crept into the Apex codebase over the last number of reviews. This change fixes those issues. Issue-ID: POLICY-1913 Change-Id: I2afd607e80f48323355380fb2fe5e048e18879f9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-01-23Remove apex-pdp TextFileUtils classliamfallon7-100/+96
This class was moved to policy-common some time ago. Removing it in apex-pdp. Issue-ID: POLICY-1913 Change-Id: I982fbd799334b34f1526e19f339236b52205b91e Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-12-04Minor changes for new Eclipse checkstyle checksliamfallon3-17/+42
The laest Eclipse checkstyle version 8.26.0 does more thorough checking and identified a number of small issues in the apex-pdp codebase. This review fixes those issues. Issue-ID: POLICY-1913 Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-28Replace getCaononicalName() with getName() in code baseliamfallon9-51/+57
Issue-ID: POLICY-1861 Change-Id: Iccbdcbc5b5978305c56ab74c01a52a562697bee1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-26Reduce verbosity of logging during unit testliamfallon10-137/+162
Logging dialled back in logback.xml files and on ligging statements in unit test java code. Issue-ID: POLICY-2272 Change-Id: I3b9a46d8993b1571c8dc62687a9c136af46c1f51 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-14Retaining context in APEX Engine based on policies received in PdpUpdatea.sreekumar1-2/+1
Change-Id: I73fad5bf76ed6b4979f5ab76013f204ea82da30b Issue-ID: POLICY-2215 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-11-01Add common Jersey versionliamfallon3-4/+5
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I6282bc9938cbb63ddf3bf85e488f7b6be0dbdfc3 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-11-01Resolve mapping between TOSCA policies and APEX policy modelsa.sreekumar3-36/+33
Change-Id: Ifaedc5074bcc51a5d495e342feae89b6a2aac1cf Issue-ID: POLICY-1626 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-10-16replace grizzly server with policy common endpointHenry.Sun3-61/+89
Issue-ID: POLICY-1915 Change-Id: I8702a8b54e158dfd0ac08140ca083f14f23963a2 Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
2019-09-03Enable https support in ApexRestServera.sreekumar1-23/+60
Enable https support in ApexRestServer by using the RestServer from policy-common Change-Id: I3dc8d88a499dfa9f0a82585a083526e236420c6e Issue-ID: POLICY-2016 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-08-27add unit test for tools-commonshaoqiu1-1/+1
Issue-ID: POLICY-1992 Change-Id: I6935b24b11ce62a18ae3d45795ff53cb4fa60f8b Signed-off-by: shaoqiu <tim.huang@est.tech>
2019-08-21Fix checkstyle warnings in apex-pdpliamfallon5-14/+17
Unit tests introduced some checkstyle warnings, this review resolves those warnings. Issue-ID: POLICY-1942 Change-Id: I16438621c1db0adfbe70bc8b237d05bd7cc72697 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-07-30integration test for execution property rest APIning.xi10-7/+736
Issue-ID: POLICY-1936 Change-Id: Ifc720cd320f5eced2f3c039b2ce6442387de240b Signed-off-by: ning.xi <ning.xi@est.tech>
2019-07-10Add integration tests for executor propertiesliamfallon31-0/+1210
Added integration test that sets properties in a dummy plugin and amends them in tasks in a policy. Variosu tests added to check combinations of where properties are set in plugins or in tasks or both. Implementaiton changed to: - Always pass in a Properies object, the properties object coming into the policy cannot be null because the task/TSL/SFL may wish to set it - Fix a bug where the properties were not passed from the ApexEvent to the engine event in the ApexEventUnmarshaller class Issue-ID: POLICY-1743 Change-Id: I6aa152b28d46cf3cc6fa56a1a95b76a8e55f5a49 Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-06-28Replace non-Javadoc comments with inheritDocsliamfallon13-127/+86
Copyright headers not changed as this review only amends comments. Issue-ID: POLICY-1791 Change-Id: Icbeb2c6e591b3b160ae102bb67aef2d407924a4d Signed-off-by: liamfallon <liam.fallon@est.tech>
2018-12-15Fix sonar test renaming issuesliamfallon2-36/+31
Renaming tests introduced Sonar issues: - Tests where coverage was <80% flagged as they are new code - Support test classes with names ending in "Test" flagged becasue they did not contain test cases Issue-ID: POLICY-1263 Change-Id: I17a4b27b2952a4978fab1c76579a013478b60ae1 Signed-off-by: liamfallon <liam.fallon@est.tech>
2018-12-11Remove unused parameter from test dataliamfallon1-24/+41
The "restRequestTimeout" parameter is not used in the current version of Apex, it was replaced by the "requestorTimeout" paramter. However, the parameter remained in the JSON data files. Also updated to improve output of messages during unit test. This review also sets the Jersey injection dependendy scope to "test" Issue-ID: POLICY-1074 Change-Id: I75f495f571c8101310bd1eaec01a305318346cd9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2018-11-16Fix timing and move testsliamfallon4-6/+963
The timings on the REST test are too short and time out on ONAP Jenkins The tests of the Apex service and Apex model upgrade are not benchmark tests so are moved to Integration. Issue-ID: POLICY-1251 Change-Id: I2672d01042b33fe0cce5223005295e3b1aa26e7a Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-11-15Refactored Asynchronous tests to integrationliamfallon7-0/+419
Moved the tests of asynchronous and synchronous inputs and outputs for Apex from benchmark tests to integration tests which is where they should be. Also the tests were amended to use the common integration test data. Change-Id: Id2d098b0a7d70c50dbb4547b0386cc7bcf6245a9 Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-11-07Refactor unit test dataliamfallon63-29126/+417
There were many copies of test policies and examples strewn through the Apex unit tests. This change cleans up the unit tests so that a single version of all example policies is used in all tests. Also added a new relative file root command line parameter to Apex to allow the root of relative paths in configuration files to be set. Apologies for the size of this review but unfortunately all of this must be done in one shot. Issue-ID: POLICY-1252 Change-Id: Ibbb18fbf18e3897a1c61301d0a65e62bc643a0e9 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-10-01Add JUnit for test conceptsliamfallon1-2/+1
JUnit test for test concepts. Issue-ID: POLICY-1034 Change-Id: Ia2cd896272d4278d842d19d21237edcdca54a1f8 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-28Add unit test for core distributionliamfallon1-8/+2
JUnit for the batch deployer and deploy facade. Issue-ID: POLICY-1034 Change-Id: I3959578ba8666d64b48bbe4ee9aeab27b92d77ae Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-18remove license issuesliamfallon1-1/+1
Change the versions of some second order dependencies to mitigate license issues. Change-Id: I39745ec1eb7c72fb481a4adafc2805e4bbbd8386 Issue-ID: POLICY-1059 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-17Merge "Re-implement Kafka tests that periodically fail"Jorge Hernandez5-198/+92
2018-09-16Fix Sonar issues in apexliamfallon1-5/+5
Fixing various Sonar issues in apex. Issue-ID: POLICY-1034 Change-Id: Ie693637d75bd7e38c71b7ba04886fb75636276ed Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-15Re-implement Kafka tests that periodically failliamfallon5-198/+92
The Kafla integration tests fail, this change re-implements the tests using a test framework from salesforce.com i Issue-ID: POLICY-1034 Change-Id: Iffcc9e0a9f419c8ec439771be7a7a58faa2f9860 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-13Address sonar/Checkstyle Issuesliamfallon33-202/+953
Sweep through Apex codebase to fix most ceheckstyle and straightforward sonar issues. Issue-ID: POLICY-1034 Change-Id: I149d9a94ad893affc93573e8de5e3304b6bdde2d Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-13Sonar/Checkstyle in service/pluginsliamfallon45-112/+249
Sonar and Checkstyle changes in plugins and services, and knock on changes Issue-ID: POLICY-1034 Change-Id: Iff7df74e54fce2c661dcc2fae75ae93d4cacfe5b Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Sonar/Checkstyle in model/context/coreliamfallon4-20/+20
Checkstyle and sonar changes in the model, contexot and core modules. Issue-ID: POLICY-1034 Change-Id: I2d40bc877f3a548844470fc290fc89d63fa465ae Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Merge "Fix soft stop and start of engine"Pamela Dragosh1-5/+0
2018-09-12Fix soft stop and start of engineliamfallon1-5/+0
Stopping an apexc engine is a soft stop, allowing the engine to be restarted again. However, when a model upgrade is carried out the engine must be stopped and cleared to clear the previous model, loaded with the new model and started again. THis handling must work over the Web Socket admin interface and also when apex is started as a service. This change fixes the handling so that it is consistent and works the same when apex is stopped/started/upgraded from the command line or over the management web socket interface Issue-ID: POLICY-1101 Change-Id: I1fe619641cb6ecd34d0669b4b7df105280e5e2c0 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-09-12Fix build failsliamfallon1-1/+1
Apex end to end tests often fail because the tests are not tuned correctly for Jenkins. The JRuby test needs a delay to allow the first test to completely clear dowm The volume of events sent in the Kafka tests is reduced from 100 to 10 The dom4j version is also changed back to 1.6.1 because 1.6 has the same security issues. Issue-ID: POLICY-954 Change-Id: Id38bf9fe526942870181bfd9c0762f0a471c0c02 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-08-31Use parameter service in apexliamfallon7-44/+86
Switch parameter handling in apex to use the ONAP PF common parameter service Change-Id: Id318d19c726b18b1a69c630fa81ca7d695355e9c Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-08-23Add docs for Testsuites packageDinh Danh Le3-0/+127
Change-Id: I807ec0fe35775226b611567904a9ac4627b33775 Signed-off-by: Dinh Danh Le <dinh.danh.le@ericsson.com> Issue-ID: POLICY-867
2018-08-03Use common components in apexliamfallon2-8/+8
Common ResourceUtil class replaces specific one in APEX Managed dependency version clashes removed in POMs Dependency versions with security vulnerabilities changed for zookeeper kafka infinispan Change-Id: I3c4b367cb5556b2dc255ab62c84f85738165eb81 Issue-ID: POLICY-954 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
2018-07-30Add test case for plugin event carrier RESTServerDinh Danh Le1-14/+33
Change-Id: Ia81a35e359c1f7072f4a39db871076d478dd7dab Signed-off-by: Dinh Danh Le <dinh.danh.le@ericsson.com> Issue-ID: POLICY-954
2018-07-09Fixing Multi JVM Tests and sonar bugswaqas.ikram1-3/+9
Change-Id: I02df58695b44d5768410a0eaccb090cda7eb85ba Issue-ID: POLICY-865 Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>
2018-07-04Fix test failure due to wait timeoutliamfallon3-178/+129
THe Avro and Java context integration tests waited for one second for APEX to produce the output event to file before stopping APEX. This timeout is usually fine. However, occasionally in the ONAP Jenkins build jobs, the test ocassionally times out. The tests are amended to wait for the file to exist and have content or for 10 seconds, whichever comes sooner. Also consolidated two test classes into a single class and improved temporary file handling. Issue-ID: POLICY-905 Change-Id: I5e370353d2b627203e270cb6efeb560af7dc2acf Signed-off-by: liamfallon <liam.fallon@ericsson.com>