Refactored Asynchronous tests to integration

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>

6 files changed, 0 insertions, 414 deletions

diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json
deleted file mode 100644
index 05ef17358..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMIMO.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json
deleted file mode 100644
index 38c949afb..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncMISO.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json
deleted file mode 100644
index 71cc26177..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSIMO.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json
deleted file mode 100644
index f12baadbe..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventAsyncSISO.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            }
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json
deleted file mode 100644
index 8f53a3c1f..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncMIMO.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventInputParameters": {
-        "aConsumer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer0",
-            "synchronousTimeout": 1000
-        },
-        "aConsumer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer1",
-            "synchronousTimeout": 1000
-        },
-        "aConsumer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aProducer2",
-            "synchronousTimeout": 1000
-        }
-    },
-    "eventOutputParameters": {
-        "aProducer0": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti0.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer0",
-            "synchronousTimeout": 1000
-        },
-        "aProducer1": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti1.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer1",
-            "synchronousTimeout": 1000
-        },
-        "aProducer2": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutMulti2.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "aConsumer2",
-            "synchronousTimeout": 1000
-        }
-    }
-}
diff --git a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json b/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json
deleted file mode 100644
index a7df66796..000000000
--- a/testsuites/performance/performance-benchmark-test/src/test/resources/parameters/File2FileJsonEventSyncSISO.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 4,
-        "deploymentPort": 12545,
-        "policyModelFileName": "src/test/resources/policymodels/SamplePolicyModelMVEL.json",
-        "engineParameters": {
-            "executorParameters": {
-                "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
-                }
-            }
-        }
-    },
-    "eventOutputParameters": {
-        "SyncProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsOutSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "SyncConsumer",
-            "synchronousTimeout": 1000
-        }
-    },
-    "eventInputParameters": {
-        "SyncConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "FILE",
-                "parameters": {
-                    "fileName": "src/test/resources/events/EventsInSingle.json"
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON"
-            },
-            "synchronousMode": true,
-            "synchronousPeer": "SyncProducer",
-            "synchronousTimeout": 1000
-        }
-    }
-}