summaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-uservice-test
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-03-10 20:59:57 +0000
committerliamfallon <liam.fallon@est.tech>2022-03-10 22:21:24 +0000
commit224d4e486871c9d16f1dd3289361684b76efb064 (patch)
tree5b68140840aa7fb29fd8c7cef48a3bbe0b260a8a /testsuites/integration/integration-uservice-test
parenteecbf269d528484d71d7532561b6f7b46ee6a2be (diff)
Remove bad dependency in apex POM
XML event protocol was removed as jax-rs dependencies were removed in Jakarta. Issue-ID: POLICY-3982 Change-Id: I5e8881ae8062fd46b46a1ec655e1210b8ccf2fbf Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'testsuites/integration/integration-uservice-test')
-rw-r--r--testsuites/integration/integration-uservice-test/pom.xml6
-rw-r--r--testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java9
-rw-r--r--testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java14
-rw-r--r--testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafkaXmlEventProducer.java69
4 files changed, 1 insertions, 97 deletions
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index c627c9d6c..863957d1f 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -110,12 +110,6 @@
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
- <artifactId>plugins-event-protocol-xml</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
<artifactId>plugins-event-protocol-jms</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
index 941c60849..57e3053a8 100644
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2022 Nordix Foundation.
* Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,13 +50,6 @@ public class TestFile2File {
testFileEvents(args, "target/examples/events/SampleDomain/EventsOut.json", 44400);
}
- @Test
- public void testXmlFileEvents() throws MessagingException, ApexException, IOException {
- final String[] args = {"-rfr", "target", "-p", "target/examples/config/SampleDomain/File2FileXmlEvent.json"};
-
- testFileEvents(args, "target/examples/events/SampleDomain/EventsOut.xmlfile", 100000);
- }
-
private void testFileEvents(final String[] args, final String outFilePath, final long expectedFileSize)
throws MessagingException, ApexException, IOException {
final ApexMain apexMain = new ApexMain(args);
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java
index 03db1798f..50e6afb58 100644
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafka2Kafka.java
@@ -74,20 +74,6 @@ public class TestKafka2Kafka {
}
/**
- * Test XML kafka events.
- *
- * @throws Exception the apex exception
- */
- @Test
- public void testXmlKafkaEvents() throws Exception {
- final String conditionedConfigFile = getConditionedConfigFile(
- "target" + File.separator + "examples/config/SampleDomain/Kafka2KafkaXmlEvent.json");
- final String[] args = {"-rfr", "target", "-p", conditionedConfigFile};
-
- testKafkaEvents(args, true, "xml");
- }
-
- /**
* Test kafka events.
*
* @param args the args
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafkaXmlEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafkaXmlEventProducer.java
deleted file mode 100644
index 89e93c3cb..000000000
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/TestKafkaXmlEventProducer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.testsuites.integration.uservice.adapt.kafka;
-
-import java.util.Properties;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEvent;
-import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEventData;
-
-/**
- * The Class TestKafkaXmlEventProducer.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class TestKafkaXmlEventProducer {
-
- /**
- * The main method.
- *
- * @param args the arguments
- */
- public static void main(final String[] args) {
- final Properties props = new Properties();
- props.put("bootstrap.servers", "localhost:49092");
- props.put("acks", "all");
- props.put("retries", 0);
- props.put("batch.size", 16384);
- props.put("linger.ms", 1);
- props.put("buffer.memory", 33554432);
- props.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
- props.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-
- final XMLApexEvent xmlEvent = new XMLApexEvent();
- xmlEvent.setName("XMLEvent-1");
- xmlEvent.setVersion("0.0.1");
- xmlEvent.getData().add(new XMLApexEventData("Data-1", "Data Value -1"));
-
- final Producer<String, String> producer = new KafkaProducer<String, String>(props);
- for (int i = 0; i < 100; i++) {
- xmlEvent.setName("XMLEvent" + Integer.toString(i));
- xmlEvent.setVersion("0.0.1");
- xmlEvent.getData()
- .add(new XMLApexEventData("Data" + Integer.toString(i), "Data Value " + Integer.toString(i)));
-
- producer.send(new ProducerRecord<String, String>("apex-in-0", xmlEvent.getName(), xmlEvent.toString()));
- }
- producer.close();
- }
-}