From: sunil unnava Date: Tue, 23 Oct 2018 16:18:59 +0000 (-0400) Subject: update the package name X-Git-Tag: 1.1.11^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmsgrtr.git;a=commitdiff_plain;h=3504265229c589ecc166e3ad4c33bb198b11e4ce update the package name Issue-ID: DMAAP-858 Change-Id: I49ae6eb9c51a261b64b911e607fcbbca46c5423c Signed-off-by: sunil unnava --- diff --git a/src/main/java/com/att/dmf/mr/CambriaApiException.java b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java similarity index 96% rename from src/main/java/com/att/dmf/mr/CambriaApiException.java rename to src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java index cdf95ab..59d6115 100644 --- a/src/main/java/com/att/dmf/mr/CambriaApiException.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr; +package org.onap.dmaap.dmf.mr; import org.json.JSONObject; -import com.att.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; import com.att.nsa.apiServer.NsaAppException; public class CambriaApiException extends NsaAppException diff --git a/src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java similarity index 98% rename from src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java rename to src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java index f0c57b5..6858fe4 100644 --- a/src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr; +package org.onap.dmaap.dmf.mr; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/att/dmf/mr/backends/Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/Consumer.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java index f4a9a80..cba3696 100644 --- a/src/main/java/com/att/dmf/mr/backends/Consumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; /** diff --git a/src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java similarity index 97% rename from src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java index 55e0645..a857fc3 100644 --- a/src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import java.util.Collection; import java.util.HashMap; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; /** * This is the factory class to instantiate the consumer diff --git a/src/main/java/com/att/dmf/mr/backends/MetricsSet.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/MetricsSet.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java index de665b8..bc0f4c6 100644 --- a/src/main/java/com/att/dmf/mr/backends/MetricsSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import com.att.nsa.metrics.CdmMetricsRegistry; /** diff --git a/src/main/java/com/att/dmf/mr/backends/Publisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java similarity index 97% rename from src/main/java/com/att/dmf/mr/backends/Publisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java index 25022e2..ac7977b 100644 --- a/src/main/java/com/att/dmf/mr/backends/Publisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import java.io.IOException; import java.util.ArrayList; @@ -27,7 +27,7 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.beans.LogDetails; /** * A publisher interface. Publishers receive messages and post them to a topic. diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java index 9be9073..347f625 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.net.InetAddress; import java.net.UnknownHostException; @@ -39,8 +39,8 @@ import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.KafkaException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java index e066df5..a93ac33 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.ArrayList; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumer.txt b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumer.txt similarity index 100% rename from src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumer.txt rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumer.txt diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java index 83c08ec..a38d77b 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.io.IOException; import java.net.InetAddress; @@ -56,11 +56,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.ComponentScan; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.eelf.configuration.EELFLogger; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java similarity index 99% rename from src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java index f521b41..0bfbcb5 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java similarity index 97% rename from src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java index 1e78b01..2a9e0ab 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.io.IOException; import java.util.ArrayList; @@ -33,9 +33,9 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.json.JSONException; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.Utils; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java similarity index 97% rename from src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java index a13ecea..4aa8a97 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java similarity index 98% rename from src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java index cc3338b..1d31a44 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java similarity index 95% rename from src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java index 237cac8..d5dc33b 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; /** * * @author anowarul.islam diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java similarity index 97% rename from src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java index e0c80bd..fc3ba98 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.HashMap; import java.util.LinkedList; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import com.att.dmf.mr.metabroker.Broker; -import com.att.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.metabroker.Broker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; import com.att.nsa.configs.ConfigDb; import com.att.nsa.security.NsaAcl; import com.att.nsa.security.NsaApiKey; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java similarity index 96% rename from src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java index 25cb2df..809b7ae 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.ArrayList; import java.util.HashMap; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; /** * When broker type is memory, then this class is doing all the topic related diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java similarity index 93% rename from src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java index 2b43ed3..a9c7470 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.io.IOException; import java.util.ArrayList; @@ -27,8 +27,8 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java similarity index 96% rename from src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java rename to src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java index eb77dc2..d88771e 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.io.File; import java.io.FileNotFoundException; @@ -30,7 +30,7 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher; diff --git a/src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java similarity index 98% rename from src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java index 4f0108f..4356aa7 100644 --- a/src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.io.Serializable; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java similarity index 96% rename from src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java index 8cbf64f..7db9f54 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Date; import java.util.HashMap; @@ -29,11 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPContext.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java similarity index 97% rename from src/main/java/com/att/dmf/mr/beans/DMaaPContext.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java index a880877..c4b6412 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPContext.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; /** * DMaaPContext provide and maintain all the configurations , Http request/response diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java similarity index 94% rename from src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java index fb0ace0..0a909ff 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.net.InetAddress; import java.net.UnknownHostException; @@ -34,19 +34,19 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.springframework.beans.factory.annotation.Qualifier; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.kafka.Kafka011Consumer; -import com.att.dmf.mr.backends.kafka.Kafka011ConsumerUtil; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; -import com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; -import com.att.dmf.mr.backends.kafka.LiveLockAvoidance; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.kafka.Kafka011Consumer; +import org.onap.dmaap.dmf.mr.backends.kafka.Kafka011ConsumerUtil; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; +import org.onap.dmaap.dmf.mr.backends.kafka.LiveLockAvoidance; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java similarity index 97% rename from src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java index acf4824..a4ae2be 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Arrays; import java.util.LinkedList; @@ -41,13 +41,13 @@ import org.json.JSONArray; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Broker; -import com.att.dmf.mr.metabroker.Broker1; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Broker; +import org.onap.dmaap.dmf.mr.metabroker.Broker1; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.Utils; //import org.apache.log4-j.Logger; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java similarity index 97% rename from src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java index 4c9532b..0226b9b 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,9 +28,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.att.dmf.mr.CambriaApiVersionInfo; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.mr.apiServer.metrics.cambria.DMaaPMetricsSender; +import org.onap.dmaap.dmf.mr.CambriaApiVersionInfo; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.mr.apiServer.metrics.cambria.DMaaPMetricsSender; import com.att.nsa.drumlin.till.nv.rrNvReadable; import com.att.nsa.metrics.impl.CdmConstant; import com.att.nsa.metrics.impl.CdmCounter; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java similarity index 97% rename from src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java index 963ff2d..8813f24 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java @@ -19,14 +19,14 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.security.Key; import org.springframework.beans.factory.annotation.Autowired; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDb; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java similarity index 95% rename from src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java index 78a7426..7f6a8fe 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import org.I0Itec.zkclient.ZkClient; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.nsa.drumlin.till.nv.rrNvReadable; /** diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java similarity index 95% rename from src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java index 5aa25fa..ff0b136 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.nsa.configs.confimpl.ZkConfigDb; import com.att.nsa.drumlin.till.nv.rrNvReadable; diff --git a/src/main/java/com/att/dmf/mr/beans/LogDetails.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java similarity index 97% rename from src/main/java/com/att/dmf/mr/beans/LogDetails.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java index b7fb325..b10cda6 100644 --- a/src/main/java/com/att/dmf/mr/beans/LogDetails.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java @@ -22,12 +22,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Date; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.Utils; /** * @author muzainulhaque.qazi diff --git a/src/main/java/com/att/dmf/mr/beans/TopicBean.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java similarity index 99% rename from src/main/java/com/att/dmf/mr/beans/TopicBean.java rename to src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java index a397921..127466b 100644 --- a/src/main/java/com/att/dmf/mr/beans/TopicBean.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java @@ -22,7 +22,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.io.Serializable; diff --git a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java b/src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java similarity index 98% rename from src/main/java/com/att/dmf/mr/constants/CambriaConstants.java rename to src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java index cb6653c..fd342b7 100644 --- a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java @@ -19,9 +19,9 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.constants; +package org.onap.dmaap.dmf.mr.constants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.utils.Utils; /** * This is the constant files for all the property or parameters. diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java similarity index 94% rename from src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java index de66617..c70190f 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java @@ -19,9 +19,9 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; public class DMaaPAccessDeniedException extends CambriaApiException{ diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java similarity index 97% rename from src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java index 304c15b..4e03a58 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.inject.Singleton; import javax.ws.rs.core.MediaType; @@ -30,7 +30,7 @@ import javax.ws.rs.ext.Provider; import org.apache.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java similarity index 99% rename from src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java index 409aa60..7b68b42 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.annotation.PostConstruct; diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java similarity index 98% rename from src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java index 593863a..a7b073a 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; /** * Define the Error Response Codes for MR diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java similarity index 99% rename from src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java index db691bd..c768794 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.inject.Singleton; import javax.ws.rs.BadRequestException; diff --git a/src/main/java/com/att/dmf/mr/exception/ErrorResponse.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java similarity index 99% rename from src/main/java/com/att/dmf/mr/exception/ErrorResponse.java rename to src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java index c92cadd..58e81ae 100644 --- a/src/main/java/com/att/dmf/mr/exception/ErrorResponse.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import org.json.JSONObject; /** * Represents the Error Response Object diff --git a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java b/src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java similarity index 98% rename from src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java rename to src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java index 64b20e8..273b906 100644 --- a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.listener; +package org.onap.dmaap.dmf.mr.listener; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java b/src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java similarity index 97% rename from src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java rename to src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java index f61b6ea..5d98f98 100644 --- a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.listener; +package org.onap.dmaap.dmf.mr.listener; import java.io.IOException; import java.io.InputStream; @@ -28,7 +28,7 @@ import java.util.Properties; import com.att.aft.dme2.manager.registry.DME2EndpointRegistry; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; -import com.att.dmf.mr.service.impl.EventsServiceImpl; +import org.onap.dmaap.dmf.mr.service.impl.EventsServiceImpl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Broker.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java similarity index 96% rename from src/main/java/com/att/dmf/mr/metabroker/Broker.java rename to src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java index e5fe8da..6cbb8c8 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Broker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import java.util.List; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Broker1.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java similarity index 97% rename from src/main/java/com/att/dmf/mr/metabroker/Broker1.java rename to src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java index e7d7f6c..69dacf9 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Broker1.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import java.util.List; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Topic.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java similarity index 98% rename from src/main/java/com/att/dmf/mr/metabroker/Topic.java rename to src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java index d191070..ea23182 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Topic.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.NsaAcl; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java similarity index 97% rename from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java index 45644b7..023bb28 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java similarity index 98% rename from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java index 4b219b1..2ce4216 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java similarity index 97% rename from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java index 4a6ca81..4d05070 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java similarity index 98% rename from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java index 4020a6d..441d325 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java similarity index 98% rename from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java index 46dfa99..4f072ac 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java similarity index 98% rename from src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java index d7818de..ff46ce3 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.net.MalformedURLException; import java.nio.channels.NotYetConnectedException; @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.TreeSet; import java.util.UUID; -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; /** * A factory for Cambria clients.
diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java similarity index 92% rename from src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java index 84576fc..6bedd18 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.net.MalformedURLException; import java.util.Collection; @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import org.json.JSONArray; import org.json.JSONException; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; //import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; @@ -43,7 +43,7 @@ import com.att.nsa.apiClient.http.HttpClient; * @author anowarul.islam * */ -public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metrics.publisher.CambriaClient +public class CambriaBaseClient extends HttpClient implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaClient { protected CambriaBaseClient ( Collection hosts ) throws MalformedURLException { diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java similarity index 97% rename from src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java index 7463700..ac83a9e 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; /** * diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java similarity index 96% rename from src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java index ee56213..56c1173 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -33,7 +33,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; import com.att.nsa.apiClient.http.HttpException; import com.att.nsa.apiClient.http.HttpObjectNotFoundException; @@ -45,7 +45,7 @@ import jline.internal.Log; * */ public class DMaaPCambriaConsumerImpl extends CambriaBaseClient - implements com.att.dmf.mr.metrics.publisher.CambriaConsumer { + implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaConsumer { private final String fTopic; private final String fGroup; private final String fId; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java similarity index 97% rename from src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java rename to src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java index e9b1cdb..634ea80 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -41,8 +41,8 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; /** * @@ -53,7 +53,7 @@ import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; * */ public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient - implements com.att.dmf.mr.metrics.publisher.CambriaBatchingPublisher { + implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaBatchingPublisher { /** * * static inner class initializes with urls, topic,batchSize diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java similarity index 88% rename from src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java index 4565d3a..4b65628 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources; +package org.onap.dmaap.dmf.mr.resources; import java.io.IOException; import java.io.InputStream; @@ -27,12 +27,12 @@ import java.util.zip.GZIPInputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaRawStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaTextStreamReader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaRawStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaTextStreamReader; import com.att.nsa.apiServer.streams.ChunkedInputStream; import com.att.nsa.drumlin.service.standards.HttpStatusCodes; diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java similarity index 97% rename from src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java index aae15fb..19e8e65 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources; +package org.onap.dmaap.dmf.mr.resources; import java.io.IOException; import java.io.OutputStream; @@ -36,13 +36,13 @@ import org.json.JSONObject; import org.json.JSONTokener; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.utils.DMaaPResponseBuilder.StreamWriter; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder.StreamWriter; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java similarity index 94% rename from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java index 7a67c92..fe2fc85 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.InputStream; @@ -29,10 +29,10 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java similarity index 93% rename from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java index f64c0de..93baee0 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java @@ -19,17 +19,17 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.IOException; import java.io.InputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; import com.att.nsa.util.StreamTools; /** diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java similarity index 95% rename from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java index 3dbf339..6df1dd4 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java @@ -19,17 +19,17 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.IOException; import java.io.InputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * Read an optionally chunked stream in the Cambria app format. This format diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java similarity index 93% rename from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java index b06e17a..67a31bb 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.BufferedReader; import java.io.IOException; @@ -28,10 +28,10 @@ import java.io.InputStreamReader; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * This stream reader just pulls single lines. It uses the default partition if provided. If diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java similarity index 94% rename from src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java index 59196d2..a7f2376 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java similarity index 93% rename from src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java index e4e24cd..25644a7 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; /** diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java similarity index 96% rename from src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java index 848d4cc..e6ff30f 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.security.NsaApiKey; diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java index 0ae0839..f0d0d4d 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java @@ -19,14 +19,14 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; import com.att.nsa.security.NsaApiKey; import com.att.nsa.security.db.NsaApiDb; import com.att.nsa.security.db.simple.NsaSimpleApiKey; diff --git a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java similarity index 94% rename from src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java index 64dbc14..6f2ebac 100644 --- a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security.impl; +package org.onap.dmaap.dmf.mr.security.impl; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java similarity index 98% rename from src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java rename to src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java index b1e28e7..f8cb066 100644 --- a/src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security.impl; +package org.onap.dmaap.dmf.mr.security.impl; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -27,8 +27,8 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/AdminService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java similarity index 96% rename from src/main/java/com/att/dmf/mr/service/AdminService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java index aaf7c0b..ef89d06 100644 --- a/src/main/java/com/att/dmf/mr/service/AdminService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/ApiKeysService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java similarity index 96% rename from src/main/java/com/att/dmf/mr/service/ApiKeysService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java index 57fc8be..9526ca1 100644 --- a/src/main/java/com/att/dmf/mr/service/ApiKeysService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; import com.att.nsa.security.db.NsaApiDb.KeyExistsException; diff --git a/src/main/java/com/att/dmf/mr/service/EventsService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java similarity index 90% rename from src/main/java/com/att/dmf/mr/service/EventsService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java index 2f89bd2..526b7b8 100644 --- a/src/main/java/com/att/dmf/mr/service/EventsService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import java.io.InputStream; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/MMService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java similarity index 90% rename from src/main/java/com/att/dmf/mr/service/MMService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java index ae01bbf..1bd28e7 100644 --- a/src/main/java/com/att/dmf/mr/service/MMService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import java.io.InputStream; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/MetricsService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java similarity index 92% rename from src/main/java/com/att/dmf/mr/service/MetricsService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java index b6cc60d..fd24d6c 100644 --- a/src/main/java/com/att/dmf/mr/service/MetricsService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; /** * @author amol.ramesh.dalne @@ -27,8 +27,8 @@ package com.att.dmf.mr.service; */ import java.io.IOException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; /** * diff --git a/src/main/java/com/att/dmf/mr/service/TopicService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/TopicService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java index b42d9c9..ae257c1 100644 --- a/src/main/java/com/att/dmf/mr/service/TopicService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java @@ -19,16 +19,16 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.json.JSONException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/TransactionService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java similarity index 93% rename from src/main/java/com/att/dmf/mr/service/TransactionService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java index f2763a6..b1593c7 100644 --- a/src/main/java/com/att/dmf/mr/service/TransactionService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDbException; /** diff --git a/src/main/java/com/att/dmf/mr/service/UIService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/UIService.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java index 1155a2a..777abf6 100644 --- a/src/main/java/com/att/dmf/mr/service/UIService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java @@ -22,15 +22,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.apache.kafka.common.errors.TopicExistsException; import org.json.JSONException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; /** * @author muzainulhaque.qazi diff --git a/src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java similarity index 94% rename from src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java index f7c48de..29a431e 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.util.Collection; @@ -30,12 +30,12 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.stereotype.Component; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.AdminService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.AdminService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java index b0e8a86..47da903 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; @@ -27,14 +27,14 @@ import org.json.JSONArray; import org.json.JSONObject; import org.springframework.stereotype.Service; -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.ApiKeysService; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Emailer; +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.ApiKeysService; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Emailer; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java similarity index 94% rename from src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java index 104d7de..1e248bf 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.util.Set; import java.util.TreeSet; -import com.att.dmf.mr.transaction.DMaaPTransactionFactory; -import com.att.dmf.mr.transaction.DMaaPTransactionObj; -import com.att.dmf.mr.transaction.DMaaPTransactionObjDB; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionFactory; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObjDB; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDb; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.configs.ConfigPath; diff --git a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java index 73a373e..387b667 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.io.InputStream; @@ -49,32 +49,32 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; - -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.resources.CambriaEventSet; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.EventsService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; + +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.EventsService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java index 387d8b1..d862677 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -42,27 +42,27 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.resources.CambriaEventSet; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; -import com.att.dmf.mr.service.MMService; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; +import org.onap.dmaap.dmf.mr.service.MMService; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java similarity index 91% rename from src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java index d867ea8..2041e54 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java @@ -19,18 +19,18 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import org.json.JSONObject; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.MetricsService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.MetricsService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.metrics.CdmMeasuredItem; diff --git a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java index 983af7e..f2ba222 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java @@ -22,7 +22,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; @@ -34,25 +34,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Broker1; - -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.TopicService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Broker1; + +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.TopicService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; @@ -313,7 +313,7 @@ public class TopicServiceImpl implements TopicService { DMaaPResponseCode.INCORRECT_JSON.getResponseCode(), errorMessages.getIncorrectJson()); LOGGER.info(errRes.toString()); throw new CambriaApiException(errRes); - } catch (com.att.dmf.mr.metabroker.Broker1.TopicExistsException e) { + } catch (org.onap.dmaap.dmf.mr.metabroker.Broker1.TopicExistsException e) { // TODO Auto-generated catch block LOGGER.error( e.getMessage()); } diff --git a/src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java similarity index 94% rename from src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java index 3065928..cfe2948 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java @@ -19,16 +19,16 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import org.springframework.stereotype.Service; import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.TransactionService; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.TransactionService; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDbException; /** diff --git a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java similarity index 95% rename from src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java rename to src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java index 73ad83b..b60fb44 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.util.LinkedList; @@ -34,12 +34,12 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.stereotype.Service; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.service.UIService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.service.UIService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java similarity index 97% rename from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java index 8ae4c12..3a02252 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; /** * * @author anowarul.islam diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java similarity index 98% rename from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java index 7f5dd3a..5ef986a 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import org.json.JSONObject; /** diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java similarity index 98% rename from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java index abebaba..d2d297c 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import java.util.Set; diff --git a/src/main/java/com/att/dmf/mr/transaction/TransactionObj.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java similarity index 99% rename from src/main/java/com/att/dmf/mr/transaction/TransactionObj.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java index 7223f0f..660acec 100644 --- a/src/main/java/com/att/dmf/mr/transaction/TransactionObj.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import org.json.JSONObject; diff --git a/src/main/java/com/att/dmf/mr/transaction/TrnRequest.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java similarity index 98% rename from src/main/java/com/att/dmf/mr/transaction/TrnRequest.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java index f7f18a2..138ebea 100644 --- a/src/main/java/com/att/dmf/mr/transaction/TrnRequest.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; /** * Created for transaction enable logging details, this is nothing but a bean diff --git a/src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java similarity index 89% rename from src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java index c54f2db..31bc6ca 100644 --- a/src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction.impl; +package org.onap.dmaap.dmf.mr.transaction.impl; import org.json.JSONObject; -import com.att.dmf.mr.transaction.DMaaPTransactionFactory; -import com.att.dmf.mr.transaction.DMaaPTransactionObj; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionFactory; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObj; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; /** * A factory for the simple Transaction implementation diff --git a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java similarity index 93% rename from src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java index aebca34..3462567 100644 --- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import javax.servlet.ServletException; @@ -29,23 +29,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; -import com.att.dmf.mr.backends.memory.MemoryConsumerFactory; -import com.att.dmf.mr.backends.memory.MemoryMetaBroker; -import com.att.dmf.mr.backends.memory.MemoryQueue; -import com.att.dmf.mr.backends.memory.MemoryQueuePublisher; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.DMaaPZkConfigDb; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Broker; - -import com.att.dmf.mr.metabroker.Broker1; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueuePublisher; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.DMaaPZkConfigDb; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Broker; + +import org.onap.dmaap.dmf.mr.metabroker.Broker1; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java similarity index 96% rename from src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java index 5a9968d..a5afa75 100644 --- a/src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.nsa.drumlin.till.nv.rrNvReadable; /** diff --git a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java similarity index 99% rename from src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java index 72db9de..3630086 100644 --- a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.JSONObject; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/utils/Emailer.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java similarity index 98% rename from src/main/java/com/att/dmf/mr/utils/Emailer.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java index 1b68216..cb4fcdc 100644 --- a/src/main/java/com/att/dmf/mr/utils/Emailer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.IOException; import java.util.Properties; @@ -40,7 +40,7 @@ import javax.mail.internet.MimeMultipart; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/utils/PropertyReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java similarity index 98% rename from src/main/java/com/att/dmf/mr/utils/PropertyReader.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java index 000869e..ee503af 100644 --- a/src/main/java/com/att/dmf/mr/utils/PropertyReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.util.Map; diff --git a/src/main/java/com/att/dmf/mr/utils/Utils.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java similarity index 97% rename from src/main/java/com/att/dmf/mr/utils/Utils.java rename to src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java index 5f84d85..f568d77 100644 --- a/src/main/java/com/att/dmf/mr/utils/Utils.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.IOException; import java.io.InputStream; @@ -33,8 +33,8 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.backends.kafka.KafkaPublisher; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaPublisher; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /** diff --git a/src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java b/src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java similarity index 96% rename from src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java rename to src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java index 0e2804e..76999e1 100644 --- a/src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java +++ b/src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.apiServer.metrics.cambria; +package org.onap.dmaap.mr.apiServer.metrics.cambria; import java.io.IOException; import java.net.InetAddress; @@ -35,9 +35,9 @@ import org.json.JSONObject; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metrics.publisher.CambriaPublisher; -import com.att.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisher; +import org.onap.dmaap.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.apiServer.metrics.cambria.MetricsSender; diff --git a/src/main/java/com/att/mr/filter/ContentLengthFilter.java b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java similarity index 95% rename from src/main/java/com/att/mr/filter/ContentLengthFilter.java rename to src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java index 26f58e0..a175b16 100644 --- a/src/main/java/com/att/mr/filter/ContentLengthFilter.java +++ b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.filter; +package org.onap.dmaap.mr.filter; import java.io.IOException; @@ -36,10 +36,10 @@ import org.json.JSONObject; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/mr/filter/DefaultLength.java b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java similarity index 97% rename from src/main/java/com/att/mr/filter/DefaultLength.java rename to src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java index 43169e5..598ef1b 100644 --- a/src/main/java/com/att/mr/filter/DefaultLength.java +++ b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.filter; +package org.onap.dmaap.mr.filter; public class DefaultLength { diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java b/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java deleted file mode 100644 index 9040ee8..0000000 --- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.apiServer.metrics.cambria; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java b/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java deleted file mode 100644 index 53ea31b..0000000 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java b/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java deleted file mode 100644 index 2c75929..0000000 --- a/src/test/java/com/att/nsa/cambria/backends/memory/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/exception/TestRunner.java b/src/test/java/com/att/nsa/cambria/exception/TestRunner.java deleted file mode 100644 index 75cf48d..0000000 --- a/src/test/java/com/att/nsa/cambria/exception/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java b/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java deleted file mode 100644 index e96d9c2..0000000 --- a/src/test/java/com/att/nsa/cambria/metabroker/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java deleted file mode 100644 index 3b628d9..0000000 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java deleted file mode 100644 index a354678..0000000 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher.impl; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/resources/TestRunner.java b/src/test/java/com/att/nsa/cambria/resources/TestRunner.java deleted file mode 100644 index ecfa2ef..0000000 --- a/src/test/java/com/att/nsa/cambria/resources/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java b/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java deleted file mode 100644 index 0f697cc..0000000 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java deleted file mode 100644 index 4688aec..0000000 --- a/src/test/java/com/att/nsa/cambria/security/impl/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security.impl; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java deleted file mode 100644 index cf240b7..0000000 --- a/src/test/java/com/att/nsa/cambria/service/impl/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java b/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java deleted file mode 100644 index e420175..0000000 --- a/src/test/java/com/att/nsa/cambria/transaction/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java b/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java deleted file mode 100644 index 430509e..0000000 --- a/src/test/java/com/att/nsa/cambria/transaction/impl/TestRunner.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction.impl; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} diff --git a/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java b/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java deleted file mode 100644 index a6ad73e..0000000 --- a/src/test/java/com/att/sa/cambria/testClient/SimpleExample.java +++ /dev/null @@ -1,335 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START======================================================= - * org.onap.dmaap - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * - *******************************************************************************/ - -package com.att.sa.cambria.testClient; - -import kafka.api.FetchRequest; -import kafka.api.FetchRequestBuilder; -import kafka.api.PartitionOffsetRequestInfo; -import kafka.cluster.Broker; -import kafka.common.ErrorMapping; -import kafka.common.TopicAndPartition; -import kafka.javaapi.*; -import kafka.javaapi.consumer.SimpleConsumer; -import kafka.message.MessageAndOffset; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -public class SimpleExample -{ -// public static void main ( String args[] ) -// { -// if ( args.length < 5 ) -// { -// System.err.println ( "usage: SimpleExample " ); -// return; -// } -// -// final long maxReads = Long.parseLong ( args[0] ); -// final String topic = args[1]; -// final int partition = Integer.parseInt ( args[2] ); -// -// final int port = Integer.parseInt ( args[4] ); -// final hostPort hp = new hostPort ( args[3], port ); -// final LinkedList seeds = new LinkedList (); -// seeds.add ( hp ); -// -// try -// { -// final SimpleExample example = new SimpleExample (); -// example.run ( maxReads, topic, partition, seeds ); -// } -// catch ( Exception e ) -// { -// System.out.println ( "Oops:" + e ); -// e.printStackTrace (); -// } -// } -// -// public SimpleExample () -// { -// fReplicaBrokers = new ArrayList (); -// } -// -// public void run ( long remainingAllowedReads, String a_topic, int a_partition, List seedHosts ) throws IOException -// { -// // find the meta data about the topic and partition we are interested in -// -// hostPort leadBroker = findLeader ( seedHosts, a_topic, a_partition ); -// if ( leadBroker == null ) -// { -// System.out.println ( "Can't find leader for Topic and Partition. Exiting" ); -// return; -// } -// -// final String clientName = "Client_" + a_topic + "_" + a_partition; -// -// SimpleConsumer consumer = new SimpleConsumer ( leadBroker.fHost, leadBroker.fPort, 100000, 64 * 1024, clientName ); -// long readOffset = getLastOffset ( consumer, a_topic, a_partition, kafka.api.OffsetRequest.EarliestTime (), clientName ); -// -// int numErrors = 0; -// while ( remainingAllowedReads > 0 ) -// { -// if ( consumer == null ) -// { -// consumer = new SimpleConsumer ( leadBroker.fHost, leadBroker.fPort, 100000, 64 * 1024, clientName ); -// } -// -// final FetchRequest req = new FetchRequestBuilder () -// .clientId ( clientName ) -// .addFetch ( a_topic, a_partition, readOffset, 100000 ).build (); -// final FetchResponse fetchResponse = consumer.fetch ( req ); -// -// if ( fetchResponse.hasError () ) -// { -// numErrors++; -// -// // Something went wrong! -// final short code = fetchResponse.errorCode ( a_topic, a_partition ); -// System.out.println ( "Error fetching data from the Broker:" + leadBroker + " Reason: " + code ); -// if ( numErrors > 5 ) -// break; -// -// if ( code == ErrorMapping.OffsetOutOfRangeCode () ) -// { -// // We asked for an invalid offset. For simple case ask for -// // the last element to reset -// readOffset = getLastOffset ( consumer, a_topic, -// a_partition, kafka.api.OffsetRequest.LatestTime (), -// clientName ); -// continue; -// } -// -// consumer.close (); -// consumer = null; -// -// leadBroker = findNewLeader ( leadBroker, a_topic, a_partition ); -// continue; -// } -// numErrors = 0; -// -// long numRead = 0; -// for ( MessageAndOffset messageAndOffset : fetchResponse.messageSet ( a_topic, a_partition ) ) -// { -// long currentOffset = messageAndOffset.offset (); -// if ( currentOffset < readOffset ) -// { -// System.out.println ( "Found an old offset: " -// + currentOffset + " Expecting: " + readOffset ); -// continue; -// } -// readOffset = messageAndOffset.nextOffset (); -// ByteBuffer payload = messageAndOffset.message ().payload (); -// -// byte[] bytes = new byte [payload.limit ()]; -// payload.get ( bytes ); -// System.out.println ( String.valueOf ( messageAndOffset.offset () ) + ": " + new String ( bytes, "UTF-8" ) ); -// numRead++; -// remainingAllowedReads--; -// } -// -// if ( numRead == 0 ) -// { -// try -// { -// Thread.sleep ( 1000 ); -// } -// catch ( InterruptedException ie ) -// { -// } -// } -// } -// -// if ( consumer != null ) -// { -// consumer.close (); -// } -// } -// -// public static long getLastOffset ( SimpleConsumer consumer, String topic, -// int partition, long whichTime, String clientName ) -// { -// TopicAndPartition topicAndPartition = new TopicAndPartition ( topic, -// partition ); -// Map requestInfo = new HashMap (); -// requestInfo.put ( topicAndPartition, new PartitionOffsetRequestInfo ( -// whichTime, 1 ) ); -// kafka.javaapi.OffsetRequest request = new kafka.javaapi.OffsetRequest ( -// requestInfo, kafka.api.OffsetRequest.CurrentVersion (), clientName ); -// OffsetResponse response = consumer.getOffsetsBefore ( request ); -// -// if ( response.hasError () ) -// { -// System.out.println ( "Error fetching data Offset Data the Broker. Reason: " -// + response.errorCode ( topic, partition ) ); -// return 0; -// } -// -// final long[] offsets = response.offsets ( topic, partition ); -// return offsets[0]; -// } -// -// /** -// * Find a new leader for a topic/partition, including a pause for the coordinator to -// * find a new leader, as needed. -// * -// * @param oldLeader -// * @param topic -// * @param partition -// * @return -// * @throws IOException -// */ -// private hostPort findNewLeader ( hostPort oldLeader, String topic, int partition ) throws IOException -// { -// try -// { -// int attemptsLeft = 3; -// boolean haveSlept = false; -// -// while ( attemptsLeft-- > 0 ) -// { -// System.out.println ( "" + attemptsLeft + " attempts Left" ); // FIXME: make sure it's 3 attempts! -// -// // ask the brokers for a leader -// final hostPort newLeader = findLeader ( fReplicaBrokers, topic, partition ); -// if ( newLeader != null ) -// { -// // we can use this leader if it's different (i.e. a new leader has been elected) -// // or it's the same leader, but we waited to allow ZK to get a new one, and -// // the original recovered -// if ( !oldLeader.equals ( newLeader ) || haveSlept ) -// { -// return newLeader; -// } -// } -// -// // sleep -// haveSlept = true; -// Thread.sleep ( 1000 ); -// } -// } -// catch ( InterruptedException x ) -// { -// // just give up -// } -// -// System.out.println ( "Unable to find new leader after Broker failure. Exiting" ); -// throw new IOException ( "Unable to find new leader after Broker failure. Exiting" ); -// } -// -// /** -// * Given one or more seed brokers, find the leader for a given topic/partition -// * @param seeds -// * @param topic -// * @param partition -// * @return partition metadata, or null -// */ -// private hostPort findLeader ( List seeds, String topic, int partition ) -// { -// final List topics = new ArrayList (); -// topics.add ( topic ); -// -// for ( hostPort seed : seeds ) -// { -// final SimpleConsumer consumer = new SimpleConsumer ( seed.fHost, seed.fPort, 100000, 64 * 1024, "leaderLookup" ); -// final TopicMetadataRequest req = new TopicMetadataRequest ( topics ); -// final TopicMetadataResponse resp = consumer.send ( req ); -// consumer.close (); -// -// final List metaData = resp.topicsMetadata (); -// for ( TopicMetadata item : metaData ) -// { -// for ( PartitionMetadata part : item.partitionsMetadata () ) -// { -// if ( part.partitionId () == partition ) -// { -// // found our partition. load the details, then return it -// fReplicaBrokers.clear (); -// for ( kafka.cluster.Broker replica : part.replicas () ) -// { -// fReplicaBrokers.add ( new hostPort ( replica.host (), replica.port () ) ); -// } -// return new hostPort ( part.leader () ); -// } -// } -// } -// } -// -// return null; -// } -// -// private static class hostPort -// { -// public hostPort ( String host, int port ) { fHost = host; fPort = port; } -// -// public hostPort ( Broker leader ) -// { -// fHost = leader.host (); -// fPort = leader.port (); -// } -// -// -// public final String fHost; -// public final int fPort; -// -// @Override -// public int hashCode () -// { -// final int prime = 31; -// int result = 1; -// result = prime * result -// + ( ( fHost == null ) ? 0 : fHost.hashCode () ); -// result = prime * result + fPort; -// return result; -// } -// -// @Override -// public boolean equals ( Object obj ) -// { -// if ( this == obj ) -// return true; -// if ( obj == null ) -// return false; -// if ( getClass () != obj.getClass () ) -// return false; -// hostPort other = (hostPort) obj; -// if ( fHost == null ) -// { -// if ( other.fHost != null ) -// return false; -// } -// else if ( !fHost.equals ( other.fHost ) ) -// return false; -// if ( fPort != other.fPort ) -// return false; -// return true; -// } -// } -// -// private List fReplicaBrokers; -} diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java similarity index 93% rename from src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java rename to src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java index 9967036..69abb24 100644 --- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java +++ b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSenderTest.java @@ -1,131 +1,131 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.apiServer.metrics.cambria; - - -import static org.junit.Assert.assertTrue; - -import java.io.File; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.mr.apiServer.metrics.cambria.DMaaPMetricsSender; - -public class DMaaPMetricsSenderTest { - - @Before - public void setUp() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile())); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSendPeriodically() { - - DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); - try { - sender.sendPeriodically(null, null, "testTopic"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (NoClassDefFoundError e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSendPeriodically2() { - - DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); - try { - sender.sendPeriodically(null, null, "url", "testTopic", 2); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSend() { - - DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); - try { - sender.send(); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testRun() { - - DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); - try { - sender.run(); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.apiServer.metrics.cambria; + + +import static org.junit.Assert.assertTrue; + +import java.io.File; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.mr.apiServer.metrics.cambria.DMaaPMetricsSender; + +public class DMaaPMetricsSenderTest { + + @Before + public void setUp() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile())); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSendPeriodically() { + + DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); + try { + sender.sendPeriodically(null, null, "testTopic"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (NoClassDefFoundError e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSendPeriodically2() { + + DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); + try { + sender.sendPeriodically(null, null, "url", "testTopic", 2); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSend() { + + DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); + try { + sender.send(); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testRun() { + + DMaaPMetricsSender sender = new DMaaPMetricsSender(null, "url", "testTopic"); + try { + sender.run(); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/JUnitTestSuite.java index 3e70420..4bef234 100644 --- a/src/test/java/com/att/nsa/apiServer/metrics/cambria/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/JUnitTestSuite.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.apiServer.metrics.cambria; - -import junit.framework.TestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPMetricsSenderTest.class}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.apiServer.metrics.cambria; + +import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPMetricsSenderTest.class}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/filter/TestRunner.java b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/TestRunner.java similarity index 95% rename from src/test/java/com/att/nsa/filter/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/TestRunner.java index 832a720..2eb7c1c 100644 --- a/src/test/java/com/att/nsa/filter/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/apiServer/metrics/cambria/TestRunner.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.filter; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.apiServer.metrics.cambria; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiExceptionTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/CambriaApiExceptionTest.java index f41f33f..77a387e 100644 --- a/src/test/java/com/att/nsa/cambria/CambriaApiExceptionTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiExceptionTest.java @@ -1,74 +1,74 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.exception.ErrorResponse; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CambriaApiExceptionTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetErrRes() { - - int status = 1; - String msg = "helloWorld"; - CambriaApiException cambria = new CambriaApiException(status, msg); - - cambria.getErrRes(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSetErrRes() { - - int status = 1; - String msg = "helloWorld"; - CambriaApiException cambria = new CambriaApiException(status, msg); - - cambria.setErrRes(new ErrorResponse(200, 0, "OK")); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.cambria; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class CambriaApiExceptionTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetErrRes() { + + int status = 1; + String msg = "helloWorld"; + CambriaApiException cambria = new CambriaApiException(status, msg); + + cambria.getErrRes(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSetErrRes() { + + int status = 1; + String msg = "helloWorld"; + CambriaApiException cambria = new CambriaApiException(status, msg); + + cambria.setErrRes(new ErrorResponse(200, 0, "OK")); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiTestCase.java similarity index 98% rename from src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java rename to src/test/java/org/onap/dmaap/mr/cambria/CambriaApiTestCase.java index cb934af..01e45c9 100644 --- a/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiTestCase.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.nsa.cambria; +package org.onap.dmaap.mr.cambria; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiVersionInfoTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/CambriaApiVersionInfoTest.java index b71bf6e..cf89f52 100644 --- a/src/test/java/com/att/nsa/cambria/CambriaApiVersionInfoTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/CambriaApiVersionInfoTest.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.CambriaApiVersionInfo; -import com.att.dmf.mr.exception.ErrorResponse; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CambriaApiVersionInfoTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetVersion() { - CambriaApiVersionInfo.getVersion(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.cambria; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.CambriaApiVersionInfo; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class CambriaApiVersionInfoTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetVersion() { + CambriaApiVersionInfo.getVersion(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java b/src/test/java/org/onap/dmaap/mr/cambria/CambriaRateLimiterTest.java similarity index 98% rename from src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/CambriaRateLimiterTest.java index 8e853d2..ac7df2b 100644 --- a/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/CambriaRateLimiterTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.nsa.cambria; +package org.onap.dmaap.mr.cambria; import junit.framework.TestCase; diff --git a/src/test/java/com/att/nsa/cambria/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/JUnitTestSuite.java index 9c98524..d9e3483 100644 --- a/src/test/java/com/att/nsa/cambria/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ CambriaApiExceptionTest.class, CambriaApiVersionInfoTest.class, CambriaApiTestCase.class, CambriaRateLimiterTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.cambria; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ CambriaApiExceptionTest.class, CambriaApiVersionInfoTest.class, CambriaApiTestCase.class, CambriaRateLimiterTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/TestRunner.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/cambria/TestRunner.java index 24a9bc2..f276888 100644 --- a/src/test/java/com/att/nsa/cambria/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/TestRunner.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.cambria; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/CuratorFrameworkImpl.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/CuratorFrameworkImpl.java index a12e96c..2f57abf 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/CuratorFrameworkImpl.java @@ -1,278 +1,278 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import java.util.concurrent.TimeUnit; - -import org.apache.curator.CuratorZookeeperClient; -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.WatcherRemoveCuratorFramework; -import org.apache.curator.framework.api.CreateBuilder; -import org.apache.curator.framework.api.CuratorListener; -import org.apache.curator.framework.api.DeleteBuilder; -import org.apache.curator.framework.api.ExistsBuilder; -import org.apache.curator.framework.api.GetACLBuilder; -import org.apache.curator.framework.api.GetChildrenBuilder; -import org.apache.curator.framework.api.GetConfigBuilder; -import org.apache.curator.framework.api.GetDataBuilder; -import org.apache.curator.framework.api.ReconfigBuilder; -import org.apache.curator.framework.api.RemoveWatchesBuilder; -import org.apache.curator.framework.api.SetACLBuilder; -import org.apache.curator.framework.api.SetDataBuilder; -import org.apache.curator.framework.api.SyncBuilder; -import org.apache.curator.framework.api.UnhandledErrorListener; -import org.apache.curator.framework.api.transaction.CuratorMultiTransaction; -import org.apache.curator.framework.api.transaction.CuratorTransaction; -import org.apache.curator.framework.api.transaction.TransactionOp; -import org.apache.curator.framework.imps.CuratorFrameworkState; -import org.apache.curator.framework.listen.Listenable; -import org.apache.curator.framework.schema.SchemaSet; -import org.apache.curator.framework.state.ConnectionStateErrorPolicy; -import org.apache.curator.framework.state.ConnectionStateListener; -import org.apache.curator.utils.EnsurePath; -import org.apache.zookeeper.Watcher; -import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; - -public class CuratorFrameworkImpl implements CuratorFramework { - - @Override - public void blockUntilConnected() throws InterruptedException { - // TODO Auto-generated method stub - - } - - @Override - public boolean blockUntilConnected(int arg0, TimeUnit arg1) throws InterruptedException { - // TODO Auto-generated method stub - return false; - } - - @Override - public ExistsBuilder checkExists() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void clearWatcherReferences(Watcher arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void close() { - // TODO Auto-generated method stub - - } - - @Override - public CreateBuilder create() { - // TODO Auto-generated method stub - return null; - } - - @Override - public DeleteBuilder delete() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GetACLBuilder getACL() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GetChildrenBuilder getChildren() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Listenable getConnectionStateListenable() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Listenable getCuratorListenable() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GetDataBuilder getData() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getNamespace() { - // TODO Auto-generated method stub - return null; - } - - @Override - public CuratorFrameworkState getState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Listenable getUnhandledErrorListenable() { - // TODO Auto-generated method stub - return null; - } - - @Override - public CuratorZookeeperClient getZookeeperClient() { - // TODO Auto-generated method stub - return null; - } - - @Override - public CuratorTransaction inTransaction() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isStarted() { - // TODO Auto-generated method stub - return false; - } - - @Override - public EnsurePath newNamespaceAwareEnsurePath(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public CuratorFramework nonNamespaceView() { - // TODO Auto-generated method stub - return null; - } - - @Override - public SetACLBuilder setACL() { - // TODO Auto-generated method stub - return null; - } - - @Override - public SetDataBuilder setData() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void start() { - // TODO Auto-generated method stub - - } - - @Override - public SyncBuilder sync() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void sync(String arg0, Object arg1) { - // TODO Auto-generated method stub - - } - - @Override - public CuratorFramework usingNamespace(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ReconfigBuilder reconfig() { - // TODO Auto-generated method stub - return null; - } - - @Override - public GetConfigBuilder getConfig() { - // TODO Auto-generated method stub - return null; - } - - @Override - public CuratorMultiTransaction transaction() { - // TODO Auto-generated method stub - return null; - } - - @Override - public TransactionOp transactionOp() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void createContainers(String path) throws Exception { - // TODO Auto-generated method stub - - } - - @Override - public RemoveWatchesBuilder watches() { - // TODO Auto-generated method stub - return null; - } - - @Override - public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() { - // TODO Auto-generated method stub - return null; - } - - @Override - public QuorumVerifier getCurrentConfig() { - // TODO Auto-generated method stub - return null; - } - - @Override - public SchemaSet getSchemaSet() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isZk34CompatibilityMode() { - // TODO Auto-generated method stub - return false; - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import java.util.concurrent.TimeUnit; + +import org.apache.curator.CuratorZookeeperClient; +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.WatcherRemoveCuratorFramework; +import org.apache.curator.framework.api.CreateBuilder; +import org.apache.curator.framework.api.CuratorListener; +import org.apache.curator.framework.api.DeleteBuilder; +import org.apache.curator.framework.api.ExistsBuilder; +import org.apache.curator.framework.api.GetACLBuilder; +import org.apache.curator.framework.api.GetChildrenBuilder; +import org.apache.curator.framework.api.GetConfigBuilder; +import org.apache.curator.framework.api.GetDataBuilder; +import org.apache.curator.framework.api.ReconfigBuilder; +import org.apache.curator.framework.api.RemoveWatchesBuilder; +import org.apache.curator.framework.api.SetACLBuilder; +import org.apache.curator.framework.api.SetDataBuilder; +import org.apache.curator.framework.api.SyncBuilder; +import org.apache.curator.framework.api.UnhandledErrorListener; +import org.apache.curator.framework.api.transaction.CuratorMultiTransaction; +import org.apache.curator.framework.api.transaction.CuratorTransaction; +import org.apache.curator.framework.api.transaction.TransactionOp; +import org.apache.curator.framework.imps.CuratorFrameworkState; +import org.apache.curator.framework.listen.Listenable; +import org.apache.curator.framework.schema.SchemaSet; +import org.apache.curator.framework.state.ConnectionStateErrorPolicy; +import org.apache.curator.framework.state.ConnectionStateListener; +import org.apache.curator.utils.EnsurePath; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; + +public class CuratorFrameworkImpl implements CuratorFramework { + + @Override + public void blockUntilConnected() throws InterruptedException { + // TODO Auto-generated method stub + + } + + @Override + public boolean blockUntilConnected(int arg0, TimeUnit arg1) throws InterruptedException { + // TODO Auto-generated method stub + return false; + } + + @Override + public ExistsBuilder checkExists() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void clearWatcherReferences(Watcher arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void close() { + // TODO Auto-generated method stub + + } + + @Override + public CreateBuilder create() { + // TODO Auto-generated method stub + return null; + } + + @Override + public DeleteBuilder delete() { + // TODO Auto-generated method stub + return null; + } + + @Override + public GetACLBuilder getACL() { + // TODO Auto-generated method stub + return null; + } + + @Override + public GetChildrenBuilder getChildren() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Listenable getConnectionStateListenable() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Listenable getCuratorListenable() { + // TODO Auto-generated method stub + return null; + } + + @Override + public GetDataBuilder getData() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getNamespace() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorFrameworkState getState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Listenable getUnhandledErrorListenable() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorZookeeperClient getZookeeperClient() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorTransaction inTransaction() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isStarted() { + // TODO Auto-generated method stub + return false; + } + + @Override + public EnsurePath newNamespaceAwareEnsurePath(String arg0) { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorFramework nonNamespaceView() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SetACLBuilder setACL() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SetDataBuilder setData() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void start() { + // TODO Auto-generated method stub + + } + + @Override + public SyncBuilder sync() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void sync(String arg0, Object arg1) { + // TODO Auto-generated method stub + + } + + @Override + public CuratorFramework usingNamespace(String arg0) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ReconfigBuilder reconfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public GetConfigBuilder getConfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorMultiTransaction transaction() { + // TODO Auto-generated method stub + return null; + } + + @Override + public TransactionOp transactionOp() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void createContainers(String path) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public RemoveWatchesBuilder watches() { + // TODO Auto-generated method stub + return null; + } + + @Override + public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() { + // TODO Auto-generated method stub + return null; + } + + @Override + public QuorumVerifier getCurrentConfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SchemaSet getSchemaSet() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isZk34CompatibilityMode() { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/JUnitTestSuite.java index 54ff469..5904de5 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ KafkaConsumerCacheTest.class, KafkaPublisherTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ KafkaConsumerCacheTest.class, KafkaPublisherTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaConsumerCacheTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaConsumerCacheTest.java index 06d7b58..83866cf 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaConsumerCacheTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaConsumerCacheTest.java @@ -1,256 +1,256 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import static org.junit.Assert.*; - -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.curator.framework.CuratorFramework; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.core.classloader.annotations.PrepareForTest; - -import com.att.ajsc.filemonitor.AJSCPropertiesMap; - -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.kafka.Kafka011Consumer; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ AJSCPropertiesMap.class }) -public class KafkaConsumerCacheTest { - private KafkaConsumerCache kafkaConsumerCache =null; - @Mock - private ConcurrentHashMap fConsumers; - @Mock - private MetricsSet fMetrics; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testSweep() { - kafkaConsumerCache = new KafkaConsumerCache(); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "kSetting_TouchEveryMs")).thenReturn("100"); - kafkaConsumerCache.sweep(); - - } - - - // DOES NOT WORK - @Test - public void testStartCache() { - - /* - * KafkaConsumerCache kafka = null; - * - * try { kafka = new KafkaConsumerCache("123", null); - * - * } catch (NoClassDefFoundError e) { try { kafka.startCache("DMAAP", - * null); } catch (NullPointerException e1) { // TODO Auto-generated - * catch block assertTrue(true); } catch (KafkaConsumerCacheException - * e1) { // TODO Auto-generated catch block e1.printStackTrace(); } } - */ - - - new CuratorFrameworkImpl(); - new MetricsSetImpl(); - KafkaConsumerCache kafka=null; - try { - kafka = new KafkaConsumerCache(); - kafka.setfApiId("1"); - kafka.startCache("DMAAP", null); - } catch (NoClassDefFoundError e) { - - } catch (KafkaConsumerCacheException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testGetCuratorFramework() { - - CuratorFramework curator = new CuratorFrameworkImpl(); - new MetricsSetImpl(); - try { - - } catch (NoClassDefFoundError e) { - - KafkaConsumerCache.getCuratorFramework(curator); - } - - } - - /* - * @Test public void testStopCache() { - * - * KafkaConsumerCache kafka = null; new CuratorFrameworkImpl(); new - * MetricsSetImpl(); try { kafka = new KafkaConsumerCache("123", null); - * kafka.stopCache(); } catch (NoClassDefFoundError e) { - * - * } - * - * } - */ - - @Test - public void testGetConsumerFor() { - - KafkaConsumerCache kafka = null; - - try { - kafka = new KafkaConsumerCache(); - kafka.getConsumerFor("testTopic", "CG1", "23"); - } catch (NoClassDefFoundError e) { - - } catch (KafkaConsumerCacheException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testPutConsumerFor() { - - Kafka011Consumer consumer = null; - KafkaConsumerCache kafka = null; - - try { - kafka = new KafkaConsumerCache(); - - } catch (NoClassDefFoundError e) { - try { - kafka.putConsumerFor("testTopic", "CG1", "23", consumer); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } catch (KafkaConsumerCacheException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - - } - - @Test - public void testGetConsumers() { - - KafkaConsumerCache kafka = null; - - try { - kafka = new KafkaConsumerCache(); - - } catch (NoClassDefFoundError e) { - try { - kafka.getConsumers(); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } - } - - } - - @Test - public void testDropAllConsumers() { - - KafkaConsumerCache kafka = null; - try { - kafka = new KafkaConsumerCache(); - - } catch (NoClassDefFoundError e) { - try { - kafka.dropAllConsumers(); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } - } - - } - - @Test - public void testSignalOwnership() { - - KafkaConsumerCache kafka = null; - - try { - kafka = new KafkaConsumerCache(); - // kafka.signalOwnership("testTopic", "CG1", "23"); - } catch (NoClassDefFoundError e) { - try { - kafka.signalOwnership("testTopic", "CG1", "23"); - } catch (KafkaConsumerCacheException e1) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - // assertTrue(true); - e1.printStackTrace(); - } - - } - - // assertTrue(true); - } - - @Test - public void testDropConsumer() { - - KafkaConsumerCache kafka = null; - - try { - kafka = new KafkaConsumerCache(); - // kafka.dropConsumer("testTopic", "CG1", "23"); - } catch (NoClassDefFoundError e) { - try { - kafka.dropConsumer("testTopic", "CG1", "23"); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } - } - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import static org.junit.Assert.*; + +import java.util.concurrent.ConcurrentHashMap; + +import org.apache.curator.framework.CuratorFramework; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.core.classloader.annotations.PrepareForTest; + +import com.att.ajsc.filemonitor.AJSCPropertiesMap; + +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.kafka.Kafka011Consumer; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ AJSCPropertiesMap.class }) +public class KafkaConsumerCacheTest { + private KafkaConsumerCache kafkaConsumerCache =null; + @Mock + private ConcurrentHashMap fConsumers; + @Mock + private MetricsSet fMetrics; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testSweep() { + kafkaConsumerCache = new KafkaConsumerCache(); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "kSetting_TouchEveryMs")).thenReturn("100"); + kafkaConsumerCache.sweep(); + + } + + + // DOES NOT WORK + @Test + public void testStartCache() { + + /* + * KafkaConsumerCache kafka = null; + * + * try { kafka = new KafkaConsumerCache("123", null); + * + * } catch (NoClassDefFoundError e) { try { kafka.startCache("DMAAP", + * null); } catch (NullPointerException e1) { // TODO Auto-generated + * catch block assertTrue(true); } catch (KafkaConsumerCacheException + * e1) { // TODO Auto-generated catch block e1.printStackTrace(); } } + */ + + + new CuratorFrameworkImpl(); + new MetricsSetImpl(); + KafkaConsumerCache kafka=null; + try { + kafka = new KafkaConsumerCache(); + kafka.setfApiId("1"); + kafka.startCache("DMAAP", null); + } catch (NoClassDefFoundError e) { + + } catch (KafkaConsumerCacheException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testGetCuratorFramework() { + + CuratorFramework curator = new CuratorFrameworkImpl(); + new MetricsSetImpl(); + try { + + } catch (NoClassDefFoundError e) { + + KafkaConsumerCache.getCuratorFramework(curator); + } + + } + + /* + * @Test public void testStopCache() { + * + * KafkaConsumerCache kafka = null; new CuratorFrameworkImpl(); new + * MetricsSetImpl(); try { kafka = new KafkaConsumerCache("123", null); + * kafka.stopCache(); } catch (NoClassDefFoundError e) { + * + * } + * + * } + */ + + @Test + public void testGetConsumerFor() { + + KafkaConsumerCache kafka = null; + + try { + kafka = new KafkaConsumerCache(); + kafka.getConsumerFor("testTopic", "CG1", "23"); + } catch (NoClassDefFoundError e) { + + } catch (KafkaConsumerCacheException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testPutConsumerFor() { + + Kafka011Consumer consumer = null; + KafkaConsumerCache kafka = null; + + try { + kafka = new KafkaConsumerCache(); + + } catch (NoClassDefFoundError e) { + try { + kafka.putConsumerFor("testTopic", "CG1", "23", consumer); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } catch (KafkaConsumerCacheException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + + } + + @Test + public void testGetConsumers() { + + KafkaConsumerCache kafka = null; + + try { + kafka = new KafkaConsumerCache(); + + } catch (NoClassDefFoundError e) { + try { + kafka.getConsumers(); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } + } + + } + + @Test + public void testDropAllConsumers() { + + KafkaConsumerCache kafka = null; + try { + kafka = new KafkaConsumerCache(); + + } catch (NoClassDefFoundError e) { + try { + kafka.dropAllConsumers(); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } + } + + } + + @Test + public void testSignalOwnership() { + + KafkaConsumerCache kafka = null; + + try { + kafka = new KafkaConsumerCache(); + // kafka.signalOwnership("testTopic", "CG1", "23"); + } catch (NoClassDefFoundError e) { + try { + kafka.signalOwnership("testTopic", "CG1", "23"); + } catch (KafkaConsumerCacheException e1) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + // assertTrue(true); + e1.printStackTrace(); + } + + } + + // assertTrue(true); + } + + @Test + public void testDropConsumer() { + + KafkaConsumerCache kafka = null; + + try { + kafka = new KafkaConsumerCache(); + // kafka.dropConsumer("testTopic", "CG1", "23"); + } catch (NoClassDefFoundError e) { + try { + kafka.dropConsumer("testTopic", "CG1", "23"); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } + } + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaPublisherTest.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaPublisherTest.java index 3673845..982fbf2 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/KafkaPublisherTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/KafkaPublisherTest.java @@ -1,153 +1,153 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; - -import kafka.common.FailedToSendMessageException; -import kafka.producer.KeyedMessage; - -public class KafkaPublisherTest { - - - - /*@Before - public void setUp() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile())); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSendMessages() { - - String topic = "testTopic"; - - KafkaPublisher kafka = null; - try { - kafka = new KafkaPublisher(null); - - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NoClassDefFoundError e) { - try { - kafka.sendMessage(topic, null); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } catch (FailedToSendMessageException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } catch (FailedToSendMessageException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testSendBatchMessage() { - - String topic = "testTopic"; - - KafkaPublisher kafka = null; - ArrayList> kms = null; - try { - kafka = new KafkaPublisher(null); - - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NoClassDefFoundError e) { - try { - kafka.sendBatchMessage(topic, kms); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } catch (FailedToSendMessageException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void sendMessages() { - - String topic = "testTopic"; - - List msgs = null; - - KafkaPublisher kafka = null; - //ArrayList> kms = null; - try { - kafka = new KafkaPublisher(null); - - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NoClassDefFoundError e) { - try { - kafka.sendMessages(topic, msgs); - } catch (NullPointerException e1) { - // TODO Auto-generated catch block - assertTrue(true); - } catch (FailedToSendMessageException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } catch (FailedToSendMessageException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - }*/ - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; + +import kafka.common.FailedToSendMessageException; +import kafka.producer.KeyedMessage; + +public class KafkaPublisherTest { + + + + /*@Before + public void setUp() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + AJSCPropertiesMap.refresh(new File(classLoader.getResource("MsgRtrApi.properties").getFile())); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSendMessages() { + + String topic = "testTopic"; + + KafkaPublisher kafka = null; + try { + kafka = new KafkaPublisher(null); + + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NoClassDefFoundError e) { + try { + kafka.sendMessage(topic, null); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } catch (FailedToSendMessageException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } catch (FailedToSendMessageException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testSendBatchMessage() { + + String topic = "testTopic"; + + KafkaPublisher kafka = null; + ArrayList> kms = null; + try { + kafka = new KafkaPublisher(null); + + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NoClassDefFoundError e) { + try { + kafka.sendBatchMessage(topic, kms); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } catch (FailedToSendMessageException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void sendMessages() { + + String topic = "testTopic"; + + List msgs = null; + + KafkaPublisher kafka = null; + //ArrayList> kms = null; + try { + kafka = new KafkaPublisher(null); + + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NoClassDefFoundError e) { + try { + kafka.sendMessages(topic, msgs); + } catch (NullPointerException e1) { + // TODO Auto-generated catch block + assertTrue(true); + } catch (FailedToSendMessageException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } catch (FailedToSendMessageException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + }*/ + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/MetricsSetImpl.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/MetricsSetImpl.java index b5f7b74..ccb432e 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/MetricsSetImpl.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/MetricsSetImpl.java @@ -1,123 +1,123 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.kafka; - -import java.util.List; -import java.util.Map; - -import org.json.JSONObject; - -import com.att.dmf.mr.backends.MetricsSet; -import com.att.nsa.metrics.CdmMeasuredItem; - -public class MetricsSetImpl implements MetricsSet { - - @Override - public List getEntries() { - // TODO Auto-generated method stub - return null; - } - - @Override - public CdmMeasuredItem getItem(String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getItems() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void putItem(String arg0, CdmMeasuredItem arg1) { - // TODO Auto-generated method stub - - } - - @Override - public void removeItem(String arg0) { - // TODO Auto-generated method stub - - } - - @Override - public int size() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public JSONObject toJson() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setupCambriaSender() { - // TODO Auto-generated method stub - - } - - @Override - public void onRouteComplete(String name, long durationMs) { - // TODO Auto-generated method stub - - } - - @Override - public void publishTick(int amount) { - // TODO Auto-generated method stub - - } - - @Override - public void consumeTick(int amount) { - // TODO Auto-generated method stub - - } - - @Override - public void onKafkaConsumerCacheMiss() { - // TODO Auto-generated method stub - - } - - @Override - public void onKafkaConsumerCacheHit() { - // TODO Auto-generated method stub - - } - - @Override - public void onKafkaConsumerClaimed() { - // TODO Auto-generated method stub - - } - - @Override - public void onKafkaConsumerTimeout() { - // TODO Auto-generated method stub - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import java.util.List; +import java.util.Map; + +import org.json.JSONObject; + +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import com.att.nsa.metrics.CdmMeasuredItem; + +public class MetricsSetImpl implements MetricsSet { + + @Override + public List getEntries() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CdmMeasuredItem getItem(String arg0) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map getItems() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void putItem(String arg0, CdmMeasuredItem arg1) { + // TODO Auto-generated method stub + + } + + @Override + public void removeItem(String arg0) { + // TODO Auto-generated method stub + + } + + @Override + public int size() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public JSONObject toJson() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setupCambriaSender() { + // TODO Auto-generated method stub + + } + + @Override + public void onRouteComplete(String name, long durationMs) { + // TODO Auto-generated method stub + + } + + @Override + public void publishTick(int amount) { + // TODO Auto-generated method stub + + } + + @Override + public void consumeTick(int amount) { + // TODO Auto-generated method stub + + } + + @Override + public void onKafkaConsumerCacheMiss() { + // TODO Auto-generated method stub + + } + + @Override + public void onKafkaConsumerCacheHit() { + // TODO Auto-generated method stub + + } + + @Override + public void onKafkaConsumerClaimed() { + // TODO Auto-generated method stub + + } + + @Override + public void onKafkaConsumerTimeout() { + // TODO Auto-generated method stub + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/TestRunner.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/beans/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/TestRunner.java index 25eb3c4..8f70091 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/kafka/TestRunner.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.kafka; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/JUnitTestSuite.java index fc11552..d577ae8 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ MemoryConsumerFactoryTest.class, MemoryMetaBrokerTest.class, MemoryQueueTest.class, - MemoryQueuePublisherTest.class, MessageLoggerTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ MemoryConsumerFactoryTest.class, MemoryMetaBrokerTest.class, MemoryQueueTest.class, + MemoryQueuePublisherTest.class, MessageLoggerTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryConsumerFactoryTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryConsumerFactoryTest.java index d6fe6e6..a0bbaa6 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryConsumerFactoryTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryConsumerFactoryTest.java @@ -1,83 +1,83 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.backends.memory.MemoryConsumerFactory; - -public class MemoryConsumerFactoryTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetConsumerFor() { - MemoryConsumerFactory factory = new MemoryConsumerFactory(null); - - - String topic = "testTopic"; - String consumerGroupId = "CG1"; - String clientId = "C1"; - String remoteHost="remoteHost"; - int timeoutMs = 1000; - factory.getConsumerFor(topic, consumerGroupId, clientId, timeoutMs,remoteHost); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testDropCache() { - MemoryConsumerFactory factory = new MemoryConsumerFactory(null); - - factory.dropCache(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetConsumers() { - MemoryConsumerFactory factory = new MemoryConsumerFactory(null); - - factory.getConsumers(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.backends.memory.MemoryConsumerFactory; + +public class MemoryConsumerFactoryTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetConsumerFor() { + MemoryConsumerFactory factory = new MemoryConsumerFactory(null); + + + String topic = "testTopic"; + String consumerGroupId = "CG1"; + String clientId = "C1"; + String remoteHost="remoteHost"; + int timeoutMs = 1000; + factory.getConsumerFor(topic, consumerGroupId, clientId, timeoutMs,remoteHost); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testDropCache() { + MemoryConsumerFactory factory = new MemoryConsumerFactory(null); + + factory.dropCache(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetConsumers() { + MemoryConsumerFactory factory = new MemoryConsumerFactory(null); + + factory.getConsumers(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryMetaBrokerTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryMetaBrokerTest.java index 2c41068..60803f3 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryMetaBrokerTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryMetaBrokerTest.java @@ -1,92 +1,92 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.backends.memory.MemoryMetaBroker; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; - -public class MemoryMetaBrokerTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetAllTopics() { - MemoryMetaBroker broker = new MemoryMetaBroker(null, null); - - broker.getAllTopics(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGeTopic() { - MemoryMetaBroker broker = new MemoryMetaBroker(null, null); - - broker.getTopic("testTopic"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testCreateTopic() { - - //uncommenting this gives a Null Pointer Exception - - MemoryMetaBroker broker = new MemoryMetaBroker(null, null); - - int timeoutMs = 1000; - try { - broker.createTopic("testTopic","topic for testing", "ABCD123", 1,3, true); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; + +public class MemoryMetaBrokerTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetAllTopics() { + MemoryMetaBroker broker = new MemoryMetaBroker(null, null); + + broker.getAllTopics(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGeTopic() { + MemoryMetaBroker broker = new MemoryMetaBroker(null, null); + + broker.getTopic("testTopic"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testCreateTopic() { + + //uncommenting this gives a Null Pointer Exception + + MemoryMetaBroker broker = new MemoryMetaBroker(null, null); + + int timeoutMs = 1000; + try { + broker.createTopic("testTopic","topic for testing", "ABCD123", 1,3, true); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueuePublisherTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueuePublisherTest.java index 4522734..efb308c 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueuePublisherTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueuePublisherTest.java @@ -1,102 +1,102 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.backends.memory.MemoryQueuePublisher; - - -public class MemoryQueuePublisherTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSendBatchMessage() { - MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); - - try { - publisher.sendBatchMessageNew("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSendMessage() { - MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); - - try { - publisher.sendMessage("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSendMessages() { - MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); - - - try { - publisher.sendMessages("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueuePublisher; + + +public class MemoryQueuePublisherTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSendBatchMessage() { + MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); + + try { + publisher.sendBatchMessageNew("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSendMessage() { + MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); + + try { + publisher.sendMessage("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSendMessages() { + MemoryQueuePublisher publisher = new MemoryQueuePublisher(null, null); + + + try { + publisher.sendMessages("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueueTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueueTest.java index 637add2..126ecbb 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/MemoryQueueTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MemoryQueueTest.java @@ -1,95 +1,95 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.backends.memory.MemoryQueue; - - -public class MemoryQueueTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testCreateTopic() { - MemoryQueue queue = new MemoryQueue(); - - queue.createTopic("testTopic"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - @Test - public void testRemoveTopic() { - MemoryQueue queue = new MemoryQueue(); - - queue.removeTopic("testTopic"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testPut() { - MemoryQueue queue = new MemoryQueue(); - - try { - queue.put("testTopic", null); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGet() { - MemoryQueue queue = new MemoryQueue(); - - queue.get("testTopic", "consumer"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue; + + +public class MemoryQueueTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testCreateTopic() { + MemoryQueue queue = new MemoryQueue(); + + queue.createTopic("testTopic"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + @Test + public void testRemoveTopic() { + MemoryQueue queue = new MemoryQueue(); + + queue.removeTopic("testTopic"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testPut() { + MemoryQueue queue = new MemoryQueue(); + + try { + queue.put("testTopic", null); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGet() { + MemoryQueue queue = new MemoryQueue(); + + queue.get("testTopic", "consumer"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MessageLoggerTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MessageLoggerTest.java index 81e620c..bc2025a 100644 --- a/src/test/java/com/att/nsa/cambria/backends/memory/MessageLoggerTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/MessageLoggerTest.java @@ -1,104 +1,104 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.backends.memory; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.backends.memory.MessageLogger; - - -public class MessageLoggerTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSendMessage() { - MessageLogger dropper = new MessageLogger(); - - try { - dropper.sendMessage("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSendMessages() { - MessageLogger dropper = new MessageLogger(); - - try { - dropper.sendMessages("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSendBatchMessage() { - MessageLogger dropper = new MessageLogger(); - - try { - dropper.sendBatchMessageNew("testTopic", null); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} - - - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.backends.memory.MessageLogger; + + +public class MessageLoggerTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSendMessage() { + MessageLogger dropper = new MessageLogger(); + + try { + dropper.sendMessage("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSendMessages() { + MessageLogger dropper = new MessageLogger(); + + try { + dropper.sendMessages("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSendBatchMessage() { + MessageLogger dropper = new MessageLogger(); + + try { + dropper.sendBatchMessageNew("testTopic", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} + + + + diff --git a/src/test/java/com/att/nsa/cambria/security/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/TestRunner.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/security/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/cambria/backends/memory/TestRunner.java index 3ab0ea7..c6af86e 100644 --- a/src/test/java/com/att/nsa/cambria/security/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/backends/memory/TestRunner.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.backends.memory; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java index 7fa2bfd..2a79e92 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetEmail() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.getEmail(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetEmail() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.getEmail(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java index 763c2e7..8f77807 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest2.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest2.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest2 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetEmail() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.setEmail("rs857c@att.com"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest2 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetEmail() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.setEmail("rs857c@att.com"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java index 27f7c15..108b5fb 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest3.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest3.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest3 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetDescription() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.getDescription(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest3 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetDescription() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.getDescription(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java index 6191c70..cae2c94 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest4.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest4.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest4 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetDescription() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.setDescription("new testing description"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest4 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetDescription() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.setDescription("new testing description"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java index 99fc9aa..3e095c0 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest5.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest5.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest5 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSharedSecret() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.getSharedSecret(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest5 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSharedSecret() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.getSharedSecret(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java index ca368e3..871e2e7 100644 --- a/src/test/java/com/att/nsa/cambria/beans/ApiKeyBeanTest6.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/ApiKeyBeanTest6.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.nsa.metrics.CdmMetricsRegistry; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ApiKeyBeanTest6 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetKey() { - - ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); - - bean.getKey(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import com.att.nsa.metrics.CdmMetricsRegistry; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApiKeyBeanTest6 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetKey() { + + ApiKeyBean bean = new ApiKeyBean("hs647a@att.com", "testing bean"); + + bean.getKey(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPCambriaLimiterTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPCambriaLimiterTest.java index 8c3568f..853d770 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPCambriaLimiterTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPCambriaLimiterTest.java @@ -1,83 +1,83 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; - -public class DMaaPCambriaLimiterTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSleepMsForRate() { - - - double value = 3; - DMaaPCambriaLimiter.getSleepMsForRate(value); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testOnCall() { - - DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(1,2, 3); - try { - limiter.onCall("testTopic", "ConsumerGroup1", "client2","remoteHost"); - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testOnSend() { - - DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(3,3, 3); - limiter.onSend("testTopic", "consumerGroup1", "client1", 100); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; + +public class DMaaPCambriaLimiterTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSleepMsForRate() { + + + double value = 3; + DMaaPCambriaLimiter.getSleepMsForRate(value); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testOnCall() { + + DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(1,2, 3); + try { + limiter.onCall("testTopic", "ConsumerGroup1", "client2","remoteHost"); + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testOnSend() { + + DMaaPCambriaLimiter limiter = new DMaaPCambriaLimiter(3,3, 3); + limiter.onSend("testTopic", "consumerGroup1", "client1", 100); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest.java index 784b97b..9a67673 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest.java @@ -1,53 +1,53 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetBatchID() { - - DMaaPContext.getBatchID(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetBatchID() { + + DMaaPContext.getBatchID(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest2.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest2.java index 88baf58..1366911 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest2.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest2.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest2 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetRequest() { - - DMaaPContext context = new DMaaPContext(); - - context.getRequest(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest2 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetRequest() { + + DMaaPContext context = new DMaaPContext(); + + context.getRequest(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest3.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest3.java index b6b12b0..0c00db0 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest3.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest3.java @@ -1,57 +1,57 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest3 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetResponse() { - - DMaaPContext context = new DMaaPContext(); - - context.getResponse(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest3 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetResponse() { + + DMaaPContext context = new DMaaPContext(); + + context.getResponse(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest4.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest4.java index 95fbeef..23f1ea2 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest4.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest4.java @@ -1,60 +1,60 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest4 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSession() { - - DMaaPContext context = new DMaaPContext(); - MockHttpServletRequest request = new MockHttpServletRequest(); - context.setRequest(request); - - context.getSession(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest4 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSession() { + + DMaaPContext context = new DMaaPContext(); + MockHttpServletRequest request = new MockHttpServletRequest(); + context.setRequest(request); + + context.getSession(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest5.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest5.java index 2b2c9e1..4ec03fe 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest5.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest5.java @@ -1,57 +1,57 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest5 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetConfigReader() { - - DMaaPContext context = new DMaaPContext(); - - context.getConfigReader(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest5 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetConfigReader() { + + DMaaPContext context = new DMaaPContext(); + + context.getConfigReader(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest6.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest6.java index b87021d..982cffb 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPContextTest6.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPContextTest6.java @@ -1,57 +1,57 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; - -public class DMaaPContextTest6 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetConsumerRequestTime() { - - DMaaPContext context = new DMaaPContext(); - - context.getConsumerRequestTime(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; + +public class DMaaPContextTest6 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetConsumerRequestTime() { + + DMaaPContext context = new DMaaPContext(); + + context.getConsumerRequestTime(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPKafkaMetaBrokerTest.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPKafkaMetaBrokerTest.java index 67ade96..35f3064 100644 --- a/src/test/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBrokerTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/DMaaPKafkaMetaBrokerTest.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package com.att.nsa.cambria.beans; + package org.onap.dmaap.mr.cambria.beans; import static org.junit.Assert.assertTrue; @@ -37,13 +37,13 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import org.apache.kafka.clients.admin.AdminClient; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.metabroker.Broker1.TopicExistsException; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.metabroker.Broker1.TopicExistsException; import com.att.nsa.configs.ConfigDb; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.configs.ConfigPath; diff --git a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/JUnitTestSuite.java similarity index 96% rename from src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/JUnitTestSuite.java index e90675e..1589290 100644 --- a/src/test/java/com/att/nsa/cambria/beans/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/JUnitTestSuite.java @@ -1,49 +1,49 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ ApiKeyBeanTest.class, ApiKeyBeanTest2.class, ApiKeyBeanTest3.class, ApiKeyBeanTest4.class, ApiKeyBeanTest5.class, ApiKeyBeanTest6.class, - DMaaPCambriaLimiterTest.class, DMaaPContextTest.class, DMaaPContextTest2.class, - DMaaPContextTest3.class,DMaaPContextTest4.class,DMaaPContextTest5.class,DMaaPContextTest6.class, - LogDetailsTest.class, LogDetailsTest2.class,LogDetailsTest3.class,LogDetailsTest4.class,LogDetailsTest5.class,LogDetailsTest6.class, - LogDetailsTest7.class,LogDetailsTest8.class,LogDetailsTest9.class,LogDetailsTest10.class,LogDetailsTest11.class,LogDetailsTest12.class, - LogDetailsTest13.class,LogDetailsTest14.class,LogDetailsTest15.class,LogDetailsTest16.class, TopicBeanTest.class,TopicBeanTest2.class,TopicBeanTest3.class, - TopicBeanTest4.class,TopicBeanTest5.class,TopicBeanTest6.class,TopicBeanTest7.class,TopicBeanTest8.class,TopicBeanTest9.class,TopicBeanTest10.class,}) - -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ ApiKeyBeanTest.class, ApiKeyBeanTest2.class, ApiKeyBeanTest3.class, ApiKeyBeanTest4.class, ApiKeyBeanTest5.class, ApiKeyBeanTest6.class, + DMaaPCambriaLimiterTest.class, DMaaPContextTest.class, DMaaPContextTest2.class, + DMaaPContextTest3.class,DMaaPContextTest4.class,DMaaPContextTest5.class,DMaaPContextTest6.class, + LogDetailsTest.class, LogDetailsTest2.class,LogDetailsTest3.class,LogDetailsTest4.class,LogDetailsTest5.class,LogDetailsTest6.class, + LogDetailsTest7.class,LogDetailsTest8.class,LogDetailsTest9.class,LogDetailsTest10.class,LogDetailsTest11.class,LogDetailsTest12.class, + LogDetailsTest13.class,LogDetailsTest14.class,LogDetailsTest15.class,LogDetailsTest16.class, TopicBeanTest.class,TopicBeanTest2.class,TopicBeanTest3.class, + TopicBeanTest4.class,TopicBeanTest5.class,TopicBeanTest6.class,TopicBeanTest7.class,TopicBeanTest8.class,TopicBeanTest9.class,TopicBeanTest10.class,}) + +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest.java index e7c2173..8d83821 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest.java @@ -1,70 +1,70 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPublisherId() { - - LogDetails details = new LogDetails(); - - details.getPublisherId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetPublisherLogDetails(){ - - LogDetails details = new LogDetails(); - details.setTotalMessageCount(1); - details.setConsumeTimestamp("02-27-1018"); - details.setSubscriberGroupId("1"); - details.setSubscriberId("1"); - assertEquals(details.getTotalMessageCount(),1); - assertEquals(details.getConsumeTimestamp(),"02-27-1018"); - assertEquals(details.getSubscriberId(),"1"); - assertEquals(details.getSubscriberGroupId(),"1"); - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPublisherId() { + + LogDetails details = new LogDetails(); + + details.getPublisherId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetPublisherLogDetails(){ + + LogDetails details = new LogDetails(); + details.setTotalMessageCount(1); + details.setConsumeTimestamp("02-27-1018"); + details.setSubscriberGroupId("1"); + details.setSubscriberId("1"); + assertEquals(details.getTotalMessageCount(),1); + assertEquals(details.getConsumeTimestamp(),"02-27-1018"); + assertEquals(details.getSubscriberId(),"1"); + assertEquals(details.getSubscriberGroupId(),"1"); + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest10.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest10.java index 44a6e45..c80062f 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest10.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest10.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest10 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPublishTimestamp() { - - LogDetails details = new LogDetails(); - - details.getPublishTimestamp(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest10 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPublishTimestamp() { + + LogDetails details = new LogDetails(); + + details.getPublishTimestamp(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest11.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest11.java index 3a935e6..83b91cb 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest11.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest11.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest11 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetMessageLengthInBytes() { - - LogDetails details = new LogDetails(); - - details.getMessageLengthInBytes(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest11 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetMessageLengthInBytes() { + + LogDetails details = new LogDetails(); + + details.getMessageLengthInBytes(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest12.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest12.java index 1b2b3f5..214876a 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest12.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest12.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest12 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetConsumeTimestamp() { - - LogDetails details = new LogDetails(); - - details.getConsumeTimestamp(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest12 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetConsumeTimestamp() { + + LogDetails details = new LogDetails(); + + details.getConsumeTimestamp(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest13.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest13.java index a30112e..d3f6f23 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest13.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest13.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest13 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTotalMessageCount() { - - LogDetails details = new LogDetails(); - - details.getTotalMessageCount(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest13 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTotalMessageCount() { + + LogDetails details = new LogDetails(); + + details.getTotalMessageCount(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest14.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest14.java index b04573d..b3dd6b8 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest14.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest14.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest14 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testIsTransactionEnabled() { - - LogDetails details = new LogDetails(); - - details.isTransactionEnabled(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest14 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testIsTransactionEnabled() { + + LogDetails details = new LogDetails(); + + details.isTransactionEnabled(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest15.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest15.java index 8bbbb28..d3da5a0 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest15.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest15.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest15 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTransactionIdTs() { - - LogDetails details = new LogDetails(); - - details.getTransactionIdTs(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest15 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTransactionIdTs() { + + LogDetails details = new LogDetails(); + + details.getTransactionIdTs(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest16.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest16.java index eef7322..95cee27 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest16.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest16.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest16 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetServerIp() { - - LogDetails details = new LogDetails(); - - details.getServerIp(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest16 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetServerIp() { + + LogDetails details = new LogDetails(); + + details.getServerIp(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest17.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest17.java index c19b46d..39104be 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest17.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest17.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest17 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPublisherLogDetails() { - - LogDetails details = new LogDetails(); - - details.getPublisherLogDetails(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest17 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPublisherLogDetails() { + + LogDetails details = new LogDetails(); + + details.getPublisherLogDetails(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest18.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest18.java index e894ae4..031b4d9 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest18.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest18.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest18 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPublisherLogDetails() { - - LogDetails details = new LogDetails(); - - details.getPublisherLogDetails(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest18 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPublisherLogDetails() { + + LogDetails details = new LogDetails(); + + details.getPublisherLogDetails(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest2.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest2.java index acb818d..7b951d4 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest2.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest2.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest2 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTransactionId() { - - LogDetails details = new LogDetails(); - - details.getTransactionId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest2 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTransactionId() { + + LogDetails details = new LogDetails(); + + details.getTransactionId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest3.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest3.java index b9b664d..fbb0ced 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest3.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest3.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest3 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTopicId() { - - LogDetails details = new LogDetails(); - - details.getTopicId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest3 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTopicId() { + + LogDetails details = new LogDetails(); + + details.getTopicId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest4.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest4.java index b17aadc..baee017 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest4.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest4.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest4 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSubscriberGroupId() { - - LogDetails details = new LogDetails(); - - details.getSubscriberGroupId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest4 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSubscriberGroupId() { + + LogDetails details = new LogDetails(); + + details.getSubscriberGroupId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest5.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest5.java index 3beeab8..36136e4 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest5.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest5.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest5 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSubscriberId() { - - LogDetails details = new LogDetails(); - - details.getSubscriberId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest5 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSubscriberId() { + + LogDetails details = new LogDetails(); + + details.getSubscriberId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest6.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest6.java index 98d85d8..ca583f9 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest6.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest6.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest6 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPublisherIp() { - - LogDetails details = new LogDetails(); - - details.getPublisherIp(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest6 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPublisherIp() { + + LogDetails details = new LogDetails(); + + details.getPublisherIp(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest7.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest7.java index 8753762..da03335 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest7.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest7.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest7 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetMessageBatchId() { - - LogDetails details = new LogDetails(); - - details.getMessageBatchId(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest7 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetMessageBatchId() { + + LogDetails details = new LogDetails(); + + details.getMessageBatchId(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest8.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest8.java index d88ed11..d67bee6 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest8.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest8.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest8 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetMessageTimestamp() { - - LogDetails details = new LogDetails(); - - details.getMessageTimestamp(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest8 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetMessageTimestamp() { + + LogDetails details = new LogDetails(); + + details.getMessageTimestamp(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest9.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest9.java index b47b152..afd1913 100644 --- a/src/test/java/com/att/nsa/cambria/beans/LogDetailsTest9.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/LogDetailsTest9.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.LogDetails; - -public class LogDetailsTest9 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetMessageSequence() { - - LogDetails details = new LogDetails(); - - details.getMessageSequence(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class LogDetailsTest9 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetMessageSequence() { + + LogDetails details = new LogDetails(); + + details.getMessageSequence(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/beans/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TestRunner.java new file mode 100644 index 0000000..f65bdfa --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest.java index 5a60767..844fc08 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTopicName() { - - TopicBean bean = new TopicBean(); - - bean.getTopicName(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTopicName() { + + TopicBean bean = new TopicBean(); + + bean.getTopicName(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest10.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest10.java index 4ebe601..e8e343d 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest10.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest10.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest10 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetTransactionEnabled() { - - TopicBean bean = new TopicBean(); - bean.setTransactionEnabled(true); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest10 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetTransactionEnabled() { + + TopicBean bean = new TopicBean(); + bean.setTransactionEnabled(true); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest2.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest2.java index e6958de..789df84 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest2.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest2.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest2 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetTopicName() { - - TopicBean bean = new TopicBean(); - bean.setTopicName("testTopic"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest2 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetTopicName() { + + TopicBean bean = new TopicBean(); + bean.setTopicName("testTopic"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest3.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest3.java index 61dd6f9..9d2819d 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest3.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest3.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest3 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPartitionCount() { - - TopicBean bean = new TopicBean(); - bean.getPartitionCount(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest3 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetPartitionCount() { + + TopicBean bean = new TopicBean(); + bean.getPartitionCount(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest4.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest4.java index 894f959..15dd5e5 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest4.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest4.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest4 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetPartitionCount() { - - TopicBean bean = new TopicBean(); - bean.setPartitionCount(8); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest4 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetPartitionCount() { + + TopicBean bean = new TopicBean(); + bean.setPartitionCount(8); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest5.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest5.java index bd69e2e..85ec6f9 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest5.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest5.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest5 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetReplicationCount() { - - TopicBean bean = new TopicBean(); - bean.getReplicationCount(); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest5 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetReplicationCount() { + + TopicBean bean = new TopicBean(); + bean.getReplicationCount(); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest6.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest6.java index db68525..819431a 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest6.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest6.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest6 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetReplicationCount() { - - TopicBean bean = new TopicBean(); - bean.setReplicationCount(3); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest6 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetReplicationCount() { + + TopicBean bean = new TopicBean(); + bean.setReplicationCount(3); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest7.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest7.java index 3a6fdb6..0a90aa6 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest7.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest7.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest7 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testIsTransactionEnabled() { - - TopicBean bean = new TopicBean(); - bean.isTransactionEnabled(); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest7 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testIsTransactionEnabled() { + + TopicBean bean = new TopicBean(); + bean.isTransactionEnabled(); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest8.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest8.java index 7cf8049..8ecc561 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest8.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest8.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest8 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetTopicDescription() { - - TopicBean bean = new TopicBean(); - bean.getTopicDescription(); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest8 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetTopicDescription() { + + TopicBean bean = new TopicBean(); + bean.getTopicDescription(); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest9.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java rename to src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest9.java index c6487e1..85c566c 100644 --- a/src/test/java/com/att/nsa/cambria/beans/TopicBeanTest9.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/beans/TopicBeanTest9.java @@ -1,55 +1,55 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.beans; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.TopicBean; - -public class TopicBeanTest9 { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSetTopicDescription() { - - TopicBean bean = new TopicBean(); - bean.setTopicDescription("testing topic"); - - /* String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True"));*/ - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.beans; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.TopicBean; + +public class TopicBeanTest9 { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSetTopicDescription() { + + TopicBean bean = new TopicBean(); + bean.setTopicDescription("testing topic"); + + /* String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True"));*/ + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java b/src/test/java/org/onap/dmaap/mr/cambria/embed/EmbedConfigurationReader.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java rename to src/test/java/org/onap/dmaap/mr/cambria/embed/EmbedConfigurationReader.java index 228664b..892d969 100644 --- a/src/test/java/com/att/nsa/cambria/embed/EmbedConfigurationReader.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/embed/EmbedConfigurationReader.java @@ -1,169 +1,169 @@ -/******************************************************************************* - * ============LICENSE_START======================================================= - * org.onap.dmaap - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * - *******************************************************************************/ - -package com.att.nsa.cambria.embed; - -import java.io.File; -import java.util.Arrays; -import java.util.Map; -import java.util.Properties; - -import org.apache.commons.io.FileUtils; -import org.apache.curator.framework.CuratorFramework; - -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.backends.kafka.KafkaPublisher; -import com.att.dmf.mr.backends.memory.MemoryMetaBroker; -import com.att.dmf.mr.backends.memory.MemoryQueue; -import org.apache.kafka.clients.admin.AdminClient; -import org.apache.kafka.clients.admin.AdminClientConfig; -import org.apache.kafka.clients.admin.CreateTopicsResult; -import org.apache.kafka.clients.admin.NewTopic; -import org.apache.kafka.common.KafkaFuture; -import com.att.dmf.mr.beans.DMaaPKafkaConsumerFactory; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.DMaaPMetricsSet; -import com.att.dmf.mr.beans.DMaaPZkClient; -import com.att.dmf.mr.beans.DMaaPZkConfigDb; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPCuratorFactory; -import com.att.dmf.mr.utils.PropertyReader; -import com.att.nsa.security.db.BaseNsaApiDbImpl; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; -import com.att.nsa.security.db.simple.NsaSimpleApiKeyFactory; - - -public class EmbedConfigurationReader { - private static final String DEFAULT_KAFKA_LOG_DIR = "/kafka_embedded"; - public static final String TEST_TOPIC = "testTopic"; - private static final int BROKER_ID = 0; - private static final int BROKER_PORT = 5000; - private static final String LOCALHOST_BROKER = String.format("localhost:%d", BROKER_PORT); - - private static final String DEFAULT_ZOOKEEPER_LOG_DIR = "/zookeeper"; - private static final int ZOOKEEPER_PORT = 2000; - private static final String ZOOKEEPER_HOST = String.format("localhost:%d", ZOOKEEPER_PORT); - - private static final String groupId = "groupID"; - String dir; - private AdminClient fKafkaAdminClient; - KafkaLocal kafkaLocal; - - public void setUp() throws Exception { - - ClassLoader classLoader = getClass().getClassLoader(); - AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile())); - - Properties kafkaProperties; - Properties zkProperties; - - try { - //load properties - dir = new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile()).getParent(); - kafkaProperties = getKafkaProperties(dir + DEFAULT_KAFKA_LOG_DIR, BROKER_PORT, BROKER_ID); - zkProperties = getZookeeperProperties(ZOOKEEPER_PORT,dir + DEFAULT_ZOOKEEPER_LOG_DIR); - - //start kafkaLocalServer - kafkaLocal = new KafkaLocal(kafkaProperties, zkProperties); - - Map map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop); - map.put(CambriaConstants.kSetting_ZkConfigDbServers, ZOOKEEPER_HOST); - map.put("kafka.client.zookeeper", ZOOKEEPER_HOST); - map.put("kafka.metadata.broker.list", LOCALHOST_BROKER); - - DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader()); - - final Properties props = new Properties (); - props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092" ); - props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret'"); - props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT"); - props.put("sasl.mechanism", "PLAIN"); - fKafkaAdminClient = AdminClient.create ( props ); - - // if(!AdminUtils.topicExists(dMaaPZkClient, TEST_TOPIC)) - // AdminUtils.createTopic(dMaaPZkClient, TEST_TOPIC, 3, 1, new Properties()); - final NewTopic topicRequest = new NewTopic ( TEST_TOPIC, 3, new Integer(1).shortValue () ); - fKafkaAdminClient.createTopics ( Arrays.asList ( topicRequest ) ); - Thread.sleep(5000); - } catch (Exception e){ - e.printStackTrace(System.out); - } - } - - private static Properties getKafkaProperties(String logDir, int port, int brokerId) { - Properties properties = new Properties(); - properties.put("port", port + ""); - properties.put("broker.id", brokerId + ""); - properties.put("log.dir", logDir); - properties.put("zookeeper.connect", ZOOKEEPER_HOST); - properties.put("default.replication.factor", "1"); - properties.put("delete.topic.enable", "true"); - properties.put("consumer.timeout.ms", -1); - return properties; - } - - private static Properties getZookeeperProperties(int port, String zookeeperDir) { - Properties properties = new Properties(); - properties.put("clientPort", port + ""); - properties.put("dataDir", zookeeperDir); - return properties; - } - - public void tearDown() throws Exception { - DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader()); - if(fKafkaAdminClient!=null) - fKafkaAdminClient.deleteTopics(Arrays.asList(TEST_TOPIC)); - //AdminUtils.deleteTopic(dMaaPZkClient, TEST_TOPIC); - //dMaaPZkClient.delete(dir + DEFAULT_KAFKA_LOG_DIR); - //dMaaPZkClient.delete(dir + DEFAULT_ZOOKEEPER_LOG_DIR); - kafkaLocal.stop(); - FileUtils.cleanDirectory(new File(dir + DEFAULT_KAFKA_LOG_DIR)); - } - - - public ConfigurationReader buildConfigurationReader() throws Exception { - - setUp(); - - PropertyReader propertyReader = new PropertyReader(); - DMaaPMetricsSet dMaaPMetricsSet = new DMaaPMetricsSet(propertyReader); - DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(propertyReader); - DMaaPZkConfigDb dMaaPZkConfigDb = new DMaaPZkConfigDb(dMaaPZkClient, propertyReader); - CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); - DMaaPKafkaConsumerFactory dMaaPKafkaConsumerFactory = new DMaaPKafkaConsumerFactory(dMaaPMetricsSet, curatorFramework,null); - MemoryQueue memoryQueue = new MemoryQueue(); - MemoryMetaBroker memoryMetaBroker = new MemoryMetaBroker(memoryQueue, dMaaPZkConfigDb); - BaseNsaApiDbImpl baseNsaApiDbImpl = new BaseNsaApiDbImpl<>(dMaaPZkConfigDb, new NsaSimpleApiKeyFactory()); - DMaaPAuthenticator dMaaPAuthenticator = new DMaaPAuthenticatorImpl<>(baseNsaApiDbImpl); - KafkaPublisher kafkaPublisher = new KafkaPublisher(propertyReader); - DMaaPKafkaMetaBroker dMaaPKafkaMetaBroker = new DMaaPKafkaMetaBroker(propertyReader, dMaaPZkClient, dMaaPZkConfigDb); - - return new ConfigurationReader(propertyReader, - dMaaPMetricsSet, dMaaPZkClient, dMaaPZkConfigDb, kafkaPublisher, - curatorFramework, dMaaPKafkaConsumerFactory, dMaaPKafkaMetaBroker, - memoryQueue, memoryMetaBroker, baseNsaApiDbImpl, dMaaPAuthenticator); - - } -} +/******************************************************************************* + * ============LICENSE_START======================================================= + * org.onap.dmaap + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * + *******************************************************************************/ + + package org.onap.dmaap.mr.cambria.embed; + +import java.io.File; +import java.util.Arrays; +import java.util.Map; +import java.util.Properties; + +import org.apache.commons.io.FileUtils; +import org.apache.curator.framework.CuratorFramework; + +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaPublisher; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue; +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.CreateTopicsResult; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.common.KafkaFuture; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.DMaaPMetricsSet; +import org.onap.dmaap.dmf.mr.beans.DMaaPZkClient; +import org.onap.dmaap.dmf.mr.beans.DMaaPZkConfigDb; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPCuratorFactory; +import org.onap.dmaap.dmf.mr.utils.PropertyReader; +import com.att.nsa.security.db.BaseNsaApiDbImpl; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; +import com.att.nsa.security.db.simple.NsaSimpleApiKeyFactory; + + +public class EmbedConfigurationReader { + private static final String DEFAULT_KAFKA_LOG_DIR = "/kafka_embedded"; + public static final String TEST_TOPIC = "testTopic"; + private static final int BROKER_ID = 0; + private static final int BROKER_PORT = 5000; + private static final String LOCALHOST_BROKER = String.format("localhost:%d", BROKER_PORT); + + private static final String DEFAULT_ZOOKEEPER_LOG_DIR = "/zookeeper"; + private static final int ZOOKEEPER_PORT = 2000; + private static final String ZOOKEEPER_HOST = String.format("localhost:%d", ZOOKEEPER_PORT); + + private static final String groupId = "groupID"; + String dir; + private AdminClient fKafkaAdminClient; + KafkaLocal kafkaLocal; + + public void setUp() throws Exception { + + ClassLoader classLoader = getClass().getClassLoader(); + AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile())); + + Properties kafkaProperties; + Properties zkProperties; + + try { + //load properties + dir = new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile()).getParent(); + kafkaProperties = getKafkaProperties(dir + DEFAULT_KAFKA_LOG_DIR, BROKER_PORT, BROKER_ID); + zkProperties = getZookeeperProperties(ZOOKEEPER_PORT,dir + DEFAULT_ZOOKEEPER_LOG_DIR); + + //start kafkaLocalServer + kafkaLocal = new KafkaLocal(kafkaProperties, zkProperties); + + Map map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop); + map.put(CambriaConstants.kSetting_ZkConfigDbServers, ZOOKEEPER_HOST); + map.put("kafka.client.zookeeper", ZOOKEEPER_HOST); + map.put("kafka.metadata.broker.list", LOCALHOST_BROKER); + + DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader()); + + final Properties props = new Properties (); + props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092" ); + props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='admin_secret'"); + props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT"); + props.put("sasl.mechanism", "PLAIN"); + fKafkaAdminClient = AdminClient.create ( props ); + + // if(!AdminUtils.topicExists(dMaaPZkClient, TEST_TOPIC)) + // AdminUtils.createTopic(dMaaPZkClient, TEST_TOPIC, 3, 1, new Properties()); + final NewTopic topicRequest = new NewTopic ( TEST_TOPIC, 3, new Integer(1).shortValue () ); + fKafkaAdminClient.createTopics ( Arrays.asList ( topicRequest ) ); + Thread.sleep(5000); + } catch (Exception e){ + e.printStackTrace(System.out); + } + } + + private static Properties getKafkaProperties(String logDir, int port, int brokerId) { + Properties properties = new Properties(); + properties.put("port", port + ""); + properties.put("broker.id", brokerId + ""); + properties.put("log.dir", logDir); + properties.put("zookeeper.connect", ZOOKEEPER_HOST); + properties.put("default.replication.factor", "1"); + properties.put("delete.topic.enable", "true"); + properties.put("consumer.timeout.ms", -1); + return properties; + } + + private static Properties getZookeeperProperties(int port, String zookeeperDir) { + Properties properties = new Properties(); + properties.put("clientPort", port + ""); + properties.put("dataDir", zookeeperDir); + return properties; + } + + public void tearDown() throws Exception { + DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(new PropertyReader()); + if(fKafkaAdminClient!=null) + fKafkaAdminClient.deleteTopics(Arrays.asList(TEST_TOPIC)); + //AdminUtils.deleteTopic(dMaaPZkClient, TEST_TOPIC); + //dMaaPZkClient.delete(dir + DEFAULT_KAFKA_LOG_DIR); + //dMaaPZkClient.delete(dir + DEFAULT_ZOOKEEPER_LOG_DIR); + kafkaLocal.stop(); + FileUtils.cleanDirectory(new File(dir + DEFAULT_KAFKA_LOG_DIR)); + } + + + public ConfigurationReader buildConfigurationReader() throws Exception { + + setUp(); + + PropertyReader propertyReader = new PropertyReader(); + DMaaPMetricsSet dMaaPMetricsSet = new DMaaPMetricsSet(propertyReader); + DMaaPZkClient dMaaPZkClient = new DMaaPZkClient(propertyReader); + DMaaPZkConfigDb dMaaPZkConfigDb = new DMaaPZkConfigDb(dMaaPZkClient, propertyReader); + CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); + DMaaPKafkaConsumerFactory dMaaPKafkaConsumerFactory = new DMaaPKafkaConsumerFactory(dMaaPMetricsSet, curatorFramework,null); + MemoryQueue memoryQueue = new MemoryQueue(); + MemoryMetaBroker memoryMetaBroker = new MemoryMetaBroker(memoryQueue, dMaaPZkConfigDb); + BaseNsaApiDbImpl baseNsaApiDbImpl = new BaseNsaApiDbImpl<>(dMaaPZkConfigDb, new NsaSimpleApiKeyFactory()); + DMaaPAuthenticator dMaaPAuthenticator = new DMaaPAuthenticatorImpl<>(baseNsaApiDbImpl); + KafkaPublisher kafkaPublisher = new KafkaPublisher(propertyReader); + DMaaPKafkaMetaBroker dMaaPKafkaMetaBroker = new DMaaPKafkaMetaBroker(propertyReader, dMaaPZkClient, dMaaPZkConfigDb); + + return new ConfigurationReader(propertyReader, + dMaaPMetricsSet, dMaaPZkClient, dMaaPZkConfigDb, kafkaPublisher, + curatorFramework, dMaaPKafkaConsumerFactory, dMaaPKafkaMetaBroker, + memoryQueue, memoryMetaBroker, baseNsaApiDbImpl, dMaaPAuthenticator); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java b/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java rename to src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java index b71976e..7cdd6b1 100644 --- a/src/test/java/com/att/nsa/cambria/embed/KafkaLocal.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/embed/KafkaLocal.java @@ -1,58 +1,58 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.embed; - -import java.io.IOException; -import java.util.Properties; - -import kafka.server.KafkaConfig; -import kafka.server.KafkaServerStartable; - - -public class KafkaLocal { - - public KafkaServerStartable kafka; - public ZooKeeperLocal zookeeper; - - public KafkaLocal(Properties kafkaProperties, Properties zkProperties) throws IOException, InterruptedException{ - KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties); - - //start local zookeeper - System.out.println("starting local zookeeper..."); - zookeeper = new ZooKeeperLocal(zkProperties); - System.out.println("done"); - - //start local kafka broker - kafka = new KafkaServerStartable(kafkaConfig); - System.out.println("starting local kafka broker..."); - kafka.startup(); - System.out.println("done"); - } - - - public void stop(){ - //stop kafka broker - System.out.println("stopping kafka..."); - kafka.shutdown(); - System.out.println("done"); - } - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.embed; + +import java.io.IOException; +import java.util.Properties; + +import kafka.server.KafkaConfig; +import kafka.server.KafkaServerStartable; + + +public class KafkaLocal { + + public KafkaServerStartable kafka; + public ZooKeeperLocal zookeeper; + + public KafkaLocal(Properties kafkaProperties, Properties zkProperties) throws IOException, InterruptedException{ + KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties); + + //start local zookeeper + System.out.println("starting local zookeeper..."); + zookeeper = new ZooKeeperLocal(zkProperties); + System.out.println("done"); + + //start local kafka broker + kafka = new KafkaServerStartable(kafkaConfig); + System.out.println("starting local kafka broker..."); + kafka.startup(); + System.out.println("done"); + } + + + public void stop(){ + //stop kafka broker + System.out.println("stopping kafka..."); + kafka.shutdown(); + System.out.println("done"); + } + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java b/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java rename to src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java index b107826..57d87c7 100644 --- a/src/test/java/com/att/nsa/cambria/embed/ZooKeeperLocal.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/embed/ZooKeeperLocal.java @@ -1,59 +1,59 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.embed; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Properties; - -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; - -public class ZooKeeperLocal { - - ZooKeeperServerMain zooKeeperServer; - - public ZooKeeperLocal(Properties zkProperties) throws FileNotFoundException, IOException{ - QuorumPeerConfig quorumConfiguration = new QuorumPeerConfig(); - try { - quorumConfiguration.parseProperties(zkProperties); - } catch(Exception e) { - throw new RuntimeException(e); - } - - zooKeeperServer = new ZooKeeperServerMain(); - final ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumConfiguration); - - - new Thread() { - public void run() { - try { - zooKeeperServer.runFromConfig(configuration); - } catch (IOException e) { - System.out.println("ZooKeeper Failed"); - e.printStackTrace(System.err); - } - } - }.start(); - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.embed; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; + +import org.apache.zookeeper.server.ServerConfig; +import org.apache.zookeeper.server.ZooKeeperServerMain; +import org.apache.zookeeper.server.quorum.QuorumPeerConfig; + +public class ZooKeeperLocal { + + ZooKeeperServerMain zooKeeperServer; + + public ZooKeeperLocal(Properties zkProperties) throws FileNotFoundException, IOException{ + QuorumPeerConfig quorumConfiguration = new QuorumPeerConfig(); + try { + quorumConfiguration.parseProperties(zkProperties); + } catch(Exception e) { + throw new RuntimeException(e); + } + + zooKeeperServer = new ZooKeeperServerMain(); + final ServerConfig configuration = new ServerConfig(); + configuration.readFrom(quorumConfiguration); + + + new Thread() { + public void run() { + try { + zooKeeperServer.runFromConfig(configuration); + } catch (IOException e) { + System.out.println("ZooKeeper Failed"); + e.printStackTrace(System.err); + } + } + }.start(); + } +} diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPCambriaExceptionMapperTest.java similarity index 84% rename from src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPCambriaExceptionMapperTest.java index b10c565..2a764f2 100644 --- a/src/test/java/com/att/nsa/cambria/exception/DMaaPCambriaExceptionMapperTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPCambriaExceptionMapperTest.java @@ -1,60 +1,60 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import static org.junit.Assert.*; -import com.att.dmf.mr.exception.DMaaPCambriaExceptionMapper; -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class DMaaPCambriaExceptionMapperTest { - - @Before - public void setUp() throws Exception { - DMaaPCambriaExceptionMapper exception = new DMaaPCambriaExceptionMapper(); - } - - @After - public void tearDown() throws Exception { - - } - - - @Test - public void testToResponse() { - - DMaaPCambriaExceptionMapper mapper = new DMaaPCambriaExceptionMapper(); - - try { - mapper.toResponse(null); - } catch (NullPointerException e) { - assertTrue(true); - } - - - - } - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import static org.junit.Assert.*; +import org.onap.dmaap.dmf.mr.exception.DMaaPCambriaExceptionMapper; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class DMaaPCambriaExceptionMapperTest { + + @Before + public void setUp() throws Exception { + DMaaPCambriaExceptionMapper exception = new DMaaPCambriaExceptionMapper(); + } + + @After + public void tearDown() throws Exception { + + } + + + @Test + public void testToResponse() { + + DMaaPCambriaExceptionMapper mapper = new DMaaPCambriaExceptionMapper(); + + try { + mapper.toResponse(null); + } catch (NullPointerException e) { + assertTrue(true); + } + + + + } + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPErrorMessagesTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPErrorMessagesTest.java index 1a97bb8..977f8ab 100644 --- a/src/test/java/com/att/nsa/cambria/exception/DMaaPErrorMessagesTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPErrorMessagesTest.java @@ -1,372 +1,372 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import static org.junit.Assert.*; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class DMaaPErrorMessagesTest { - - @Before - public void setUp() throws Exception { - - } - - @After - public void tearDown() throws Exception { - - } - - - @Test - public void testGetMsgSizeExceeds() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getMsgSizeExceeds(); - assertTrue(true); - - } - - @Test - public void testSetMsgSizeExceeds() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setMsgSizeExceeds("200"); - assertTrue(true); - - } - - @Test - public void testGetNotFound() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getNotFound(); - assertTrue(true); - - } - - @Test - public void testSetNotFound() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setNotFound("not found"); - assertTrue(true); - - } - - @Test - public void testGetServerUnav() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getServerUnav(); - assertTrue(true); - - } - - @Test - public void testSetServerUnav() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setServerUnav("server1"); - assertTrue(true); - - } - - @Test - public void testGetMethodNotAllowed() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getMethodNotAllowed(); - assertTrue(true); - - } - - @Test - public void testSetMethodNotAllowed() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setMethodNotAllowed("server2"); - assertTrue(true); - - } - - - @Test - public void testGetBadRequest() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getBadRequest(); - assertTrue(true); - - } - - @Test - public void testSetBadRequest() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setBadRequest("badRequest"); - assertTrue(true); - - } - - @Test - public void testGetNwTimeout() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getNwTimeout(); - assertTrue(true); - - } - - @Test - public void testSetNwTimeout() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setNwTimeout("12:00:00"); - assertTrue(true); - - } - - @Test - public void testGetNotPermitted1() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getNotPermitted1(); - assertTrue(true); - - } - - @Test - public void testSetNotPermitted1() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setNotPermitted1("not permitted"); - assertTrue(true); - - } - - @Test - public void testGetNotPermitted2() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getNotPermitted2(); - assertTrue(true); - - } - - @Test - public void testSetNotPermitted2() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setNotPermitted2("not permitted2"); - assertTrue(true); - - } - - @Test - public void testGetTopicsfailure() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getTopicsfailure(); - assertTrue(true); - - } - - @Test - public void testSetTopicsfailure() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setTopicsfailure("failure"); - assertTrue(true); - - } - - @Test - public void testGetTopicDetailsFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getTopicDetailsFail(); - assertTrue(true); - - } - - @Test - public void testSetTopicDetailsFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setTopicDetailsFail("topic details fail"); - assertTrue(true); - - } - - @Test - public void testGetCreateTopicFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getCreateTopicFail(); - assertTrue(true); - - } - - @Test - public void testSetCreateTopicFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setCreateTopicFail("topic details fail"); - assertTrue(true); - - } - - @Test - public void testGetIncorrectJson() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getIncorrectJson(); - assertTrue(true); - - } - - @Test - public void testSetIncorrectJson() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setIncorrectJson("incorrect Json"); - assertTrue(true); - - } - - @Test - public void testGetDeleteTopicFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getDeleteTopicFail(); - assertTrue(true); - - } - - @Test - public void testSetDeleteTopicFail() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setDeleteTopicFail("delete tpic fail"); - assertTrue(true); - - } - - @Test - public void testGetConsumeMsgError() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getConsumeMsgError(); - assertTrue(true); - - } - - @Test - public void testSetConsumeMsgError() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setConsumeMsgError("consume message error"); - assertTrue(true); - - } - - - @Test - public void testGetPublishMsgError() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getPublishMsgError(); - assertTrue(true); - - } - - @Test - public void testSetPublishMsgError() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setPublishMsgError("publish message error"); - assertTrue(true); - - } - - @Test - public void testGetPublishMsgCount() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getPublishMsgCount(); - assertTrue(true); - - } - - @Test - public void testSetPublishMsgCount() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setPublishMsgCount("200"); - assertTrue(true); - - } - - @Test - public void testGetAuthFailure() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getAuthFailure(); - assertTrue(true); - - } - - @Test - public void testSetAuthFailure() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setAuthFailure("auth failure"); - assertTrue(true); - - } - - @Test - public void testGetTopicNotExist() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.getTopicNotExist(); - assertTrue(true); - - } - - @Test - public void testSetTopicNotExist() { - - DMaaPErrorMessages msg = new DMaaPErrorMessages(); - msg.setTopicNotExist("toopic doesn't exist"); - assertTrue(true); - - } - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import static org.junit.Assert.*; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class DMaaPErrorMessagesTest { + + @Before + public void setUp() throws Exception { + + } + + @After + public void tearDown() throws Exception { + + } + + + @Test + public void testGetMsgSizeExceeds() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getMsgSizeExceeds(); + assertTrue(true); + + } + + @Test + public void testSetMsgSizeExceeds() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setMsgSizeExceeds("200"); + assertTrue(true); + + } + + @Test + public void testGetNotFound() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getNotFound(); + assertTrue(true); + + } + + @Test + public void testSetNotFound() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setNotFound("not found"); + assertTrue(true); + + } + + @Test + public void testGetServerUnav() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getServerUnav(); + assertTrue(true); + + } + + @Test + public void testSetServerUnav() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setServerUnav("server1"); + assertTrue(true); + + } + + @Test + public void testGetMethodNotAllowed() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getMethodNotAllowed(); + assertTrue(true); + + } + + @Test + public void testSetMethodNotAllowed() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setMethodNotAllowed("server2"); + assertTrue(true); + + } + + + @Test + public void testGetBadRequest() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getBadRequest(); + assertTrue(true); + + } + + @Test + public void testSetBadRequest() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setBadRequest("badRequest"); + assertTrue(true); + + } + + @Test + public void testGetNwTimeout() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getNwTimeout(); + assertTrue(true); + + } + + @Test + public void testSetNwTimeout() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setNwTimeout("12:00:00"); + assertTrue(true); + + } + + @Test + public void testGetNotPermitted1() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getNotPermitted1(); + assertTrue(true); + + } + + @Test + public void testSetNotPermitted1() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setNotPermitted1("not permitted"); + assertTrue(true); + + } + + @Test + public void testGetNotPermitted2() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getNotPermitted2(); + assertTrue(true); + + } + + @Test + public void testSetNotPermitted2() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setNotPermitted2("not permitted2"); + assertTrue(true); + + } + + @Test + public void testGetTopicsfailure() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getTopicsfailure(); + assertTrue(true); + + } + + @Test + public void testSetTopicsfailure() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setTopicsfailure("failure"); + assertTrue(true); + + } + + @Test + public void testGetTopicDetailsFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getTopicDetailsFail(); + assertTrue(true); + + } + + @Test + public void testSetTopicDetailsFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setTopicDetailsFail("topic details fail"); + assertTrue(true); + + } + + @Test + public void testGetCreateTopicFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getCreateTopicFail(); + assertTrue(true); + + } + + @Test + public void testSetCreateTopicFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setCreateTopicFail("topic details fail"); + assertTrue(true); + + } + + @Test + public void testGetIncorrectJson() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getIncorrectJson(); + assertTrue(true); + + } + + @Test + public void testSetIncorrectJson() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setIncorrectJson("incorrect Json"); + assertTrue(true); + + } + + @Test + public void testGetDeleteTopicFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getDeleteTopicFail(); + assertTrue(true); + + } + + @Test + public void testSetDeleteTopicFail() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setDeleteTopicFail("delete tpic fail"); + assertTrue(true); + + } + + @Test + public void testGetConsumeMsgError() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getConsumeMsgError(); + assertTrue(true); + + } + + @Test + public void testSetConsumeMsgError() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setConsumeMsgError("consume message error"); + assertTrue(true); + + } + + + @Test + public void testGetPublishMsgError() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getPublishMsgError(); + assertTrue(true); + + } + + @Test + public void testSetPublishMsgError() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setPublishMsgError("publish message error"); + assertTrue(true); + + } + + @Test + public void testGetPublishMsgCount() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getPublishMsgCount(); + assertTrue(true); + + } + + @Test + public void testSetPublishMsgCount() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setPublishMsgCount("200"); + assertTrue(true); + + } + + @Test + public void testGetAuthFailure() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getAuthFailure(); + assertTrue(true); + + } + + @Test + public void testSetAuthFailure() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setAuthFailure("auth failure"); + assertTrue(true); + + } + + @Test + public void testGetTopicNotExist() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.getTopicNotExist(); + assertTrue(true); + + } + + @Test + public void testSetTopicNotExist() { + + DMaaPErrorMessages msg = new DMaaPErrorMessages(); + msg.setTopicNotExist("toopic doesn't exist"); + assertTrue(true); + + } + + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPWebExceptionMapperTest.java similarity index 84% rename from src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPWebExceptionMapperTest.java index 0f53416..64d1c7c 100644 --- a/src/test/java/com/att/nsa/cambria/exception/DMaaPWebExceptionMapperTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/DMaaPWebExceptionMapperTest.java @@ -1,60 +1,60 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import static org.junit.Assert.*; -import com.att.dmf.mr.exception.DMaaPWebExceptionMapper; -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class DMaaPWebExceptionMapperTest { - - @Before - public void setUp() throws Exception { - - } - - @After - public void tearDown() throws Exception { - - } - - - @Test - public void testToResponse() { - - DMaaPWebExceptionMapper msg = new DMaaPWebExceptionMapper(); - - try { - msg.toResponse(null); - } catch (Exception e) { - assertTrue(true); - } - - - - } - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import static org.junit.Assert.*; +import org.onap.dmaap.dmf.mr.exception.DMaaPWebExceptionMapper; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class DMaaPWebExceptionMapperTest { + + @Before + public void setUp() throws Exception { + + } + + @After + public void tearDown() throws Exception { + + } + + + @Test + public void testToResponse() { + + DMaaPWebExceptionMapper msg = new DMaaPWebExceptionMapper(); + + try { + msg.toResponse(null); + } catch (Exception e) { + assertTrue(true); + } + + + + } + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/ErrorResponseTest.java similarity index 88% rename from src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/exception/ErrorResponseTest.java index aa463a7..66242dc 100644 --- a/src/test/java/com/att/nsa/cambria/exception/ErrorResponseTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/ErrorResponseTest.java @@ -1,146 +1,146 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import static org.junit.Assert.*; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ErrorResponseTest { - - @Before - public void setUp() throws Exception { - - } - - @After - public void tearDown() throws Exception { - - } - - - @Test - public void testGetHttpStatusCode() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.getHttpStatusCode(); - assertTrue(true); - - - } - - @Test - public void tesSGetHttpStatusCode() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.setHttpStatusCode(200); - assertTrue(true); - - - } - - @Test - public void testGetMrErrorCode() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.getMrErrorCode(); - assertTrue(true); - - - } - - @Test - public void testSetMrErrorCode() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.setMrErrorCode(500); - assertTrue(true); - - - } - - @Test - public void testGetErrorMessage() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.getErrorMessage(); - assertTrue(true); - - - } - - @Test - public void testSetErrorMessage() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.setErrorMessage("no error"); - assertTrue(true); - - - } - - @Test - public void testToString() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.toString(); - assertTrue(true); - - - } - - @Test - public void testGetErrMapperStr1() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.setHelpURL("/help"); - assertTrue(true); - - - } - - @Test - public void testGetErrMapperStr() { - - ErrorResponse resp = new ErrorResponse(200, 500, "no error"); - - resp.getHelpURL(); - assertTrue(true); - - - } - - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import static org.junit.Assert.*; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ErrorResponseTest { + + @Before + public void setUp() throws Exception { + + } + + @After + public void tearDown() throws Exception { + + } + + + @Test + public void testGetHttpStatusCode() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.getHttpStatusCode(); + assertTrue(true); + + + } + + @Test + public void tesSGetHttpStatusCode() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.setHttpStatusCode(200); + assertTrue(true); + + + } + + @Test + public void testGetMrErrorCode() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.getMrErrorCode(); + assertTrue(true); + + + } + + @Test + public void testSetMrErrorCode() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.setMrErrorCode(500); + assertTrue(true); + + + } + + @Test + public void testGetErrorMessage() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.getErrorMessage(); + assertTrue(true); + + + } + + @Test + public void testSetErrorMessage() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.setErrorMessage("no error"); + assertTrue(true); + + + } + + @Test + public void testToString() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.toString(); + assertTrue(true); + + + } + + @Test + public void testGetErrMapperStr1() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.setHelpURL("/help"); + assertTrue(true); + + + } + + @Test + public void testGetErrMapperStr() { + + ErrorResponse resp = new ErrorResponse(200, 500, "no error"); + + resp.getHelpURL(); + assertTrue(true); + + + } + + + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/exception/JUnitTestSuite.java index 5b3ab7e..e7aedac 100644 --- a/src/test/java/com/att/nsa/cambria/exception/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.exception; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPCambriaExceptionMapperTest.class, - DMaaPErrorMessagesTest.class, DMaaPWebExceptionMapperTest.class, ErrorResponseTest.class}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPCambriaExceptionMapperTest.class, + DMaaPErrorMessagesTest.class, DMaaPWebExceptionMapperTest.class, ErrorResponseTest.class}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/exception/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/exception/TestRunner.java new file mode 100644 index 0000000..cd5a2ff --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/exception/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.exception; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java b/src/test/java/org/onap/dmaap/mr/cambria/listener/CambriaServletContextListenerTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/listener/CambriaServletContextListenerTest.java index 441064f..8405617 100644 --- a/src/test/java/com/att/nsa/cambria/listener/CambriaServletContextListenerTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/listener/CambriaServletContextListenerTest.java @@ -1,79 +1,79 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.listener; - -import static org.junit.Assert.*; - -import javax.servlet.ServletContextEvent; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.listener.CambriaServletContextListener; - -public class CambriaServletContextListenerTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testContextDestroyed() { - CambriaServletContextListener listener = new CambriaServletContextListener(); - try { - listener.contextDestroyed(null); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testContextInitialized() { - CambriaServletContextListener listener = new CambriaServletContextListener(); - - try { - listener.contextInitialized(null); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + package org.onap.dmaap.mr.cambria.listener; + +import static org.junit.Assert.*; + +import javax.servlet.ServletContextEvent; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.listener.CambriaServletContextListener; + +public class CambriaServletContextListenerTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testContextDestroyed() { + CambriaServletContextListener listener = new CambriaServletContextListener(); + try { + listener.contextDestroyed(null); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testContextInitialized() { + CambriaServletContextListener listener = new CambriaServletContextListener(); + + try { + listener.contextInitialized(null); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/listener/DME2EndPointLoaderTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/listener/DME2EndPointLoaderTest.java index 31451b7..2ea58e2 100644 --- a/src/test/java/com/att/nsa/cambria/listener/DME2EndPointLoaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/listener/DME2EndPointLoaderTest.java @@ -1,78 +1,78 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.listener; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.listener.DME2EndPointLoader; - -public class DME2EndPointLoaderTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testPublishEndPoints() { - DME2EndPointLoader loader = DME2EndPointLoader.getInstance(); - - - try { - loader.publishEndPoints(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testUnPublishEndPoints() { - DME2EndPointLoader loader = DME2EndPointLoader.getInstance(); - - - try { - loader.unPublishEndPoints(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.listener; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.listener.DME2EndPointLoader; + +public class DME2EndPointLoaderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testPublishEndPoints() { + DME2EndPointLoader loader = DME2EndPointLoader.getInstance(); + + + try { + loader.publishEndPoints(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testUnPublishEndPoints() { + DME2EndPointLoader loader = DME2EndPointLoader.getInstance(); + + + try { + loader.unPublishEndPoints(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/listener/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/listener/JUnitTestSuite.java index fab3777..38efa3b 100644 --- a/src/test/java/com/att/nsa/cambria/listener/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/listener/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.listener; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DME2EndPointLoaderTest.class, CambriaServletContextListenerTest.class }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + package org.onap.dmaap.mr.cambria.listener; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DME2EndPointLoaderTest.class, CambriaServletContextListenerTest.class }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/listener/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/listener/TestRunner.java new file mode 100644 index 0000000..636c7b4 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/listener/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.listener; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImpl.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImpl.java index 9c5e4e0..94fdb6b 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImpl.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImpl.java @@ -1,71 +1,71 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -import java.util.ArrayList; -import java.util.List; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.metabroker.Broker; -import com.att.dmf.mr.metabroker.Topic; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; - -public class BrokerImpl implements Broker { - - @Override - public List getAllTopics() throws ConfigDbException { - // TODO Auto-generated method stub - Topic top = new TopicImplem(); - - List list = new ArrayList(); - - for (int i = 0; i < 5; i++) { - top = new TopicImplem(); - list.add(top); - - } - - return null; - - } - - @Override - public Topic getTopic(String topic) throws ConfigDbException { - // TODO Auto-generated method stub - return new TopicImplem(); - } - - @Override - public Topic createTopic(String topic, String description, String ownerApiKey, int partitions, int replicas, - boolean transactionEnabled) throws TopicExistsException, CambriaApiException { - // TODO Auto-generated method stub - return new TopicImplem(topic, description, ownerApiKey, transactionEnabled); - } - - @Override - public void deleteTopic(String topic) throws AccessDeniedException, CambriaApiException, TopicExistsException { - // TODO Auto-generated method stub - Topic top = new TopicImplem(); - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +import java.util.ArrayList; +import java.util.List; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.metabroker.Broker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; + +public class BrokerImpl implements Broker { + + @Override + public List getAllTopics() throws ConfigDbException { + // TODO Auto-generated method stub + Topic top = new TopicImplem(); + + List list = new ArrayList(); + + for (int i = 0; i < 5; i++) { + top = new TopicImplem(); + list.add(top); + + } + + return null; + + } + + @Override + public Topic getTopic(String topic) throws ConfigDbException { + // TODO Auto-generated method stub + return new TopicImplem(); + } + + @Override + public Topic createTopic(String topic, String description, String ownerApiKey, int partitions, int replicas, + boolean transactionEnabled) throws TopicExistsException, CambriaApiException { + // TODO Auto-generated method stub + return new TopicImplem(topic, description, ownerApiKey, transactionEnabled); + } + + @Override + public void deleteTopic(String topic) throws AccessDeniedException, CambriaApiException, TopicExistsException { + // TODO Auto-generated method stub + Topic top = new TopicImplem(); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImplTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImplTest.java index edc5641..0f72eea 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/BrokerImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/BrokerImplTest.java @@ -1,109 +1,109 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.metabroker; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; - -public class BrokerImplTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetOwners() { - - try { - new BrokerImpl().getAllTopics(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - } - - @Test - public void testGetTopic() { - - try { - new BrokerImpl().getTopic("topicName"); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - } - - @Test - public void testCreateTopic() { - - try { - new BrokerImpl().createTopic("topicName", "testing topic", "owner123", 3, 3, true); - - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - } - - @Test - public void testDeleteTopic() { - - try { - new BrokerImpl().deleteTopic("topicName"); - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + package org.onap.dmaap.mr.cambria.metabroker; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; + +public class BrokerImplTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetOwners() { + + try { + new BrokerImpl().getAllTopics(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + } + + @Test + public void testGetTopic() { + + try { + new BrokerImpl().getTopic("topicName"); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + } + + @Test + public void testCreateTopic() { + + try { + new BrokerImpl().createTopic("topicName", "testing topic", "owner123", 3, 3, true); + + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + } + + @Test + public void testDeleteTopic() { + + try { + new BrokerImpl().deleteTopic("topicName"); + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/JUnitTestSuite.java index 0e2535b..4224aae 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ BrokerImplTest.class, TopicImplemTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ BrokerImplTest.class, TopicImplemTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TestRunner.java new file mode 100644 index 0000000..072c9e3 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplTest.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplTest.java index 67cf60d..fabe91c 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplTest.java @@ -1,25 +1,25 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -public class TopicImplTest { - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +public class TopicImplTest { + +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplem.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplem.java index 9539073..02cf9b3 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplem.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplem.java @@ -1,140 +1,140 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -import java.util.Set; - -import com.att.dmf.mr.metabroker.Topic; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.NsaAcl; -import com.att.nsa.security.NsaApiKey; - -public class TopicImplem implements Topic { - private String name, owner, description; - boolean isTransactionEnabled; - private Set set = null; - private NsaAcl readerAcl, writerAcl; - - public TopicImplem() { - name = getName(); - owner = getOwner(); - description = getDescription(); - isTransactionEnabled = true; - readerAcl = getReaderAcl(); - writerAcl = getWriterAcl(); - } - - public TopicImplem(String topic, String description, String ownerApiKey, boolean transactionEnabled) { - - this.name = topic; - this.owner = ownerApiKey; - this.description = description; - isTransactionEnabled = transactionEnabled; - - - } - @Override - public Set getOwners() { - // TODO Auto-generated method stub - for (int i = 0; i < 5; i++) { - set.add("string" + (i + 1)); - } - return set; - } - - @Override - public String getName() { - // TODO Auto-generated method stub - return "testTopic"; - } - - @Override - public String getOwner() { - // TODO Auto-generated method stub - return "owner"; - } - - @Override - public String getDescription() { - // TODO Auto-generated method stub - return "topic for testing purposes"; - } - - @Override - public boolean isTransactionEnabled() { - // TODO Auto-generated method stub - return true; - } - - @Override - public NsaAcl getReaderAcl() { - // TODO Auto-generated method stub - return new NsaAcl(); - } - - @Override - public NsaAcl getWriterAcl() { - // TODO Auto-generated method stub - return new NsaAcl(); - } - - @Override - public void checkUserRead(NsaApiKey user) throws AccessDeniedException { - // TODO Auto-generated method stub - NsaApiKey u = user; - } - - @Override - public void checkUserWrite(NsaApiKey user) throws AccessDeniedException { - // TODO Auto-generated method stub - - NsaApiKey u = user; - } - - @Override - public void permitWritesFromUser(String publisherId, NsaApiKey asUser) - throws AccessDeniedException, ConfigDbException { - // TODO Auto-generated method stub - String id = publisherId; - - } - - @Override - public void denyWritesFromUser(String publisherId, NsaApiKey asUser) - throws AccessDeniedException, ConfigDbException { - // TODO Auto-generated method stub - String id = publisherId; - - } - - @Override - public void permitReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException { - // TODO Auto-generated method stub - String id = consumerId; - } - - @Override - public void denyReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException { - // TODO Auto-generated method stub - String id = consumerId; - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +import java.util.Set; + +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.NsaAcl; +import com.att.nsa.security.NsaApiKey; + +public class TopicImplem implements Topic { + private String name, owner, description; + boolean isTransactionEnabled; + private Set set = null; + private NsaAcl readerAcl, writerAcl; + + public TopicImplem() { + name = getName(); + owner = getOwner(); + description = getDescription(); + isTransactionEnabled = true; + readerAcl = getReaderAcl(); + writerAcl = getWriterAcl(); + } + + public TopicImplem(String topic, String description, String ownerApiKey, boolean transactionEnabled) { + + this.name = topic; + this.owner = ownerApiKey; + this.description = description; + isTransactionEnabled = transactionEnabled; + + + } + @Override + public Set getOwners() { + // TODO Auto-generated method stub + for (int i = 0; i < 5; i++) { + set.add("string" + (i + 1)); + } + return set; + } + + @Override + public String getName() { + // TODO Auto-generated method stub + return "testTopic"; + } + + @Override + public String getOwner() { + // TODO Auto-generated method stub + return "owner"; + } + + @Override + public String getDescription() { + // TODO Auto-generated method stub + return "topic for testing purposes"; + } + + @Override + public boolean isTransactionEnabled() { + // TODO Auto-generated method stub + return true; + } + + @Override + public NsaAcl getReaderAcl() { + // TODO Auto-generated method stub + return new NsaAcl(); + } + + @Override + public NsaAcl getWriterAcl() { + // TODO Auto-generated method stub + return new NsaAcl(); + } + + @Override + public void checkUserRead(NsaApiKey user) throws AccessDeniedException { + // TODO Auto-generated method stub + NsaApiKey u = user; + } + + @Override + public void checkUserWrite(NsaApiKey user) throws AccessDeniedException { + // TODO Auto-generated method stub + + NsaApiKey u = user; + } + + @Override + public void permitWritesFromUser(String publisherId, NsaApiKey asUser) + throws AccessDeniedException, ConfigDbException { + // TODO Auto-generated method stub + String id = publisherId; + + } + + @Override + public void denyWritesFromUser(String publisherId, NsaApiKey asUser) + throws AccessDeniedException, ConfigDbException { + // TODO Auto-generated method stub + String id = publisherId; + + } + + @Override + public void permitReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException { + // TODO Auto-generated method stub + String id = consumerId; + } + + @Override + public void denyReadsByUser(String consumerId, NsaApiKey asUser) throws AccessDeniedException, ConfigDbException { + // TODO Auto-generated method stub + String id = consumerId; + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplemTest.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplemTest.java index c3ef097..279c8bb 100644 --- a/src/test/java/com/att/nsa/cambria/metabroker/TopicImplemTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metabroker/TopicImplemTest.java @@ -1,176 +1,176 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metabroker; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; - -public class TopicImplemTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testGetOwners() { - - assertNotNull(new TopicImplem().getOwner()); - - } - - @Test - public void testGetName() { - - assertNotNull(new TopicImplem().getName()); - - } - - @Test - public void testGetOwner() { - - assertNotNull(new TopicImplem().getOwner()); - - } - - @Test - public void testGetDescription() { - - assertNotNull(new TopicImplem().getDescription()); - - } - - @Test - public void testIsTransactionEnabled() { - - assertTrue(new TopicImplem().isTransactionEnabled()); - - } - - @Test - public void testGetReaderAcl() { - new TopicImplem().getReaderAcl(); - assertTrue(true); - - } - - @Test - public void testGetWriterAcl() { - new TopicImplem().getReaderAcl(); - assertTrue(true); - - } - - - @Test - public void testCheckUserRead() { - try { - new TopicImplem().checkUserRead(null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testCheckUserWrite() { - try { - new TopicImplem().checkUserWrite(null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testPermitWritesFromUser() { - try { - new TopicImplem().permitWritesFromUser("publisherId", null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testDenyWritesFromUser() { - try { - new TopicImplem().denyWritesFromUser("publisherId", null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testPermitReadsByUser() { - try { - new TopicImplem().permitReadsByUser("consumerId", null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testDenyReadsByUser() { - try { - new TopicImplem().denyReadsByUser("consumerId", null); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metabroker; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; + +public class TopicImplemTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testGetOwners() { + + assertNotNull(new TopicImplem().getOwner()); + + } + + @Test + public void testGetName() { + + assertNotNull(new TopicImplem().getName()); + + } + + @Test + public void testGetOwner() { + + assertNotNull(new TopicImplem().getOwner()); + + } + + @Test + public void testGetDescription() { + + assertNotNull(new TopicImplem().getDescription()); + + } + + @Test + public void testIsTransactionEnabled() { + + assertTrue(new TopicImplem().isTransactionEnabled()); + + } + + @Test + public void testGetReaderAcl() { + new TopicImplem().getReaderAcl(); + assertTrue(true); + + } + + @Test + public void testGetWriterAcl() { + new TopicImplem().getReaderAcl(); + assertTrue(true); + + } + + + @Test + public void testCheckUserRead() { + try { + new TopicImplem().checkUserRead(null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testCheckUserWrite() { + try { + new TopicImplem().checkUserWrite(null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testPermitWritesFromUser() { + try { + new TopicImplem().permitWritesFromUser("publisherId", null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testDenyWritesFromUser() { + try { + new TopicImplem().denyWritesFromUser("publisherId", null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testPermitReadsByUser() { + try { + new TopicImplem().permitReadsByUser("consumerId", null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testDenyReadsByUser() { + try { + new TopicImplem().denyReadsByUser("consumerId", null); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/CambriaPublisherUtilityTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/CambriaPublisherUtilityTest.java index 956d27b..a73e77b 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/CambriaPublisherUtilityTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/CambriaPublisherUtilityTest.java @@ -1,95 +1,95 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; - -public class CambriaPublisherUtilityTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testEscape() { - - CambriaPublisherUtility utility = new CambriaPublisherUtility(); - - utility.escape("testTopic"); - assertTrue(true); - - } - - @Test - public void testMakeUrl() { - - CambriaPublisherUtility utility = new CambriaPublisherUtility(); - - utility.makeUrl("testTopic"); - assertTrue(true); - - } - - @Test - public void testMakeConsumerUrl() { - - CambriaPublisherUtility utility = new CambriaPublisherUtility(); - - utility.makeConsumerUrl("testTopic", "CG1", "23"); - assertTrue(true); - - } - - @Test - public void testCreateHostsList() { - - CambriaPublisherUtility utility = new CambriaPublisherUtility(); - - try { - utility.createHostsList(null); - } catch (NullPointerException e) { - assertTrue(true); - } - - - } - - @Test - public void testHostForString() { - - CambriaPublisherUtility utility = new CambriaPublisherUtility(); - - utility.hostForString("hello"); - assertTrue(true); - - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; + +public class CambriaPublisherUtilityTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testEscape() { + + CambriaPublisherUtility utility = new CambriaPublisherUtility(); + + utility.escape("testTopic"); + assertTrue(true); + + } + + @Test + public void testMakeUrl() { + + CambriaPublisherUtility utility = new CambriaPublisherUtility(); + + utility.makeUrl("testTopic"); + assertTrue(true); + + } + + @Test + public void testMakeConsumerUrl() { + + CambriaPublisherUtility utility = new CambriaPublisherUtility(); + + utility.makeConsumerUrl("testTopic", "CG1", "23"); + assertTrue(true); + + } + + @Test + public void testCreateHostsList() { + + CambriaPublisherUtility utility = new CambriaPublisherUtility(); + + try { + utility.createHostsList(null); + } catch (NullPointerException e) { + assertTrue(true); + } + + + } + + @Test + public void testHostForString() { + + CambriaPublisherUtility utility = new CambriaPublisherUtility(); + + utility.hostForString("hello"); + assertTrue(true); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java index 5916a18..51334e8 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/DMaaPCambriaClientFactoryTest.java @@ -1,171 +1,171 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher; - -import static org.junit.Assert.*; - -import java.util.ArrayList; -import java.util.Collection; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.listener.DME2EndPointLoader; -import com.att.dmf.mr.metrics.publisher.CambriaConsumer; -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; -import com.att.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; - -public class DMaaPCambriaClientFactoryTest { - - private Collection hostSet; - - private String[] hostSetArray; - @Before - public void setUp() throws Exception { - hostSet = new ArrayList(); - - hostSetArray = new String[10]; - - for (int i = 0; i < 10; i++) { - hostSet.add("host" + (i+1)); - hostSetArray[i] = "host" + (i+1); - } - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testCreateConsumer() { - - - - DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic"); - assertTrue(true); - - } - - @Test - public void testCreateConsumer2() { - - - try { - DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic"); - } catch (NullPointerException e) { - assertTrue(true); - } - - - } - - @Test - public void testCreateConsumer3() { - - DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "filter"); - assertTrue(true); - - } - - @Test - public void testCreateConsumer4() { - DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23"); - assertTrue(true); - - } - - @Test - public void testCreateConsumer5() { - - DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20); - assertTrue(true); - - } - - @Test - public void testCreateConsumer6() { - - - DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret"); - assertTrue(true); - - } - - @Test - public void testCreateConsumer7() { - - DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret"); - assertTrue(true); - - } - - @Test - public void testCreateSimplePublisher() { - - DMaaPCambriaClientFactory.createSimplePublisher("hostList", "testTopic"); - assertTrue(true); - - } - - @Test - public void testCreateBatchingPublisher() { - - DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50); - assertTrue(true); - - } - - @Test - public void testCreateBatchingPublisher2() { - - DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50, true); - assertTrue(true); - - } - - @Test - public void testCreateBatchingPublisher3() { - - DMaaPCambriaClientFactory.createBatchingPublisher(hostSetArray, "testTopic", 100, 50, true); - assertTrue(true); - - } - - @Test - public void testCreateBatchingPublisher4() { - - DMaaPCambriaClientFactory.createBatchingPublisher(hostSet, "testTopic", 100, 50, true); - assertTrue(true); - - } - - @Test - public void $testInject() { - - DMaaPCambriaClientFactory factory = new DMaaPCambriaClientFactory(); - factory.$testInject(null); - assertTrue(true); - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.Collection; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.listener.DME2EndPointLoader; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaConsumer; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; +import org.onap.dmaap.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; + +public class DMaaPCambriaClientFactoryTest { + + private Collection hostSet; + + private String[] hostSetArray; + @Before + public void setUp() throws Exception { + hostSet = new ArrayList(); + + hostSetArray = new String[10]; + + for (int i = 0; i < 10; i++) { + hostSet.add("host" + (i+1)); + hostSetArray[i] = "host" + (i+1); + } + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testCreateConsumer() { + + + + DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic"); + assertTrue(true); + + } + + @Test + public void testCreateConsumer2() { + + + try { + DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic"); + } catch (NullPointerException e) { + assertTrue(true); + } + + + } + + @Test + public void testCreateConsumer3() { + + DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "filter"); + assertTrue(true); + + } + + @Test + public void testCreateConsumer4() { + DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23"); + assertTrue(true); + + } + + @Test + public void testCreateConsumer5() { + + DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20); + assertTrue(true); + + } + + @Test + public void testCreateConsumer6() { + + + DMaaPCambriaClientFactory.createConsumer("hostList", "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret"); + assertTrue(true); + + } + + @Test + public void testCreateConsumer7() { + + DMaaPCambriaClientFactory.createConsumer(hostSet, "testTopic", "CG1", "23", 100, 20, "filter", "apikey", "apisecret"); + assertTrue(true); + + } + + @Test + public void testCreateSimplePublisher() { + + DMaaPCambriaClientFactory.createSimplePublisher("hostList", "testTopic"); + assertTrue(true); + + } + + @Test + public void testCreateBatchingPublisher() { + + DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50); + assertTrue(true); + + } + + @Test + public void testCreateBatchingPublisher2() { + + DMaaPCambriaClientFactory.createBatchingPublisher("hostList", "testTopic", 100, 50, true); + assertTrue(true); + + } + + @Test + public void testCreateBatchingPublisher3() { + + DMaaPCambriaClientFactory.createBatchingPublisher(hostSetArray, "testTopic", 100, 50, true); + assertTrue(true); + + } + + @Test + public void testCreateBatchingPublisher4() { + + DMaaPCambriaClientFactory.createBatchingPublisher(hostSet, "testTopic", 100, 50, true); + assertTrue(true); + + } + + @Test + public void $testInject() { + + DMaaPCambriaClientFactory factory = new DMaaPCambriaClientFactory(); + factory.$testInject(null); + assertTrue(true); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/JUnitTestSuite.java index 9b8e363..87b6e8b 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPCambriaClientFactoryTest.class, CambriaPublisherUtilityTest.class}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPCambriaClientFactoryTest.class, CambriaPublisherUtilityTest.class}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/TestRunner.java new file mode 100644 index 0000000..b7e997f --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/CambriaBaseClientTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/CambriaBaseClientTest.java index 3242e83..d3deffe 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/CambriaBaseClientTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/CambriaBaseClientTest.java @@ -1,97 +1,97 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher.impl; - -import static org.junit.Assert.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; - -import com.att.dmf.mr.metrics.publisher.impl.CambriaBaseClient; -import com.att.eelf.configuration.EELFLogger; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CambriaBaseClientTest { - - private CambriaBaseClient client = null; - @Before - public void setUp() throws Exception { - - Collection hosts = new ArrayList(); - - for (int i = 0; i < 5; i++) { - hosts.add("host"+(i+1)); - } - - - client = new CambriaBaseClient(hosts, "client1"); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testClose() { - client.close(); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetLog() { - client.getLog(); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testLogTo() { - client.logTo(null); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - public JSONArray getJSONArray() { - - String[] data = {"stringone", "stringtwo"}; - JSONArray array = new JSONArray(Arrays.asList(data)); - - return array; - } - - @Test - public void testJsonArrayToSet() { - client.jsonArrayToSet(getJSONArray()); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; + +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.CambriaBaseClient; +import com.att.eelf.configuration.EELFLogger; + +import org.json.JSONArray; +import org.json.JSONObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class CambriaBaseClientTest { + + private CambriaBaseClient client = null; + @Before + public void setUp() throws Exception { + + Collection hosts = new ArrayList(); + + for (int i = 0; i < 5; i++) { + hosts.add("host"+(i+1)); + } + + + client = new CambriaBaseClient(hosts, "client1"); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testClose() { + client.close(); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetLog() { + client.getLog(); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testLogTo() { + client.logTo(null); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + public JSONArray getJSONArray() { + + String[] data = {"stringone", "stringtwo"}; + JSONArray array = new JSONArray(Arrays.asList(data)); + + return array; + } + + @Test + public void testJsonArrayToSet() { + client.jsonArrayToSet(getJSONArray()); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/ClockTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/ClockTest.java index e484722..241c5f6 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/ClockTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/ClockTest.java @@ -1,84 +1,84 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher.impl; - -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.metrics.publisher.impl.Clock; - -public class ClockTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetIt() { - - Clock.getIt(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testNow() { - - Clock.now(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testNowImpl() { - - Clock clock = new Clock(); - clock.nowImpl(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testRegister() { - - Clock clock = new Clock(); - Clock.register(clock); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import static org.junit.Assert.*; + + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.Clock; + +public class ClockTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetIt() { + + Clock.getIt(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testNow() { + + Clock.now(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testNowImpl() { + + Clock clock = new Clock(); + clock.nowImpl(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testRegister() { + + Clock clock = new Clock(); + Clock.register(clock); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java index fe034a5..c5fc5b6 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaConsumerImplTest.java @@ -1,94 +1,94 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.metrics.publisher.impl; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; - -public class DMaaPCambriaConsumerImplTest { - - private DMaaPCambriaConsumerImpl consumer = null; - @Before - public void setUp() throws Exception { - - Collection hosts = new ArrayList(); - - for (int i = 0; i < 5; i++) { - hosts.add("host"+(i+1)); - } - consumer = new DMaaPCambriaConsumerImpl(hosts, "testTopic", "consumerGroup1", "1", 2000, 200, "hi", - "9AMFFNIZpusO54oG","6BY86UQcio2LJdgyU7Cwg5oQ"); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testStringToList() { - - List response = DMaaPCambriaConsumerImpl.stringToList("Hello world, this is a test string"); - assertNotNull(response); - - - } - - @Test - public void testFetch() { - - Iterable response = null; - boolean flag = true; - try { - response = consumer.fetch(200, 20); - } catch (IOException e) { - flag = false; - // TODO Auto-generated catch block - e.printStackTrace(); - } - if(flag) { - assertNotNull(response); - } else { - assertTrue(true); - } - - } - - - @Test - public void testCreateUrlPath() { - - String response = consumer.createUrlPath(200, 20); - assertNotNull(response); - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + +package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; + +public class DMaaPCambriaConsumerImplTest { + + private DMaaPCambriaConsumerImpl consumer = null; + @Before + public void setUp() throws Exception { + + Collection hosts = new ArrayList(); + + for (int i = 0; i < 5; i++) { + hosts.add("host"+(i+1)); + } + consumer = new DMaaPCambriaConsumerImpl(hosts, "testTopic", "consumerGroup1", "1", 2000, 200, "hi", + "9AMFFNIZpusO54oG","6BY86UQcio2LJdgyU7Cwg5oQ"); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testStringToList() { + + List response = DMaaPCambriaConsumerImpl.stringToList("Hello world, this is a test string"); + assertNotNull(response); + + + } + + @Test + public void testFetch() { + + Iterable response = null; + boolean flag = true; + try { + response = consumer.fetch(200, 20); + } catch (IOException e) { + flag = false; + // TODO Auto-generated catch block + e.printStackTrace(); + } + if(flag) { + assertNotNull(response); + } else { + assertTrue(true); + } + + } + + + @Test + public void testCreateUrlPath() { + + String response = consumer.createUrlPath(200, 20); + assertNotNull(response); + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java index 0c2c4ba..bd1f221 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisherTest.java @@ -1,87 +1,87 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher.impl; - -import static org.junit.Assert.*; - -import java.util.ArrayList; -import java.util.Collection; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; - - - -public class DMaaPCambriaSimplerBatchPublisherTest { - - private DMaaPCambriaSimplerBatchPublisher publisher = null; - @Before - public void setUp() throws Exception { - - Collection hosts = new ArrayList(); - - for (int i = 0; i < 5; i++) { - hosts.add("host"+(i+1)); - } - - publisher = new DMaaPCambriaSimplerBatchPublisher.Builder().againstUrls(hosts).onTopic("testTopic") - .batchTo(200, 100).compress(true).build(); - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSend() { - - publisher.send("hello", "test message"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testClose() { - - publisher.close(); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - @Test - public void testGetPendingMEssageCount() { - - publisher.getPendingMessageCount(); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.Collection; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; + + + +public class DMaaPCambriaSimplerBatchPublisherTest { + + private DMaaPCambriaSimplerBatchPublisher publisher = null; + @Before + public void setUp() throws Exception { + + Collection hosts = new ArrayList(); + + for (int i = 0; i < 5; i++) { + hosts.add("host"+(i+1)); + } + + publisher = new DMaaPCambriaSimplerBatchPublisher.Builder().againstUrls(hosts).onTopic("testTopic") + .batchTo(200, 100).compress(true).build(); + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSend() { + + publisher.send("hello", "test message"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testClose() { + + publisher.close(); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + @Test + public void testGetPendingMEssageCount() { + + publisher.getPendingMessageCount(); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/JUnitTestSuite.java index b45e8e2..2b72f70 100644 --- a/src/test/java/com/att/nsa/cambria/metrics/publisher/impl/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.metrics.publisher.impl; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPCambriaSimplerBatchPublisherTest.class, ClockTest.class, - CambriaBaseClientTest.class, DMaaPCambriaConsumerImplTest.class}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPCambriaSimplerBatchPublisherTest.class, ClockTest.class, + CambriaBaseClientTest.class, DMaaPCambriaConsumerImplTest.class}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/TestRunner.java new file mode 100644 index 0000000..895e93f --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/metrics/publisher/impl/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.metrics.publisher.impl; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaEventSetTest.java similarity index 87% rename from src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaEventSetTest.java index b9fa1e5..bf4060e 100644 --- a/src/test/java/com/att/nsa/cambria/resources/CambriaEventSetTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaEventSetTest.java @@ -1,76 +1,76 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources; - -import static org.junit.Assert.*; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.resources.CambriaEventSet; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; - - -public class CambriaEventSetTest { - - private CambriaOutboundEventStream coes = null; - - @Before - public void setUp() throws Exception { - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testNext() { - CambriaEventSet event = null; - String str = "contains text to be converted to InputStream"; - - InputStream stream = new ByteArrayInputStream(str.getBytes()); - try { - event = new CambriaEventSet("application/cambria", stream, true, "hi"); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - try { - event.next(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources; + +import static org.junit.Assert.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; + + +public class CambriaEventSetTest { + + private CambriaOutboundEventStream coes = null; + + @Before + public void setUp() throws Exception { + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testNext() { + CambriaEventSet event = null; + String str = "contains text to be converted to InputStream"; + + InputStream stream = new ByteArrayInputStream(str.getBytes()); + try { + event = new CambriaEventSet("application/cambria", stream, true, "hi"); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + try { + event.next(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaOutboundEventStreamTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaOutboundEventStreamTest.java index 8310bba..970bc60 100644 --- a/src/test/java/com/att/nsa/cambria/resources/CambriaOutboundEventStreamTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/CambriaOutboundEventStreamTest.java @@ -1,106 +1,106 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; - -public class CambriaOutboundEventStreamTest { - - private CambriaOutboundEventStream coes = null; - - @Before - public void setUp() throws Exception { - coes = new CambriaOutboundEventStream.Builder(null).timeout(10).limit(1).filter(CambriaConstants.kNoFilter) - .pretty(false).withMeta(true).build(); - DMaaPContext ctx = new DMaaPContext(); - //ctx.set... - coes.setDmaapContext(ctx); - coes.setTopic(null); - coes.setTransEnabled(true); - coes.setTopicStyle(true); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetSentCount() { - int sentCount = coes.getSentCount(); - assertTrue("Doesn't match, got " + sentCount, sentCount==0);; - } - - @Test - public void testWrite() { - //fail("Not yet implemented"); - } - - @Test - public void testForEachMessage() { - //fail("Not yet implemented"); - } - - @Test - public void testGetDmaapContext() { - DMaaPContext ctx = coes.getDmaapContext(); - - assertNotNull(ctx); - } - - @Test - public void testSetDmaapContext() { - DMaaPContext ctx = new DMaaPContext(); - coes.setDmaapContext(ctx); - assertTrue(ctx.equals(coes.getDmaapContext())); - } - - @Test - public void testGetTopic() { - coes.getTopic(); - assertTrue(true); - } - - @Test - public void testSetTopic() { - //fail("Not yet implemented"); - } - - @Test - public void testSetTopicStyle() { - coes.setTopicStyle(true); - assertTrue(true); - } - - @Test - public void testSetTransEnabled() { - coes.setTransEnabled(true); - assertTrue(true); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; + +public class CambriaOutboundEventStreamTest { + + private CambriaOutboundEventStream coes = null; + + @Before + public void setUp() throws Exception { + coes = new CambriaOutboundEventStream.Builder(null).timeout(10).limit(1).filter(CambriaConstants.kNoFilter) + .pretty(false).withMeta(true).build(); + DMaaPContext ctx = new DMaaPContext(); + //ctx.set... + coes.setDmaapContext(ctx); + coes.setTopic(null); + coes.setTransEnabled(true); + coes.setTopicStyle(true); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetSentCount() { + int sentCount = coes.getSentCount(); + assertTrue("Doesn't match, got " + sentCount, sentCount==0);; + } + + @Test + public void testWrite() { + //fail("Not yet implemented"); + } + + @Test + public void testForEachMessage() { + //fail("Not yet implemented"); + } + + @Test + public void testGetDmaapContext() { + DMaaPContext ctx = coes.getDmaapContext(); + + assertNotNull(ctx); + } + + @Test + public void testSetDmaapContext() { + DMaaPContext ctx = new DMaaPContext(); + coes.setDmaapContext(ctx); + assertTrue(ctx.equals(coes.getDmaapContext())); + } + + @Test + public void testGetTopic() { + coes.getTopic(); + assertTrue(true); + } + + @Test + public void testSetTopic() { + //fail("Not yet implemented"); + } + + @Test + public void testSetTopicStyle() { + coes.setTopicStyle(true); + assertTrue(true); + } + + @Test + public void testSetTransEnabled() { + coes.setTransEnabled(true); + assertTrue(true); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/JUnitTestSuite.java index a68bbf1..d35105a 100644 --- a/src/test/java/com/att/nsa/cambria/resources/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ CambriaEventSetTest.class,CambriaOutboundEventStreamTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ CambriaEventSetTest.class,CambriaOutboundEventStreamTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/resources/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/TestRunner.java new file mode 100644 index 0000000..92b94d5 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java similarity index 84% rename from src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java index a308491..78197bd 100644 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaJsonStreamReaderTest.java @@ -1,72 +1,72 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.io.InputStream; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; - -import org.apache.commons.io.IOUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; - -public class CambriaJsonStreamReaderTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testNext() { - - CambriaJsonStreamReader test = null; - - String source = "{'name': 'tester', 'id': '2'}"; - InputStream stream = null; - try { - stream = IOUtils.toInputStream(source, "UTF-8"); - test = new CambriaJsonStreamReader(stream,"hello"); - test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (CambriaApiException e1) { - e1.printStackTrace(); - } - - assertTrue(true); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; + +import org.apache.commons.io.IOUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; + +public class CambriaJsonStreamReaderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testNext() { + + CambriaJsonStreamReader test = null; + + String source = "{'name': 'tester', 'id': '2'}"; + InputStream stream = null; + try { + stream = IOUtils.toInputStream(source, "UTF-8"); + test = new CambriaJsonStreamReader(stream,"hello"); + test.next(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (CambriaApiException e1) { + e1.printStackTrace(); + } + + assertTrue(true); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java similarity index 86% rename from src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java index a5a3aac..1b5f405 100644 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaRawStreamReaderTest.java @@ -1,72 +1,72 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.io.InputStream; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaRawStreamReader; - -import org.apache.commons.io.IOUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; - -public class CambriaRawStreamReaderTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testNext() { - - CambriaRawStreamReader test = null; - message msg = null; - - String source = "{'name': 'tester', 'id': '2'}"; - InputStream stream = null; - try { - stream = IOUtils.toInputStream(source, "UTF-8"); - test = new CambriaRawStreamReader(stream,"hello"); - msg = test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (CambriaApiException e1) { - e1.printStackTrace(); - } - - assertNotNull(msg); - - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaRawStreamReader; + +import org.apache.commons.io.IOUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; + +public class CambriaRawStreamReaderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testNext() { + + CambriaRawStreamReader test = null; + message msg = null; + + String source = "{'name': 'tester', 'id': '2'}"; + InputStream stream = null; + try { + stream = IOUtils.toInputStream(source, "UTF-8"); + test = new CambriaRawStreamReader(stream,"hello"); + msg = test.next(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (CambriaApiException e1) { + e1.printStackTrace(); + } + + assertNotNull(msg); + + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaStreamReaderTest.java similarity index 86% rename from src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaStreamReaderTest.java index d992183..5a58fd8 100644 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaStreamReaderTest.java @@ -1,72 +1,72 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.io.InputStream; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader; - -import org.apache.commons.io.IOUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; - -public class CambriaStreamReaderTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testNext() { - - CambriaStreamReader test = null; - - - String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}"; - InputStream stream = null; - try { - stream = IOUtils.toInputStream(source, "UTF-8"); - test = new CambriaStreamReader(stream); - test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (CambriaApiException e1) { - e1.printStackTrace(); - } - - assertTrue(true); - - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaStreamReader; + +import org.apache.commons.io.IOUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; + +public class CambriaStreamReaderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testNext() { + + CambriaStreamReader test = null; + + + String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}"; + InputStream stream = null; + try { + stream = IOUtils.toInputStream(source, "UTF-8"); + test = new CambriaStreamReader(stream); + test.next(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (CambriaApiException e1) { + e1.printStackTrace(); + } + + assertTrue(true); + + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java similarity index 86% rename from src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java index e7b0c83..2b60b95 100644 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/CambriaTextStreamReaderTest.java @@ -1,71 +1,71 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.io.InputStream; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader; - -import org.apache.commons.io.IOUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; - -public class CambriaTextStreamReaderTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testNext() { - - CambriaStreamReader test = null; - - String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}"; - InputStream stream = null; - try { - stream = IOUtils.toInputStream(source, "UTF-8"); - test = new CambriaStreamReader(stream); - test.next(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (CambriaApiException e1) { - e1.printStackTrace(); - } - - assertTrue(true); - - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.io.InputStream; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaStreamReader; + +import org.apache.commons.io.IOUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; + +public class CambriaTextStreamReaderTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testNext() { + + CambriaStreamReader test = null; + + String source = "{'name': 'tester', 'id': '2', 'message': 'hello'}"; + InputStream stream = null; + try { + stream = IOUtils.toInputStream(source, "UTF-8"); + test = new CambriaStreamReader(stream); + test.next(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (CambriaApiException e1) { + e1.printStackTrace(); + } + + assertTrue(true); + + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/JUnitTestSuite.java index d80abf9..a01fa6c 100644 --- a/src/test/java/com/att/nsa/cambria/resources/streamReaders/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.resources.streamReaders; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ CambriaJsonStreamReaderTest.class,CambriaRawStreamReaderTest.class, - CambriaStreamReaderTest.class, CambriaTextStreamReaderTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ CambriaJsonStreamReaderTest.class,CambriaRawStreamReaderTest.class, + CambriaStreamReaderTest.class, CambriaTextStreamReaderTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/TestRunner.java new file mode 100644 index 0000000..5da7245 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/resources/streamReaders/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.resources.streamReaders; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAAFAuthenticatorImplTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAAFAuthenticatorImplTest.java index 82a9c2b..7019a2b 100644 --- a/src/test/java/com/att/nsa/cambria/security/DMaaPAAFAuthenticatorImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAAFAuthenticatorImplTest.java @@ -1,83 +1,83 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl; - - - -public class DMaaPAAFAuthenticatorImplTest { - - private MockHttpServletRequest request = null; - @Before - public void setUp() throws Exception { - //creating servlet object - request = new MockHttpServletRequest(); - request.setServerName("www.example.com"); - request.setRequestURI("/foo"); - request.setQueryString("param1=value1¶m"); - String url = request.getRequestURL() + "?" + request.getQueryString(); - - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testAafAuthentication() { - - DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); - authenticator.aafAuthentication(request, "admin"); - assertTrue(true); - - } - - - - /*@Test - public void testAafPermissionString() { - - DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); - try { - authenticator.aafPermissionString("testTopic", "admin"); - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - }*/ - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl; + + + +public class DMaaPAAFAuthenticatorImplTest { + + private MockHttpServletRequest request = null; + @Before + public void setUp() throws Exception { + //creating servlet object + request = new MockHttpServletRequest(); + request.setServerName("www.example.com"); + request.setRequestURI("/foo"); + request.setQueryString("param1=value1¶m"); + String url = request.getRequestURL() + "?" + request.getQueryString(); + + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testAafAuthentication() { + + DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); + authenticator.aafAuthentication(request, "admin"); + assertTrue(true); + + } + + + + /*@Test + public void testAafPermissionString() { + + DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); + try { + authenticator.aafPermissionString("testTopic", "admin"); + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + }*/ + + +} diff --git a/src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAuthenticatorImplTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAuthenticatorImplTest.java index 2f91db2..4ec5c38 100644 --- a/src/test/java/com/att/nsa/cambria/security/DMaaPAuthenticatorImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/DMaaPAuthenticatorImplTest.java @@ -1,129 +1,129 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; - - - -public class DMaaPAuthenticatorImplTest { - - private MockHttpServletRequest request = null; - @Before - public void setUp() throws Exception { - //creating servlet object - request = new MockHttpServletRequest(); - request.setServerName("www.example.com"); - request.setRequestURI("/foo"); - request.setQueryString("param1=value1¶m"); - String url = request.getRequestURL() + "?" + request.getQueryString(); - - - } - - @After - public void tearDown() throws Exception { - } - - /*@Test - public void testAuthenticate() { - - DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); - - DMaaPContext ctx = new DMaaPContext(); - authenticator.authenticate(ctx); - assertTrue(true); - - }*/ - - - - /*@Test - public void testAafPermissionString() { - - DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); - try { - authenticator.aafPermissionString("testTopic", "admin"); - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertTrue(true); - - }*/ - - @Test - public void testIsAuthentic() { - - DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); - - authenticator.isAuthentic(request); - assertTrue(true); - - } - - @Test - public void testQualify() { - - DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); - - authenticator.qualify(request); - assertTrue(true); - - } - - @Test - public void testAddAuthenticator() { - - DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); - DMaaPAuthenticator authenticator2 = new DMaaPAuthenticatorImpl(null); - - authenticator.addAuthenticator(authenticator2); - assertTrue(true); - - } - - /*@Test - public void testGetAuthenticatedUser() { - - - DMaaPContext ctx = new DMaaPContext(); - DMaaPAuthenticatorImpl.getAuthenticatedUser(ctx); - assertTrue(true); - - } - */ - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; + + + +public class DMaaPAuthenticatorImplTest { + + private MockHttpServletRequest request = null; + @Before + public void setUp() throws Exception { + //creating servlet object + request = new MockHttpServletRequest(); + request.setServerName("www.example.com"); + request.setRequestURI("/foo"); + request.setQueryString("param1=value1¶m"); + String url = request.getRequestURL() + "?" + request.getQueryString(); + + + } + + @After + public void tearDown() throws Exception { + } + + /*@Test + public void testAuthenticate() { + + DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); + + DMaaPContext ctx = new DMaaPContext(); + authenticator.authenticate(ctx); + assertTrue(true); + + }*/ + + + + /*@Test + public void testAafPermissionString() { + + DMaaPAAFAuthenticatorImpl authenticator = new DMaaPAAFAuthenticatorImpl(); + try { + authenticator.aafPermissionString("testTopic", "admin"); + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertTrue(true); + + }*/ + + @Test + public void testIsAuthentic() { + + DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); + + authenticator.isAuthentic(request); + assertTrue(true); + + } + + @Test + public void testQualify() { + + DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); + + authenticator.qualify(request); + assertTrue(true); + + } + + @Test + public void testAddAuthenticator() { + + DMaaPAuthenticatorImpl authenticator = new DMaaPAuthenticatorImpl(null); + DMaaPAuthenticator authenticator2 = new DMaaPAuthenticatorImpl(null); + + authenticator.addAuthenticator(authenticator2); + assertTrue(true); + + } + + /*@Test + public void testGetAuthenticatedUser() { + + + DMaaPContext ctx = new DMaaPContext(); + DMaaPAuthenticatorImpl.getAuthenticatedUser(ctx); + assertTrue(true); + + } + */ + + +} diff --git a/src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/security/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/JUnitTestSuite.java index 911fba3..60ae849 100644 --- a/src/test/java/com/att/nsa/cambria/security/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPAAFAuthenticatorImplTest.class,DMaaPAuthenticatorImplTest.class, -}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPAAFAuthenticatorImplTest.class,DMaaPAuthenticatorImplTest.class, +}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/security/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/security/TestRunner.java new file mode 100644 index 0000000..e294538 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java similarity index 86% rename from src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java index 89ba6c1..7bb26d0 100644 --- a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPMechIdAuthenticatorTest.java @@ -1,107 +1,107 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security.impl; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.security.impl.DMaaPMechIdAuthenticator; - - - -public class DMaaPMechIdAuthenticatorTest { - - private MockHttpServletRequest request = null; - @Before - public void setUp() throws Exception { - //creating servlet object - request = new MockHttpServletRequest(); - request.setServerName("www.example.com"); - request.setRequestURI("/foo"); - request.setQueryString("param1=value1¶m"); - String url = request.getRequestURL() + "?" + request.getQueryString(); - - - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testQualify() { - - DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); - - authenticator.qualify(request); - assertTrue(true); - - } - - @Test - public void testAuthenticate() { - - DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); - - DMaaPContext ctx = new DMaaPContext(); - authenticator.authenticate(ctx); - assertTrue(true); - - } - - @Test - public void testIsAuthentic() { - DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); - - authenticator.isAuthentic(request); - assertTrue(true); - - } - - - - @Test - public void testAddAuthenticator() { - - DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); - DMaaPMechIdAuthenticator authenticator2 = new DMaaPMechIdAuthenticator(); - - authenticator.addAuthenticator(authenticator2); - assertTrue(true); - - } - - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security.impl; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPMechIdAuthenticator; + + + +public class DMaaPMechIdAuthenticatorTest { + + private MockHttpServletRequest request = null; + @Before + public void setUp() throws Exception { + //creating servlet object + request = new MockHttpServletRequest(); + request.setServerName("www.example.com"); + request.setRequestURI("/foo"); + request.setQueryString("param1=value1¶m"); + String url = request.getRequestURL() + "?" + request.getQueryString(); + + + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testQualify() { + + DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); + + authenticator.qualify(request); + assertTrue(true); + + } + + @Test + public void testAuthenticate() { + + DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); + + DMaaPContext ctx = new DMaaPContext(); + authenticator.authenticate(ctx); + assertTrue(true); + + } + + @Test + public void testIsAuthentic() { + DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); + + authenticator.isAuthentic(request); + assertTrue(true); + + } + + + + @Test + public void testAddAuthenticator() { + + DMaaPMechIdAuthenticator authenticator = new DMaaPMechIdAuthenticator(); + DMaaPMechIdAuthenticator authenticator2 = new DMaaPMechIdAuthenticator(); + + authenticator.addAuthenticator(authenticator2); + assertTrue(true); + + } + + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java similarity index 87% rename from src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java index d437bf3..24e43f5 100644 --- a/src/test/java/com/att/nsa/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/DMaaPOriginalUebAuthenticatorTest.java @@ -1,117 +1,117 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security.impl; - -import static org.junit.Assert.*; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; - - - -public class DMaaPOriginalUebAuthenticatorTest { - - private MockHttpServletRequest request = null; - @Before - public void setUp() throws Exception { - //creating servlet object - request = new MockHttpServletRequest(); - request.setServerName("www.example.com"); - request.setRequestURI("/foo"); - request.setQueryString("param1=value1¶m"); - String url = request.getRequestURL() + "?" + request.getQueryString(); - - - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testQualify() { - - DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); - - authenticator.qualify(request); - assertTrue(true); - - } - - @Test - public void testAuthenticate() { - - DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); - - DMaaPContext ctx = new DMaaPContext(); - authenticator.authenticate(ctx); - assertTrue(true); - - } - - @Test - public void testAuthenticate2() { - - DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); - DMaaPContext ctx = new DMaaPContext(); - authenticator.authenticate("google.com", "xHMDwk25kwkkyi26JH","Dec 16, 2016", "Dec/16/2016","123"); - - - } - - @Test - public void testIsAuthentic() { - DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); - - authenticator.isAuthentic(request); - assertTrue(true); - - } - - - - @Test - public void testAddAuthenticator() { - - DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); - DMaaPOriginalUebAuthenticator authenticator2 = new DMaaPOriginalUebAuthenticator(null, 100); - - authenticator.addAuthenticator(authenticator2); - assertTrue(true); - - } - - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security.impl; + +import static org.junit.Assert.*; + +import javax.servlet.http.HttpServletRequest; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; + + + +public class DMaaPOriginalUebAuthenticatorTest { + + private MockHttpServletRequest request = null; + @Before + public void setUp() throws Exception { + //creating servlet object + request = new MockHttpServletRequest(); + request.setServerName("www.example.com"); + request.setRequestURI("/foo"); + request.setQueryString("param1=value1¶m"); + String url = request.getRequestURL() + "?" + request.getQueryString(); + + + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testQualify() { + + DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); + + authenticator.qualify(request); + assertTrue(true); + + } + + @Test + public void testAuthenticate() { + + DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); + + DMaaPContext ctx = new DMaaPContext(); + authenticator.authenticate(ctx); + assertTrue(true); + + } + + @Test + public void testAuthenticate2() { + + DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); + DMaaPContext ctx = new DMaaPContext(); + authenticator.authenticate("google.com", "xHMDwk25kwkkyi26JH","Dec 16, 2016", "Dec/16/2016","123"); + + + } + + @Test + public void testIsAuthentic() { + DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); + + authenticator.isAuthentic(request); + assertTrue(true); + + } + + + + @Test + public void testAddAuthenticator() { + + DMaaPOriginalUebAuthenticator authenticator = new DMaaPOriginalUebAuthenticator(null, 100); + DMaaPOriginalUebAuthenticator authenticator2 = new DMaaPOriginalUebAuthenticator(null, 100); + + authenticator.addAuthenticator(authenticator2); + assertTrue(true); + + } + + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/security/impl/JUnitTestSuite.java index 0593ee5..3a54ac5 100644 --- a/src/test/java/com/att/nsa/cambria/security/impl/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.security.impl; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPMechIdAuthenticatorTest.class, DMaaPOriginalUebAuthenticatorTest.class, -}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security.impl; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPMechIdAuthenticatorTest.class, DMaaPOriginalUebAuthenticatorTest.class, +}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/security/impl/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/TestRunner.java new file mode 100644 index 0000000..2699acd --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/security/impl/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.security.impl; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/AdminServiceImplemTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/AdminServiceImplemTest.java index fd87cdb..1895ac6 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/AdminServiceImplemTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/AdminServiceImplemTest.java @@ -1,182 +1,182 @@ -/*- -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.impl.AdminServiceImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.limits.Blacklist; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) -public class AdminServiceImplemTest { - - @InjectMocks - AdminServiceImpl adminServiceImpl; - - @Mock - DMaaPContext dmaapContext; - @Mock - ConsumerFactory factory; - - @Mock - ConfigurationReader configReader; - @Mock - Blacklist Blacklist; - - @Before - public void setUp() throws Exception { - - MockitoAnnotations.initMocks(this); - PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); - NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); - - PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); - PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); - PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); - - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - } - - @After - public void tearDown() throws Exception { - } - - // ISSUES WITH AUTHENTICATION - @Test - public void testShowConsumerCache() { - - try { - adminServiceImpl.showConsumerCache(dmaapContext); - } catch (IOException | AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testDropConsumerCache() { - - try { - adminServiceImpl.dropConsumerCache(dmaapContext); - } catch (IOException | AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetBlacklist() { - - try { - adminServiceImpl.getBlacklist(dmaapContext); - } catch (IOException | AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testAddToBlacklist() { - - try { - adminServiceImpl.addToBlacklist(dmaapContext, "120.120.120.120"); - } catch (IOException | AccessDeniedException | ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testRemoveFromBlacklist() { - - try { - adminServiceImpl.removeFromBlacklist(dmaapContext, "120.120.120.120"); - } catch (IOException | AccessDeniedException | ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - -} +/*- +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.impl.AdminServiceImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.limits.Blacklist; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) +public class AdminServiceImplemTest { + + @InjectMocks + AdminServiceImpl adminServiceImpl; + + @Mock + DMaaPContext dmaapContext; + @Mock + ConsumerFactory factory; + + @Mock + ConfigurationReader configReader; + @Mock + Blacklist Blacklist; + + @Before + public void setUp() throws Exception { + + MockitoAnnotations.initMocks(this); + PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); + NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); + + PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); + PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); + PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); + + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + } + + @After + public void tearDown() throws Exception { + } + + // ISSUES WITH AUTHENTICATION + @Test + public void testShowConsumerCache() { + + try { + adminServiceImpl.showConsumerCache(dmaapContext); + } catch (IOException | AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testDropConsumerCache() { + + try { + adminServiceImpl.dropConsumerCache(dmaapContext); + } catch (IOException | AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetBlacklist() { + + try { + adminServiceImpl.getBlacklist(dmaapContext); + } catch (IOException | AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testAddToBlacklist() { + + try { + adminServiceImpl.addToBlacklist(dmaapContext, "120.120.120.120"); + } catch (IOException | AccessDeniedException | ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testRemoveFromBlacklist() { + + try { + adminServiceImpl.removeFromBlacklist(dmaapContext, "120.120.120.120"); + } catch (IOException | AccessDeniedException | ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ApiKeysServiceImplTest.java similarity index 92% rename from src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/ApiKeysServiceImplTest.java index 89b25af..a0ad709 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/ApiKeysServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ApiKeysServiceImplTest.java @@ -1,331 +1,331 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.impl.ApiKeysServiceImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Emailer; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.limits.Blacklist; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; -import com.att.nsa.security.db.NsaApiDb; -import com.att.nsa.security.db.NsaApiDb.KeyExistsException; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) -public class ApiKeysServiceImplTest { - - @InjectMocks - ApiKeysServiceImpl service; - - @Mock - DMaaPContext dmaapContext; - @Mock - ConsumerFactory factory; - - @Mock - ConfigurationReader configReader; - @Mock - Blacklist Blacklist; - @Mock - Emailer emailer; - - @Before - public void setUp() throws Exception { - - MockitoAnnotations.initMocks(this); - PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); - NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); - - PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); - PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); - PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); - - PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); - PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer); - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - - } - - @After - public void tearDown() throws Exception { - } - - - @Test - public void testGetAllApiKeys() { - - service = new ApiKeysServiceImpl(); - try { - service.getAllApiKeys(dmaapContext); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testGetApiKey() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - service.getApiKey(dmaapContext, "testkey"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - } - assertTrue(true); - - } - - @Test - public void testGetApiKey_error() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - service.getApiKey(dmaapContext, "k35Hdw6Sde"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - } - - @Test - public void testCreateApiKey() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - service.createApiKey(dmaapContext, new ApiKeyBean("test@onap.com", "testing apikey bean")); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (KeyExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch(NoClassDefFoundError e) { - - } - assertTrue(true); - } - - @Test - public void testUpdateApiKey() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - - service.updateApiKey(dmaapContext, "admin", new ApiKeyBean("test@onapt.com", "testing apikey bean")); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - @Test - public void testUpdateApiKey_error() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - - service.updateApiKey(dmaapContext, null, new ApiKeyBean("test@onapt.com", "testing apikey bean")); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - assertTrue(true); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testDeleteApiKey() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - - service.deleteApiKey(dmaapContext, null); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testDeleteApiKey_error() { - - ApiKeysServiceImpl service = new ApiKeysServiceImpl(); - try { - - service.deleteApiKey(dmaapContext, "admin"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - NsaApiDb fApiKeyDb= new NsaApiDb() { - - - Set keys = new HashSet<>(Arrays.asList("testkey","admin")); - - - @Override - public NsaSimpleApiKey createApiKey(String arg0, String arg1) - throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { - // TODO Auto-generated method stub - return new NsaSimpleApiKey(arg0, arg1); - } - - @Override - public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean deleteApiKey(String arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public Map loadAllKeyRecords() throws ConfigDbException { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set loadAllKeys() throws ConfigDbException { - // TODO Auto-generated method stub - - return keys ; - } - - @Override - public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { - if(!keys.contains(arg0)){ - return null; - } - return new NsaSimpleApiKey(arg0, "password"); - } - - @Override - public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - - } - }; +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.impl.ApiKeysServiceImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Emailer; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.limits.Blacklist; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; +import com.att.nsa.security.db.NsaApiDb; +import com.att.nsa.security.db.NsaApiDb.KeyExistsException; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) +public class ApiKeysServiceImplTest { + + @InjectMocks + ApiKeysServiceImpl service; + + @Mock + DMaaPContext dmaapContext; + @Mock + ConsumerFactory factory; + + @Mock + ConfigurationReader configReader; + @Mock + Blacklist Blacklist; + @Mock + Emailer emailer; + + @Before + public void setUp() throws Exception { + + MockitoAnnotations.initMocks(this); + PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); + NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); + + PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); + PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); + PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); + + PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); + PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer); + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + + } + + @After + public void tearDown() throws Exception { + } + + + @Test + public void testGetAllApiKeys() { + + service = new ApiKeysServiceImpl(); + try { + service.getAllApiKeys(dmaapContext); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testGetApiKey() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + service.getApiKey(dmaapContext, "testkey"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + } + assertTrue(true); + + } + + @Test + public void testGetApiKey_error() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + service.getApiKey(dmaapContext, "k35Hdw6Sde"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + } + + @Test + public void testCreateApiKey() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + service.createApiKey(dmaapContext, new ApiKeyBean("test@onap.com", "testing apikey bean")); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (KeyExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch(NoClassDefFoundError e) { + + } + assertTrue(true); + } + + @Test + public void testUpdateApiKey() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + + service.updateApiKey(dmaapContext, "admin", new ApiKeyBean("test@onapt.com", "testing apikey bean")); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + @Test + public void testUpdateApiKey_error() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + + service.updateApiKey(dmaapContext, null, new ApiKeyBean("test@onapt.com", "testing apikey bean")); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + assertTrue(true); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testDeleteApiKey() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + + service.deleteApiKey(dmaapContext, null); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testDeleteApiKey_error() { + + ApiKeysServiceImpl service = new ApiKeysServiceImpl(); + try { + + service.deleteApiKey(dmaapContext, "admin"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + NsaApiDb fApiKeyDb= new NsaApiDb() { + + + Set keys = new HashSet<>(Arrays.asList("testkey","admin")); + + + @Override + public NsaSimpleApiKey createApiKey(String arg0, String arg1) + throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { + // TODO Auto-generated method stub + return new NsaSimpleApiKey(arg0, arg1); + } + + @Override + public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean deleteApiKey(String arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public Map loadAllKeyRecords() throws ConfigDbException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set loadAllKeys() throws ConfigDbException { + // TODO Auto-generated method stub + + return keys ; + } + + @Override + public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { + if(!keys.contains(arg0)){ + return null; + } + return new NsaSimpleApiKey(arg0, "password"); + } + + @Override + public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + + } + }; } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/BaseTransactionDbImplTest.java similarity index 88% rename from src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/BaseTransactionDbImplTest.java index baef7be..257202c 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/BaseTransactionDbImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/BaseTransactionDbImplTest.java @@ -1,158 +1,158 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.service.impl.BaseTransactionDbImpl; -import com.att.dmf.mr.transaction.DMaaPTransactionObjDB.KeyExistsException; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class BaseTransactionDbImplTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testCreateTransactionObj() { - - - try { - - BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); - service.createTransactionObj("transition"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (KeyExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testSaveTransactionObj() { - - - try { - - BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); - service.saveTransactionObj(null); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testLoadTransactionObj() { - - try { - - BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); - service.loadTransactionObj("34"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - @Test - public void testLoadAllTransactionObjs() { - - try { - - BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); - service.loadAllTransactionObjs(); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.service.impl.BaseTransactionDbImpl; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObjDB.KeyExistsException; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class BaseTransactionDbImplTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testCreateTransactionObj() { + + + try { + + BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); + service.createTransactionObj("transition"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (KeyExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testSaveTransactionObj() { + + + try { + + BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); + service.saveTransactionObj(null); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testLoadTransactionObj() { + + try { + + BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); + service.loadTransactionObj("34"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + @Test + public void testLoadAllTransactionObjs() { + + try { + + BaseTransactionDbImpl service = new BaseTransactionDbImpl(null, null); + service.loadAllTransactionObjs(); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/EventsServiceImplTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/EventsServiceImplTest.java index 8cd560d..1e677d8 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/EventsServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/EventsServiceImplTest.java @@ -1,312 +1,312 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.mockito.Mockito.when; -import static org.mockito.Matchers.anyString; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ConcurrentModificationException; -import java.util.Map; -import java.util.Properties; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; - -import com.att.ajsc.beans.PropertiesMapBean; -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.service.impl.EventsServiceImpl; -import com.att.dmf.mr.utils.PropertyReader; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue; -import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException; -import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; -import com.att.nsa.limits.Blacklist; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; -import com.att.nsa.security.NsaApiKey; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import kafka.admin.AdminUtils; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ DMaaPAuthenticatorImpl.class, AJSCPropertiesMap.class }) -public class EventsServiceImplTest { - - private InputStream iStream = null; - DMaaPContext dMaapContext = new DMaaPContext(); - EventsServiceImpl service = new EventsServiceImpl(); - DMaaPErrorMessages pErrorMessages = new DMaaPErrorMessages(); - @Mock - ConfigurationReader configurationReader; - @Mock - Blacklist blacklist; - @Mock - DMaaPAuthenticator dmaaPAuthenticator; - @Mock - DMaaPAAFAuthenticator dmaapAAFauthenticator; - @Mock - NsaApiKey user; - @Mock - NsaSimpleApiKey nsaSimpleApiKey; - @Mock - DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; - @Mock - Topic createdTopic; - @Mock - ConsumerFactory factory; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - String source = "source of my InputStream"; - iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); - - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - dMaapContext.setRequest(request); - dMaapContext.setResponse(response); - when(blacklist.contains(anyString())).thenReturn(false); - when(configurationReader.getfIpBlackList()).thenReturn(blacklist); - dMaapContext.setConfigReader(configurationReader); - - service.setErrorMessages(pErrorMessages); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("100"); - - AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout"); - - } - - @Test(expected = CambriaApiException.class) - public void testGetEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException { - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - } - - @Test(expected = CambriaApiException.class) - public void testGetEventsBlackListErr() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException { - when(blacklist.contains(anyString())).thenReturn(true); - when(configurationReader.getfIpBlackList()).thenReturn(blacklist); - dMaapContext.setConfigReader(configurationReader); - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - } - - @Test(expected = CambriaApiException.class) - public void testGetEventsNoTopicError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException { - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(null); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - } - - @Test(expected = CambriaApiException.class) - public void testGetEventsuserNull() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException { - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - MockHttpServletRequest mockRequest = new MockHttpServletRequest(); - mockRequest.addHeader("Authorization", "passed"); - dMaapContext.setRequest(mockRequest); - dMaapContext.getRequest().getHeader("Authorization"); - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - } - - @Test(expected = CambriaApiException.class) - public void testGetEventsExcp2() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException { - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - when(configurationReader.getfRateLimiter()).thenThrow(new ConcurrentModificationException("Error occurred")); - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - } - - @Test(expected = CambriaApiException.class) - public void testPushEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, - invalidSettingValue, loadException { - - // AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10, - // 1, new Properties()); - - configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); - - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - - service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); - - service.getEvents(dMaapContext, "testTopic", "CG1", "23"); - - /* - * String trueValue = "True"; - * assertTrue(trueValue.equalsIgnoreCase("True")); - */ - - } - - @Test(expected = CambriaApiException.class) - public void testPushEventsBlackListedIp() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, - invalidSettingValue, loadException { - - // AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10, - // 1, new Properties()); - when(blacklist.contains(anyString())).thenReturn(true); - when(configurationReader.getfIpBlackList()).thenReturn(blacklist); - configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - - service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); - - } - - @Test(expected = NullPointerException.class) - public void testPushEventsNoUser() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, - invalidSettingValue, loadException { - - configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); - - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - MockHttpServletRequest mockRequest = new MockHttpServletRequest(); - mockRequest.addHeader("Authorization", "passed"); - mockRequest.addHeader("Authorization", "passed"); - dMaapContext.setRequest(mockRequest); - dMaapContext.getRequest().getHeader("Authorization"); - service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); - - } - - @Test(expected = CambriaApiException.class) - public void testPushEventsWtTransaction() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, - invalidSettingValue, loadException { - - configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); - - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true"); - - service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); - - } - - @Test(expected = CambriaApiException.class) - public void testPushEventsWtTransactionError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, - TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, - invalidSettingValue, loadException { - - configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); - - when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); - when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); - PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true"); - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("0"); - when(configurationReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred")); - - service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); - - } - - @Test - public void testIsTransEnabled1() { - - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, - "transidUEBtopicreqd")).thenReturn("true"); - assertTrue(service.isTransEnabled()); - - } - @Test - public void testIsTransEnabled2() { - - when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, - "transidUEBtopicreqd")).thenReturn("false"); - assertFalse(service.isTransEnabled()); - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.mockito.Mockito.when; +import static org.mockito.Matchers.anyString; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ConcurrentModificationException; +import java.util.Map; +import java.util.Properties; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +import com.att.ajsc.beans.PropertiesMapBean; +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.service.impl.EventsServiceImpl; +import org.onap.dmaap.dmf.mr.utils.PropertyReader; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue; +import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException; +import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; +import com.att.nsa.limits.Blacklist; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; +import com.att.nsa.security.NsaApiKey; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import kafka.admin.AdminUtils; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ DMaaPAuthenticatorImpl.class, AJSCPropertiesMap.class }) +public class EventsServiceImplTest { + + private InputStream iStream = null; + DMaaPContext dMaapContext = new DMaaPContext(); + EventsServiceImpl service = new EventsServiceImpl(); + DMaaPErrorMessages pErrorMessages = new DMaaPErrorMessages(); + @Mock + ConfigurationReader configurationReader; + @Mock + Blacklist blacklist; + @Mock + DMaaPAuthenticator dmaaPAuthenticator; + @Mock + DMaaPAAFAuthenticator dmaapAAFauthenticator; + @Mock + NsaApiKey user; + @Mock + NsaSimpleApiKey nsaSimpleApiKey; + @Mock + DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; + @Mock + Topic createdTopic; + @Mock + ConsumerFactory factory; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + String source = "source of my InputStream"; + iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); + + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + dMaapContext.setRequest(request); + dMaapContext.setResponse(response); + when(blacklist.contains(anyString())).thenReturn(false); + when(configurationReader.getfIpBlackList()).thenReturn(blacklist); + dMaapContext.setConfigReader(configurationReader); + + service.setErrorMessages(pErrorMessages); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("100"); + + AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout"); + + } + + @Test(expected = CambriaApiException.class) + public void testGetEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException { + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + } + + @Test(expected = CambriaApiException.class) + public void testGetEventsBlackListErr() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException { + when(blacklist.contains(anyString())).thenReturn(true); + when(configurationReader.getfIpBlackList()).thenReturn(blacklist); + dMaapContext.setConfigReader(configurationReader); + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + } + + @Test(expected = CambriaApiException.class) + public void testGetEventsNoTopicError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException { + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(null); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + } + + @Test(expected = CambriaApiException.class) + public void testGetEventsuserNull() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException { + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + MockHttpServletRequest mockRequest = new MockHttpServletRequest(); + mockRequest.addHeader("Authorization", "passed"); + dMaapContext.setRequest(mockRequest); + dMaapContext.getRequest().getHeader("Authorization"); + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + } + + @Test(expected = CambriaApiException.class) + public void testGetEventsExcp2() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException { + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + when(configurationReader.getfRateLimiter()).thenThrow(new ConcurrentModificationException("Error occurred")); + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + } + + @Test(expected = CambriaApiException.class) + public void testPushEvents() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, + invalidSettingValue, loadException { + + // AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10, + // 1, new Properties()); + + configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); + + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + + service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); + + service.getEvents(dMaapContext, "testTopic", "CG1", "23"); + + /* + * String trueValue = "True"; + * assertTrue(trueValue.equalsIgnoreCase("True")); + */ + + } + + @Test(expected = CambriaApiException.class) + public void testPushEventsBlackListedIp() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, + invalidSettingValue, loadException { + + // AdminUtils.createTopic(configurationReader.getZk(), "testTopic", 10, + // 1, new Properties()); + when(blacklist.contains(anyString())).thenReturn(true); + when(configurationReader.getfIpBlackList()).thenReturn(blacklist); + configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + + service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); + + } + + @Test(expected = NullPointerException.class) + public void testPushEventsNoUser() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, + invalidSettingValue, loadException { + + configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); + + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(null); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + MockHttpServletRequest mockRequest = new MockHttpServletRequest(); + mockRequest.addHeader("Authorization", "passed"); + mockRequest.addHeader("Authorization", "passed"); + dMaapContext.setRequest(mockRequest); + dMaapContext.getRequest().getHeader("Authorization"); + service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); + + } + + @Test(expected = CambriaApiException.class) + public void testPushEventsWtTransaction() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, + invalidSettingValue, loadException { + + configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); + + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true"); + + service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); + + } + + @Test(expected = CambriaApiException.class) + public void testPushEventsWtTransactionError() throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException, + TopicExistsException, AccessDeniedException, UnavailableException, IOException, missingReqdSetting, + invalidSettingValue, loadException { + + configurationReader.setfRateLimiter(new DMaaPCambriaLimiter(new PropertyReader())); + + when(dmaaPAuthenticator.authenticate(dMaapContext)).thenReturn(nsaSimpleApiKey); + when(configurationReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(createdTopic); + PowerMockito.when(configurationReader.getfConsumerFactory()).thenReturn(factory); + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "transidUEBtopicreqd")).thenReturn("true"); + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("0"); + when(configurationReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred")); + + service.pushEvents(dMaapContext, "testTopic", iStream, "3", "12:00:00"); + + } + + @Test + public void testIsTransEnabled1() { + + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, + "transidUEBtopicreqd")).thenReturn("true"); + assertTrue(service.isTransEnabled()); + + } + @Test + public void testIsTransEnabled2() { + + when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, + "transidUEBtopicreqd")).thenReturn("false"); + assertFalse(service.isTransEnabled()); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/JUnitTestSuite.java index 8abafcc..c437fe4 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/JUnitTestSuite.java @@ -1,43 +1,43 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import junit.framework.TestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ UIServiceImplTest.class, AdminServiceImplemTest.class, ApiKeysServiceImplTest.class, - ShowConsumerCacheTest.class,TopicServiceImplTest.class, TransactionServiceImplTest.class, MMServiceImplTest.class, - BaseTransactionDbImplTest.class, MetricsServiceImplTest.class,EventsServiceImplTest.class}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ UIServiceImplTest.class, AdminServiceImplemTest.class, ApiKeysServiceImplTest.class, + ShowConsumerCacheTest.class,TopicServiceImplTest.class, TransactionServiceImplTest.class, MMServiceImplTest.class, + BaseTransactionDbImplTest.class, MetricsServiceImplTest.class,EventsServiceImplTest.class}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MMServiceImplTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/MMServiceImplTest.java index f97952c..20a8cad 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/MMServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MMServiceImplTest.java @@ -1,382 +1,382 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.ConcurrentModificationException; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.att.ajsc.beans.PropertiesMapBean; -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.impl.MMServiceImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Emailer; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; -import com.att.nsa.limits.Blacklist; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; -import com.att.nsa.security.db.NsaApiDb; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import static org.mockito.Matchers.anyString; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class, PropertiesMapBean.class, - AJSCPropertiesMap.class }) -public class MMServiceImplTest { - - @InjectMocks - MMServiceImpl service; - - @Mock - DMaaPContext dmaapContext; - @Mock - ConsumerFactory factory; - @Mock - private DMaaPErrorMessages errorMessages; - @Mock - ConfigurationReader configReader; - @Mock - Blacklist Blacklist; - @Mock - Emailer emailer; - @Mock - DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; - @Mock - Topic metatopic; - - @Before - public void setUp() throws Exception { - - MockitoAnnotations.initMocks(this); - PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); - NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); - - PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); - PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); - PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); - - PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); - PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer); - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - PowerMockito.when(dmaapContext.getRequest()).thenReturn(request); - PowerMockito.when(dmaapContext.getResponse()).thenReturn(response); - - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(PropertiesMapBean.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("1000"); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "pretty")).thenReturn("true"); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "meta")).thenReturn("true"); - PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testSubscribe_Blacklistip() { - - try { - PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true); - service.subscribe(dmaapContext, "testTopic", "CG1", "23"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - } catch (CambriaApiException e) { - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (UnavailableException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testSubscribe_NullTopic() { - - try { - PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null); - service.subscribe(dmaapContext, "testTopic", "CG1", "23"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (CambriaApiException e) { - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (UnavailableException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test(expected = CambriaApiException.class) - public void testSubscribe_NullTopic_Error() throws ConfigDbException, TopicExistsException, AccessDeniedException, UnavailableException, - CambriaApiException, IOException { - - PowerMockito.when(configReader.getfMetrics()).thenThrow(new ConcurrentModificationException("Error occurred")); - PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(metatopic); - service.subscribe(dmaapContext, "testTopic", "CG1", "23"); - } - - @Test - public void testPushEvents_wttransaction() { - - String source = "source of my InputStream"; - - try { - InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); - service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap", iStream, "3", "12:00:00"); - - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (CambriaApiException e) { - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Test(expected = CambriaApiException.class) - public void testPushEvents_wttransaction_error() throws Exception { - - String source = "source of my InputStream"; - - InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(PropertiesMapBean.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("-5"); - PowerMockito.when(configReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred")); - service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap1", iStream, "3", "12:00:00"); - - } - - @Test - public void testPushEvents() { - - String source = "source of my InputStream"; - - try { - InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); - service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00"); - - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (CambriaApiException e) { - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - @Test - public void testPushEvents_blacklistip() { - - String source = "source of my InputStream"; - - try { - PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true); - InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); - service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00"); - - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (CambriaApiException e) { - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TopicExistsException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (AccessDeniedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (missingReqdSetting e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - NsaApiDb fApiKeyDb = new NsaApiDb() { - - Set keys = new HashSet<>(Arrays.asList("testkey", "admin")); - - @Override - public NsaSimpleApiKey createApiKey(String arg0, String arg1) - throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { - // TODO Auto-generated method stub - return new NsaSimpleApiKey(arg0, arg1); - } - - @Override - public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean deleteApiKey(String arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public Map loadAllKeyRecords() throws ConfigDbException { - // TODO Auto-generated method stub - return null; - } - - @Override - public Set loadAllKeys() throws ConfigDbException { - // TODO Auto-generated method stub - - return keys; - } - - @Override - public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { - if (!keys.contains(arg0)) { - return null; - } - return new NsaSimpleApiKey(arg0, "password"); - } - - @Override - public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - - } - }; - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.ConcurrentModificationException; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import com.att.ajsc.beans.PropertiesMapBean; +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.impl.MMServiceImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Emailer; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; +import com.att.nsa.limits.Blacklist; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; +import com.att.nsa.security.db.NsaApiDb; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import static org.mockito.Matchers.anyString; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class, PropertiesMapBean.class, + AJSCPropertiesMap.class }) +public class MMServiceImplTest { + + @InjectMocks + MMServiceImpl service; + + @Mock + DMaaPContext dmaapContext; + @Mock + ConsumerFactory factory; + @Mock + private DMaaPErrorMessages errorMessages; + @Mock + ConfigurationReader configReader; + @Mock + Blacklist Blacklist; + @Mock + Emailer emailer; + @Mock + DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; + @Mock + Topic metatopic; + + @Before + public void setUp() throws Exception { + + MockitoAnnotations.initMocks(this); + PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); + NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); + + PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); + PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); + PowerMockito.when(configReader.getfIpBlackList()).thenReturn(Blacklist); + + PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); + PowerMockito.when(configReader.getSystemEmailer()).thenReturn(emailer); + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + + MockHttpServletRequest request = new MockHttpServletRequest(); + MockHttpServletResponse response = new MockHttpServletResponse(); + PowerMockito.when(dmaapContext.getRequest()).thenReturn(request); + PowerMockito.when(dmaapContext.getResponse()).thenReturn(response); + + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(PropertiesMapBean.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "timeout")).thenReturn("1000"); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "pretty")).thenReturn("true"); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "meta")).thenReturn("true"); + PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testSubscribe_Blacklistip() { + + try { + PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true); + service.subscribe(dmaapContext, "testTopic", "CG1", "23"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + } catch (CambriaApiException e) { + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnavailableException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testSubscribe_NullTopic() { + + try { + PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null); + service.subscribe(dmaapContext, "testTopic", "CG1", "23"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (CambriaApiException e) { + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnavailableException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test(expected = CambriaApiException.class) + public void testSubscribe_NullTopic_Error() throws ConfigDbException, TopicExistsException, AccessDeniedException, UnavailableException, + CambriaApiException, IOException { + + PowerMockito.when(configReader.getfMetrics()).thenThrow(new ConcurrentModificationException("Error occurred")); + PowerMockito.when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(metatopic); + service.subscribe(dmaapContext, "testTopic", "CG1", "23"); + } + + @Test + public void testPushEvents_wttransaction() { + + String source = "source of my InputStream"; + + try { + InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); + service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap", iStream, "3", "12:00:00"); + + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (CambriaApiException e) { + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test(expected = CambriaApiException.class) + public void testPushEvents_wttransaction_error() throws Exception { + + String source = "source of my InputStream"; + + InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(PropertiesMapBean.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "event.batch.length")).thenReturn("-5"); + PowerMockito.when(configReader.getfPublisher()).thenThrow(new ConcurrentModificationException("Error occurred")); + service.pushEvents(dmaapContext, "msgrtr.apinode.metrics.dmaap1", iStream, "3", "12:00:00"); + + } + + @Test + public void testPushEvents() { + + String source = "source of my InputStream"; + + try { + InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); + service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00"); + + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (CambriaApiException e) { + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void testPushEvents_blacklistip() { + + String source = "source of my InputStream"; + + try { + PowerMockito.when(Blacklist.contains("127.0.0.1")).thenReturn(true); + InputStream iStream = new ByteArrayInputStream(source.getBytes("UTF-8")); + service.pushEvents(dmaapContext, "testTopic", iStream, "3", "12:00:00"); + + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (CambriaApiException e) { + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TopicExistsException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (AccessDeniedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (missingReqdSetting e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + NsaApiDb fApiKeyDb = new NsaApiDb() { + + Set keys = new HashSet<>(Arrays.asList("testkey", "admin")); + + @Override + public NsaSimpleApiKey createApiKey(String arg0, String arg1) + throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { + // TODO Auto-generated method stub + return new NsaSimpleApiKey(arg0, arg1); + } + + @Override + public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean deleteApiKey(String arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public Map loadAllKeyRecords() throws ConfigDbException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set loadAllKeys() throws ConfigDbException { + // TODO Auto-generated method stub + + return keys; + } + + @Override + public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { + if (!keys.contains(arg0)) { + return null; + } + return new NsaSimpleApiKey(arg0, "password"); + } + + @Override + public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + + } + }; + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MessageTest.java similarity index 89% rename from src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/MessageTest.java index 1d5c9c0..e946b66 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/MessageTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MessageTest.java @@ -1,64 +1,64 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; - -public class MessageTest implements message { - - @Override - public String getKey() { - // TODO Auto-generated method stub - return "123"; - } - - @Override - public String getMessage() { - // TODO Auto-generated method stub - return "Msg"; - } - - @Override - public void setLogDetails(LogDetails logDetails) { - // TODO Auto-generated method stub - - } - - @Override - public LogDetails getLogDetails() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isTransactionEnabled() { - // TODO Auto-generated method stub - return false; - } - - @Override - public void setTransactionEnabled(boolean transactionEnabled) { - // TODO Auto-generated method stub - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; + +public class MessageTest implements message { + + @Override + public String getKey() { + // TODO Auto-generated method stub + return "123"; + } + + @Override + public String getMessage() { + // TODO Auto-generated method stub + return "Msg"; + } + + @Override + public void setLogDetails(LogDetails logDetails) { + // TODO Auto-generated method stub + + } + + @Override + public LogDetails getLogDetails() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isTransactionEnabled() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setTransactionEnabled(boolean transactionEnabled) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MetricsServiceImplTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/MetricsServiceImplTest.java index e372d38..51ee4d4 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/MetricsServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/MetricsServiceImplTest.java @@ -1,95 +1,95 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.impl.MetricsServiceImpl; - -public class MetricsServiceImplTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGet() { - - MetricsServiceImpl service = new MetricsServiceImpl(); - try { - service.get(new DMaaPContext()); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - @Test - public void testGetMetricByName() { - - MetricsServiceImpl service = new MetricsServiceImpl(); - try { - service.getMetricByName(new DMaaPContext(), "uptime"); - } catch (org.json.JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - //e.printStackTrace(); - assertTrue(true); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (CambriaApiException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.impl.MetricsServiceImpl; + +public class MetricsServiceImplTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGet() { + + MetricsServiceImpl service = new MetricsServiceImpl(); + try { + service.get(new DMaaPContext()); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + @Test + public void testGetMetricByName() { + + MetricsServiceImpl service = new MetricsServiceImpl(); + try { + service.getMetricByName(new DMaaPContext(), "uptime"); + } catch (org.json.JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + //e.printStackTrace(); + assertTrue(true); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (CambriaApiException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java similarity index 81% rename from src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java index 4dd3076..5d058b9 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/ShowConsumerCacheTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/ShowConsumerCacheTest.java @@ -1,149 +1,149 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.mockito.runners.MockitoJUnitRunner; - -import com.att.aft.dme2.internal.jettison.json.JSONArray; -import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.aft.dme2.internal.jettison.json.JSONObject; - -import com.att.ajsc.beans.PropertiesMapBean; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.nsa.security.NsaApiKey; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import jline.internal.Log; -import kafka.consumer.Consumer; - - - -//@RunWith(MockitoJUnitRunner.class) -//@RunWith(PowerMockRunner.class) -//@PrepareForTest(PropertiesMapBean.class) -public class ShowConsumerCacheTest { -/* -@InjectMocks -TopicServiceImpl topicService; - -@Mock -private DMaaPErrorMessages errorMessages; - -@Mock -DMaaPContext dmaapContext; - -@Mock -ConfigurationReader configReader; - - -@Mock -JSONObject consumers; - -@Mock -JSONObject consumerObject; - -@Mock -JSONArray jsonConsumersList; - -@Mock -DMaaPAuthenticator dmaaPAuthenticator; - -@Mock -NsaApiKey user; - -@Mock -NsaSimpleApiKey nsaSimpleApiKey; - -@Mock -HttpServletRequest httpServReq; - - -@Before -public void setUp(){ -MockitoAnnotations.initMocks(this); -} - - -//@Test(expected = DMaaPAccessDeniedException.class) -@Test -public void testShowConsmerCache()throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException, JSONException{ -Assert.assertNotNull(topicService); - -String myName = "Brian"; -Object created = null; -Object accessed = null; -Object log = null; -Object info = null; - -when(consumerObject.put("name", myName)).thenReturn(consumerObject); -when(consumerObject.put("created", created)).thenReturn(consumerObject); -when(consumerObject.put("accessed", accessed)).thenReturn(consumerObject); -when(consumerObject.put("accessed", Consumer.class)).thenReturn(consumerObject); -when(jsonConsumersList.put(consumerObject)).thenReturn(null); - -when(consumers.put("consumers", jsonConsumersList)).thenReturn(consumerObject); - - - -}*/ - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.runners.MockitoJUnitRunner; + +import com.att.aft.dme2.internal.jettison.json.JSONArray; +import com.att.aft.dme2.internal.jettison.json.JSONException; +import com.att.aft.dme2.internal.jettison.json.JSONObject; + +import com.att.ajsc.beans.PropertiesMapBean; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import com.att.nsa.security.NsaApiKey; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import jline.internal.Log; +import kafka.consumer.Consumer; + + + +//@RunWith(MockitoJUnitRunner.class) +//@RunWith(PowerMockRunner.class) +//@PrepareForTest(PropertiesMapBean.class) +public class ShowConsumerCacheTest { +/* +@InjectMocks +TopicServiceImpl topicService; + +@Mock +private DMaaPErrorMessages errorMessages; + +@Mock +DMaaPContext dmaapContext; + +@Mock +ConfigurationReader configReader; + + +@Mock +JSONObject consumers; + +@Mock +JSONObject consumerObject; + +@Mock +JSONArray jsonConsumersList; + +@Mock +DMaaPAuthenticator dmaaPAuthenticator; + +@Mock +NsaApiKey user; + +@Mock +NsaSimpleApiKey nsaSimpleApiKey; + +@Mock +HttpServletRequest httpServReq; + + +@Before +public void setUp(){ +MockitoAnnotations.initMocks(this); +} + + +//@Test(expected = DMaaPAccessDeniedException.class) +@Test +public void testShowConsmerCache()throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException, JSONException{ +Assert.assertNotNull(topicService); + +String myName = "Brian"; +Object created = null; +Object accessed = null; +Object log = null; +Object info = null; + +when(consumerObject.put("name", myName)).thenReturn(consumerObject); +when(consumerObject.put("created", created)).thenReturn(consumerObject); +when(consumerObject.put("accessed", accessed)).thenReturn(consumerObject); +when(consumerObject.put("accessed", Consumer.class)).thenReturn(consumerObject); +when(jsonConsumersList.put(consumerObject)).thenReturn(null); + +when(consumers.put("consumers", jsonConsumersList)).thenReturn(consumerObject); + + + +}*/ + + } \ No newline at end of file diff --git a/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TestRunner.java new file mode 100644 index 0000000..277950a --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TopicServiceImplTest.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/TopicServiceImplTest.java index 47b351e..e5d3233 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/TopicServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TopicServiceImplTest.java @@ -1,766 +1,766 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import com.att.ajsc.beans.PropertiesMapBean; -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.impl.TopicServiceImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.NsaAcl; -import com.att.nsa.security.NsaApiKey; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -//@RunWith(MockitoJUnitRunner.class) -@RunWith(PowerMockRunner.class) -@PrepareForTest({ PropertiesMapBean.class, DMaaPAuthenticatorImpl.class,AJSCPropertiesMap.class,DMaaPResponseBuilder.class }) -public class TopicServiceImplTest { - - TopicServiceImpl topicService; - - @Mock - private DMaaPErrorMessages errorMessages; - - @Mock - DMaaPContext dmaapContext; - - @Mock - ConfigurationReader configReader; - - @Mock - ServletOutputStream oStream; - - @Mock - DMaaPAuthenticator dmaaPAuthenticator; - - @Mock - DMaaPAAFAuthenticator dmaapAAFauthenticator; - @Mock - NsaApiKey user; - - @Mock - NsaSimpleApiKey nsaSimpleApiKey; - - @Mock - HttpServletRequest httpServReq; - - @Mock - HttpServletResponse httpServRes; - - @Mock - DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; - - @Mock - Topic createdTopic; - - @Mock - NsaAcl nsaAcl; - - @Mock - JSONObject jsonObj; - - @Mock - JSONArray jsonArray; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - topicService = new TopicServiceImpl(); - topicService.setErrorMessages(errorMessages); - NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); - PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); - } - - @Test(expected = NullPointerException.class) - public void testCreateTopicWithEnforcedName() - throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { - - Assert.assertNotNull(topicService); - PowerMockito.mockStatic(PropertiesMapBean.class); - - when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) - .thenReturn("enfTopicName"); - - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey); - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - topicService.createTopic(dmaapContext, topicBean); - } - - @Test - public void testCreateTopicWithTopicNameNotEnforced() - throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,IOException,TopicExistsException, com.att.dmf.mr.metabroker.Broker1.TopicExistsException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(PropertiesMapBean.class); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - - when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) - .thenReturn("enfTopicName"); - - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey); - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - - when(nsaAcl.isActive()).thenReturn(true); - when(nsaAcl.getUsers()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(",")))); - - when(createdTopic.getName()).thenReturn("topicName"); - when(createdTopic.getOwner()).thenReturn("Owner"); - when(createdTopic.getDescription()).thenReturn("Description"); - when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); - when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); - - when(dmaapKafkaMetaBroker.createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(), anyBoolean())) - .thenReturn(createdTopic); - - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("NotEnforcedTopicName"); - - topicService.createTopic(dmaapContext, topicBean); - - verify(dmaapKafkaMetaBroker, times(1)).createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(), - anyBoolean()); - } - - @Test(expected = NullPointerException.class) - public void testCreateTopicNoUserInContextAndNoAuthHeader() - throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(PropertiesMapBean.class); - - when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) - .thenReturn("enfTopicName"); - - when(httpServReq.getHeader("Authorization")).thenReturn(null); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - topicService.createTopic(dmaapContext, topicBean); - } - - @Test(expected = NullPointerException.class) - public void testCreateTopicNoUserInContextAndAuthHeaderAndPermitted() - throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(PropertiesMapBean.class); - - when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) - .thenReturn("enfTopicName"); - - when(httpServReq.getHeader("Authorization")).thenReturn("Authorization"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - - // when(dmaapAAFauthenticator.aafAuthentication(httpServReq, - // anyString())).thenReturn(false); - - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - topicService.createTopic(dmaapContext, topicBean); - } - - @Test(expected = TopicExistsException.class) - public void testGetTopics_null_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException { - - Assert.assertNotNull(topicService); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null); - - topicService.getTopic(dmaapContext, "topicName"); - } - - @Test - public void testGetTopics_NonNull_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException { - - Assert.assertNotNull(topicService); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - - when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(createdTopic); - - when(createdTopic.getName()).thenReturn("topicName"); - when(createdTopic.getDescription()).thenReturn("topicDescription"); - when(createdTopic.getOwners()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(",")))); - - when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); - when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); - - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(httpServRes.getOutputStream()).thenReturn(oStream); - - topicService.getTopic(dmaapContext, "topicName"); - } - - @Test(expected = TopicExistsException.class) - public void testGetPublishersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException, - IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); - - topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); - - } - - @Test - public void testGetPublishersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException, - IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); - when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); - topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); - } - - @Test(expected = TopicExistsException.class) - public void testGetConsumersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException, - IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); - - topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name"); - - } - - @Test - public void testGetConsumersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException, - IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); - - when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); - - topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name"); - } - - @Test - public void testGetPublishersByTopicName() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - - PowerMockito.mockStatic(AJSCPropertiesMap.class); - - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("topicFactoryAAF"); - - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); - - when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); - - topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); - } - - @Test(expected=TopicExistsException.class) - public void testGetPublishersByTopicNameError() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - - PowerMockito.mockStatic(AJSCPropertiesMap.class); - - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("topicFactoryAAF"); - - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(httpServReq.getMethod()).thenReturn("HEAD"); - - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); - - when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); - - topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); - } - - @Test - public void testdeleteTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); - } - - @Test(expected=TopicExistsException.class) - public void testdeleteTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); - } - - /*@Test(expected=DMaaPAccessDeniedException.class) - public void testdeleteTopic_authHeader() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(null); - topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); - }*/ - - @Test - public void testPermitConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - @Test(expected=TopicExistsException.class) - public void testPermitConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - @Test - public void testdenyConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - @Test(expected=TopicExistsException.class) - public void testdenyConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - - @Test - public void testPermitPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - @Test(expected=TopicExistsException.class) - public void testPermitPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin"); - } - - @Test - public void testDenyPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - when(dmaapContext.getResponse()).thenReturn(httpServRes); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");; - } - - @Test(expected=TopicExistsException.class) - public void testDenyPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");; - } - - @Test - public void testGetAllTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.getAllTopics(dmaapContext); - } - - @Test - public void testGetTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException, - TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { - - Assert.assertNotNull(topicService); - - // PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.mockStatic(AJSCPropertiesMap.class); - PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) - .thenReturn("hello"); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); - when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); - when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); - when(dmaapContext.getRequest()).thenReturn(httpServReq); - - when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); - when(dmaapContext.getConfigReader()).thenReturn(configReader); - when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); - TopicBean topicBean = new TopicBean(); - topicBean.setTopicName("enfTopicNamePlusExtra"); - - topicService.getTopics(dmaapContext); - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import com.att.ajsc.beans.PropertiesMapBean; +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.impl.TopicServiceImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.NsaAcl; +import com.att.nsa.security.NsaApiKey; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +//@RunWith(MockitoJUnitRunner.class) +@RunWith(PowerMockRunner.class) +@PrepareForTest({ PropertiesMapBean.class, DMaaPAuthenticatorImpl.class,AJSCPropertiesMap.class,DMaaPResponseBuilder.class }) +public class TopicServiceImplTest { + + TopicServiceImpl topicService; + + @Mock + private DMaaPErrorMessages errorMessages; + + @Mock + DMaaPContext dmaapContext; + + @Mock + ConfigurationReader configReader; + + @Mock + ServletOutputStream oStream; + + @Mock + DMaaPAuthenticator dmaaPAuthenticator; + + @Mock + DMaaPAAFAuthenticator dmaapAAFauthenticator; + @Mock + NsaApiKey user; + + @Mock + NsaSimpleApiKey nsaSimpleApiKey; + + @Mock + HttpServletRequest httpServReq; + + @Mock + HttpServletResponse httpServRes; + + @Mock + DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; + + @Mock + Topic createdTopic; + + @Mock + NsaAcl nsaAcl; + + @Mock + JSONObject jsonObj; + + @Mock + JSONArray jsonArray; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + topicService = new TopicServiceImpl(); + topicService.setErrorMessages(errorMessages); + NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); + PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); + } + + @Test(expected = NullPointerException.class) + public void testCreateTopicWithEnforcedName() + throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { + + Assert.assertNotNull(topicService); + PowerMockito.mockStatic(PropertiesMapBean.class); + + when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) + .thenReturn("enfTopicName"); + + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey); + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + topicService.createTopic(dmaapContext, topicBean); + } + + @Test + public void testCreateTopicWithTopicNameNotEnforced() + throws DMaaPAccessDeniedException, CambriaApiException, ConfigDbException,IOException,TopicExistsException, org.onap.dmaap.dmf.mr.metabroker.Broker1.TopicExistsException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(PropertiesMapBean.class); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + + when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) + .thenReturn("enfTopicName"); + + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(nsaSimpleApiKey); + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + + when(nsaAcl.isActive()).thenReturn(true); + when(nsaAcl.getUsers()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(",")))); + + when(createdTopic.getName()).thenReturn("topicName"); + when(createdTopic.getOwner()).thenReturn("Owner"); + when(createdTopic.getDescription()).thenReturn("Description"); + when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); + when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); + + when(dmaapKafkaMetaBroker.createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(), anyBoolean())) + .thenReturn(createdTopic); + + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("NotEnforcedTopicName"); + + topicService.createTopic(dmaapContext, topicBean); + + verify(dmaapKafkaMetaBroker, times(1)).createTopic(anyString(), anyString(), anyString(), anyInt(), anyInt(), + anyBoolean()); + } + + @Test(expected = NullPointerException.class) + public void testCreateTopicNoUserInContextAndNoAuthHeader() + throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(PropertiesMapBean.class); + + when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) + .thenReturn("enfTopicName"); + + when(httpServReq.getHeader("Authorization")).thenReturn(null); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + topicService.createTopic(dmaapContext, topicBean); + } + + @Test(expected = NullPointerException.class) + public void testCreateTopicNoUserInContextAndAuthHeaderAndPermitted() + throws DMaaPAccessDeniedException, CambriaApiException, IOException, TopicExistsException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(PropertiesMapBean.class); + + when(PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF")) + .thenReturn("enfTopicName"); + + when(httpServReq.getHeader("Authorization")).thenReturn("Authorization"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + + // when(dmaapAAFauthenticator.aafAuthentication(httpServReq, + // anyString())).thenReturn(false); + + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + topicService.createTopic(dmaapContext, topicBean); + } + + @Test(expected = TopicExistsException.class) + public void testGetTopics_null_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException { + + Assert.assertNotNull(topicService); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(null); + + topicService.getTopic(dmaapContext, "topicName"); + } + + @Test + public void testGetTopics_NonNull_topic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException { + + Assert.assertNotNull(topicService); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + + when(dmaapKafkaMetaBroker.getTopic(anyString())).thenReturn(createdTopic); + + when(createdTopic.getName()).thenReturn("topicName"); + when(createdTopic.getDescription()).thenReturn("topicDescription"); + when(createdTopic.getOwners()).thenReturn(new HashSet<>(Arrays.asList("user1,user2".split(",")))); + + when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); + when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); + + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(httpServRes.getOutputStream()).thenReturn(oStream); + + topicService.getTopic(dmaapContext, "topicName"); + } + + @Test(expected = TopicExistsException.class) + public void testGetPublishersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException, + IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); + + topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); + + } + + @Test + public void testGetPublishersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException, + IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); + when(createdTopic.getWriterAcl()).thenReturn(nsaAcl); + topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); + } + + @Test(expected = TopicExistsException.class) + public void testGetConsumersByTopicName_nullTopic() throws DMaaPAccessDeniedException, CambriaApiException, + IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); + + topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name"); + + } + + @Test + public void testGetConsumersByTopicName_nonNullTopic() throws DMaaPAccessDeniedException, CambriaApiException, + IOException, TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); + + when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); + + topicService.getConsumersByTopicName(dmaapContext, "topicNamespace.name"); + } + + @Test + public void testGetPublishersByTopicName() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + + PowerMockito.mockStatic(AJSCPropertiesMap.class); + + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("topicFactoryAAF"); + + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(createdTopic); + + when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); + + topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); + } + + @Test(expected=TopicExistsException.class) + public void testGetPublishersByTopicNameError() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + + PowerMockito.mockStatic(AJSCPropertiesMap.class); + + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("topicFactoryAAF"); + + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(httpServReq.getMethod()).thenReturn("HEAD"); + + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.name")).thenReturn(null); + + when(createdTopic.getReaderAcl()).thenReturn(nsaAcl); + + topicService.getPublishersByTopicName(dmaapContext, "topicNamespace.name"); + } + + @Test + public void testdeleteTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); + } + + @Test(expected=TopicExistsException.class) + public void testdeleteTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); + } + + /*@Test(expected=DMaaPAccessDeniedException.class) + public void testdeleteTopic_authHeader() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(null); + topicService.deleteTopic(dmaapContext, "topicNamespace.topic"); + }*/ + + @Test + public void testPermitConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + @Test(expected=TopicExistsException.class) + public void testPermitConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.permitConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + @Test + public void testdenyConsumerForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + @Test(expected=TopicExistsException.class) + public void testdenyConsumerForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.denyConsumerForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + + @Test + public void testPermitPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + @Test(expected=TopicExistsException.class) + public void testPermitPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.permitPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin"); + } + + @Test + public void testDenyPublisherForTopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + when(dmaapContext.getResponse()).thenReturn(httpServRes); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");; + } + + @Test(expected=TopicExistsException.class) + public void testDenyPublisherForTopic_nulltopic() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.denyPublisherForTopic(dmaapContext, "topicNamespace.topic", "admin");; + } + + @Test + public void testGetAllTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.getAllTopics(dmaapContext); + } + + @Test + public void testGetTopics() throws DMaaPAccessDeniedException, CambriaApiException, IOException, + TopicExistsException, JSONException, ConfigDbException, AccessDeniedException { + + Assert.assertNotNull(topicService); + + // PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.mockStatic(AJSCPropertiesMap.class); + PowerMockito.when(AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, "msgRtr.topicfactory.aaf")) + .thenReturn("hello"); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + when(dmaaPAuthenticator.authenticate(dmaapContext)).thenReturn(null); + when(httpServReq.getHeader("AppName")).thenReturn("MyApp"); + when(httpServReq.getHeader("Authorization")).thenReturn("Admin"); + when(dmaapContext.getRequest()).thenReturn(httpServReq); + + when(configReader.getfSecurityManager()).thenReturn(dmaaPAuthenticator); + when(dmaapContext.getConfigReader()).thenReturn(configReader); + when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(createdTopic); + TopicBean topicBean = new TopicBean(); + topicBean.setTopicName("enfTopicNamePlusExtra"); + + topicService.getTopics(dmaapContext); + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TransactionServiceImplTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/TransactionServiceImplTest.java index d7fcde4..3a14212 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/TransactionServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/TransactionServiceImplTest.java @@ -1,97 +1,97 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - - - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.impl.TransactionServiceImpl; -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class TransactionServiceImplTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testCheckTransaction() { - - TransactionServiceImpl service = new TransactionServiceImpl(); - service.checkTransaction(new TransactionObj("23", 1100, 1000, 10)); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetAllTransactionObjs() { - - TransactionServiceImpl service = new TransactionServiceImpl(); - try { - service.getAllTransactionObjs(new DMaaPContext()); - } catch (ConfigDbException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetTransactionObj() { - - TransactionServiceImpl service = new TransactionServiceImpl(); - try { - service.getTransactionObj(new DMaaPContext(), "23"); - } catch (ConfigDbException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JSONException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import com.att.aft.dme2.internal.jettison.json.JSONException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.impl.TransactionServiceImpl; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class TransactionServiceImplTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testCheckTransaction() { + + TransactionServiceImpl service = new TransactionServiceImpl(); + service.checkTransaction(new TransactionObj("23", 1100, 1000, 10)); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetAllTransactionObjs() { + + TransactionServiceImpl service = new TransactionServiceImpl(); + try { + service.getAllTransactionObjs(new DMaaPContext()); + } catch (ConfigDbException | IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetTransactionObj() { + + TransactionServiceImpl service = new TransactionServiceImpl(); + try { + service.getTransactionObj(new DMaaPContext(), "23"); + } catch (ConfigDbException | IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (JSONException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/UIServiceImplTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/service/impl/UIServiceImplTest.java index d47c2d6..2fbbec1 100644 --- a/src/test/java/com/att/nsa/cambria/service/impl/UIServiceImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/service/impl/UIServiceImplTest.java @@ -1,302 +1,302 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.service.impl; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.service.impl.UIServiceImpl; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.nsa.configs.ConfigDbException; -import com.att.nsa.security.db.NsaApiDb; -import com.att.nsa.security.db.simple.NsaSimpleApiKey; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) -public class UIServiceImplTest { - - @InjectMocks - UIServiceImpl service; - - @Mock - DMaaPContext dmaapContext; - @Mock - ConsumerFactory factory; - - @Mock - ConfigurationReader configReader; - - @Mock - DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; - - @Mock - Topic metatopic; - - @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); - NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); - - PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); - PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); - - PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); - PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); - PowerMockito.mockStatic(DMaaPResponseBuilder.class); - PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testHello() { - - try { - service.hello(dmaapContext); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - @Test - public void testGetApiKeysTable() { - - try { - service.getApiKeysTable(dmaapContext); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testGetApiKey() { - - try { - service.getApiKey(dmaapContext, "admin"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - } - - @Test - public void testGetApiKey_invalidkey() { - - try { - service.getApiKey(dmaapContext, "k56HmWT72J"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - assertTrue(true); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - } - - @Test - public void testGetTopicsTable() { - - try { - List topics = new ArrayList(); - topics.add(metatopic); - when(dmaapKafkaMetaBroker.getAllTopics()).thenReturn(topics); - service.getTopicsTable(dmaapContext); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - - } - - @Test - public void testGetTopic() { - - try { - when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(metatopic); - service.getTopic(dmaapContext, "testTopic"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - assertTrue(true); - } - - @Test - public void testGetTopic_nulltopic() { - - try { - when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); - service.getTopic(dmaapContext, "testTopic"); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - } catch (ConfigDbException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - } - - NsaApiDb fApiKeyDb = new NsaApiDb() { - - Set keys = new HashSet<>(Arrays.asList("testkey", "admin")); - - @Override - public NsaSimpleApiKey createApiKey(String arg0, String arg1) - throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { - // TODO Auto-generated method stub - return new NsaSimpleApiKey(arg0, arg1); - } - - @Override - public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean deleteApiKey(String arg0) throws ConfigDbException { - // TODO Auto-generated method stub - return false; - } - - @Override - public Map loadAllKeyRecords() throws ConfigDbException { - Map map = new HashMap(); - map.put("testkey", new NsaSimpleApiKey("testkey", "password")); - map.put("admin", new NsaSimpleApiKey("admin", "password")); - - return map; - } - - @Override - public Set loadAllKeys() throws ConfigDbException { - // TODO Auto-generated method stub - - return keys; - } - - @Override - public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { - if (!keys.contains(arg0)) { - return null; - } - return new NsaSimpleApiKey(arg0, "password"); - } - - @Override - public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { - // TODO Auto-generated method stub - - } - }; - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.service.impl; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.service.impl.UIServiceImpl; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import com.att.nsa.configs.ConfigDbException; +import com.att.nsa.security.db.NsaApiDb; +import com.att.nsa.security.db.simple.NsaSimpleApiKey; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ DMaaPAuthenticatorImpl.class, DMaaPResponseBuilder.class }) +public class UIServiceImplTest { + + @InjectMocks + UIServiceImpl service; + + @Mock + DMaaPContext dmaapContext; + @Mock + ConsumerFactory factory; + + @Mock + ConfigurationReader configReader; + + @Mock + DMaaPKafkaMetaBroker dmaapKafkaMetaBroker; + + @Mock + Topic metatopic; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + PowerMockito.mockStatic(DMaaPAuthenticatorImpl.class); + NsaSimpleApiKey user = new NsaSimpleApiKey("admin", "password"); + + PowerMockito.when(dmaapContext.getConfigReader()).thenReturn(configReader); + PowerMockito.when(configReader.getfConsumerFactory()).thenReturn(factory); + + PowerMockito.when(configReader.getfApiKeyDb()).thenReturn(fApiKeyDb); + PowerMockito.when(DMaaPAuthenticatorImpl.getAuthenticatedUser(dmaapContext)).thenReturn(user); + PowerMockito.mockStatic(DMaaPResponseBuilder.class); + PowerMockito.when(configReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testHello() { + + try { + service.hello(dmaapContext); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + @Test + public void testGetApiKeysTable() { + + try { + service.getApiKeysTable(dmaapContext); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testGetApiKey() { + + try { + service.getApiKey(dmaapContext, "admin"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + } + + @Test + public void testGetApiKey_invalidkey() { + + try { + service.getApiKey(dmaapContext, "k56HmWT72J"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + assertTrue(true); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + } + + @Test + public void testGetTopicsTable() { + + try { + List topics = new ArrayList(); + topics.add(metatopic); + when(dmaapKafkaMetaBroker.getAllTopics()).thenReturn(topics); + service.getTopicsTable(dmaapContext); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + + } + + @Test + public void testGetTopic() { + + try { + when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(metatopic); + service.getTopic(dmaapContext, "testTopic"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + assertTrue(true); + } + + @Test + public void testGetTopic_nulltopic() { + + try { + when(dmaapKafkaMetaBroker.getTopic("topicNamespace.topic")).thenReturn(null); + service.getTopic(dmaapContext, "testTopic"); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + } catch (ConfigDbException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (Exception e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + } + + NsaApiDb fApiKeyDb = new NsaApiDb() { + + Set keys = new HashSet<>(Arrays.asList("testkey", "admin")); + + @Override + public NsaSimpleApiKey createApiKey(String arg0, String arg1) + throws com.att.nsa.security.db.NsaApiDb.KeyExistsException, ConfigDbException { + // TODO Auto-generated method stub + return new NsaSimpleApiKey(arg0, arg1); + } + + @Override + public boolean deleteApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean deleteApiKey(String arg0) throws ConfigDbException { + // TODO Auto-generated method stub + return false; + } + + @Override + public Map loadAllKeyRecords() throws ConfigDbException { + Map map = new HashMap(); + map.put("testkey", new NsaSimpleApiKey("testkey", "password")); + map.put("admin", new NsaSimpleApiKey("admin", "password")); + + return map; + } + + @Override + public Set loadAllKeys() throws ConfigDbException { + // TODO Auto-generated method stub + + return keys; + } + + @Override + public NsaSimpleApiKey loadApiKey(String arg0) throws ConfigDbException { + if (!keys.contains(arg0)) { + return null; + } + return new NsaSimpleApiKey(arg0, "password"); + } + + @Override + public void saveApiKey(NsaSimpleApiKey arg0) throws ConfigDbException { + // TODO Auto-generated method stub + + } + }; + +} diff --git a/src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/transaction/JUnitTestSuite.java index 2391679..eded211 100644 --- a/src/test/java/com/att/nsa/cambria/transaction/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ TransactionObjTest.class, TrnRequestTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ TransactionObjTest.class, TrnRequestTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/transaction/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TestRunner.java new file mode 100644 index 0000000..b2ba612 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TransactionObjTest.java similarity index 93% rename from src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/transaction/TransactionObjTest.java index 2e6aa21..36cdf92 100644 --- a/src/test/java/com/att/nsa/cambria/transaction/TransactionObjTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TransactionObjTest.java @@ -1,175 +1,175 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.transaction.TransactionObj; - -public class TransactionObjTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testAsJsonObject() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - - try { - obj.asJsonObject(); - - } catch(NullPointerException e) { - assertTrue(true); - } - - } - - @Test - public void testGetId() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getId(); - assertTrue(true); - - } - - @Test - public void testSetId() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setId("23"); - assertTrue(true); - - } - - @Test - public void testGetCreateTime() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getCreateTime(); - assertTrue(true); - - } - - @Test - public void testSetCreateTime() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setCreateTime("12:00:00"); - assertTrue(true); - - } - - @Test - public void testSerialize() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.serialize(); - assertTrue(true); - - } - - @Test - public void testGetTotalMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getTotalMessageCount(); - assertTrue(true); - - } - - @Test - public void testSetTotalMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setTotalMessageCount(200); - assertTrue(true); - - } - - @Test - public void testGetSuccessMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getSuccessMessageCount(); - assertTrue(true); - - } - - @Test - public void testSetSuccessMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setSuccessMessageCount(198); - assertTrue(true); - - } - - @Test - public void testGetFailureMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getFailureMessageCount(); - assertTrue(true); - - } - - @Test - public void testSetFailureMessageCount() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setFailureMessageCount(2); - assertTrue(true); - - } - - @Test - public void testGetfData() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getfData(); - assertTrue(true); - - } - - @Test - public void testSetfData() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setfData(null); - assertTrue(true); - - } - - @Test - public void testGetTrnRequest() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.getTrnRequest(); - assertTrue(true); - - } - - @Test - public void testSetTrnRequest() { - TransactionObj obj = new TransactionObj("23", 100, 98, 2); - obj.setTrnRequest(null); - assertTrue(true); - - } - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; + +public class TransactionObjTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testAsJsonObject() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + + try { + obj.asJsonObject(); + + } catch(NullPointerException e) { + assertTrue(true); + } + + } + + @Test + public void testGetId() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getId(); + assertTrue(true); + + } + + @Test + public void testSetId() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setId("23"); + assertTrue(true); + + } + + @Test + public void testGetCreateTime() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getCreateTime(); + assertTrue(true); + + } + + @Test + public void testSetCreateTime() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setCreateTime("12:00:00"); + assertTrue(true); + + } + + @Test + public void testSerialize() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.serialize(); + assertTrue(true); + + } + + @Test + public void testGetTotalMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getTotalMessageCount(); + assertTrue(true); + + } + + @Test + public void testSetTotalMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setTotalMessageCount(200); + assertTrue(true); + + } + + @Test + public void testGetSuccessMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getSuccessMessageCount(); + assertTrue(true); + + } + + @Test + public void testSetSuccessMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setSuccessMessageCount(198); + assertTrue(true); + + } + + @Test + public void testGetFailureMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getFailureMessageCount(); + assertTrue(true); + + } + + @Test + public void testSetFailureMessageCount() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setFailureMessageCount(2); + assertTrue(true); + + } + + @Test + public void testGetfData() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getfData(); + assertTrue(true); + + } + + @Test + public void testSetfData() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setfData(null); + assertTrue(true); + + } + + @Test + public void testGetTrnRequest() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.getTrnRequest(); + assertTrue(true); + + } + + @Test + public void testSetTrnRequest() { + TransactionObj obj = new TransactionObj("23", 100, 98, 2); + obj.setTrnRequest(null); + assertTrue(true); + + } + + +} diff --git a/src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TrnRequestTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/transaction/TrnRequestTest.java index 40e59af..284815e 100644 --- a/src/test/java/com/att/nsa/cambria/transaction/TrnRequestTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/TrnRequestTest.java @@ -1,187 +1,187 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.transaction.TransactionObj; -import com.att.dmf.mr.transaction.TrnRequest; - -public class TrnRequestTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetId() { - TrnRequest req = new TrnRequest(); - - req.getId(); - assertTrue(true); - - } - - @Test - public void testSetId() { - TrnRequest req = new TrnRequest(); - - req.setId("23"); - assertTrue(true); - - } - - @Test - public void testGetRequestCreate() { - TrnRequest req = new TrnRequest(); - - req.getRequestCreate(); - assertTrue(true); - - } - - @Test - public void testSetRequestCreate() { - TrnRequest req = new TrnRequest(); - - req.setRequestCreate("createRequest"); - assertTrue(true); - - } - - @Test - public void testGetRequestHost() { - TrnRequest req = new TrnRequest(); - - req.getRequestHost(); - assertTrue(true); - - } - - @Test - public void testSetRequestHost() { - TrnRequest req = new TrnRequest(); - - req.setRequestHost("requestHost"); - assertTrue(true); - - } - - @Test - public void testGetServerHost() { - TrnRequest req = new TrnRequest(); - - req.getServerHost(); - assertTrue(true); - - } - - @Test - public void testSetServerHost() { - TrnRequest req = new TrnRequest(); - - req.setServerHost("requestHost"); - assertTrue(true); - - } - - @Test - public void testGetMessageProceed() { - TrnRequest req = new TrnRequest(); - - req.getMessageProceed(); - assertTrue(true); - - } - - @Test - public void testSetMessageProceed() { - TrnRequest req = new TrnRequest(); - - req.setMessageProceed("messageProceed"); - assertTrue(true); - - } - - @Test - public void testGetTotalMessage() { - TrnRequest req = new TrnRequest(); - - req.getTotalMessage(); - assertTrue(true); - - } - - @Test - public void testSetTotalMessage() { - TrnRequest req = new TrnRequest(); - - req.setTotalMessage("200"); - assertTrue(true); - - } - - - @Test - public void testGetClientType() { - TrnRequest req = new TrnRequest(); - - req.getClientType(); - assertTrue(true); - - } - - @Test - public void testSetClientType() { - TrnRequest req = new TrnRequest(); - - req.setClientType("admin"); - assertTrue(true); - - } - - @Test - public void testGetUrl() { - TrnRequest req = new TrnRequest(); - - req.getUrl(); - assertTrue(true); - - } - - @Test - public void testSetUrl() { - TrnRequest req = new TrnRequest(); - - req.setUrl("http://google.com"); - assertTrue(true); - - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.TrnRequest; + +public class TrnRequestTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetId() { + TrnRequest req = new TrnRequest(); + + req.getId(); + assertTrue(true); + + } + + @Test + public void testSetId() { + TrnRequest req = new TrnRequest(); + + req.setId("23"); + assertTrue(true); + + } + + @Test + public void testGetRequestCreate() { + TrnRequest req = new TrnRequest(); + + req.getRequestCreate(); + assertTrue(true); + + } + + @Test + public void testSetRequestCreate() { + TrnRequest req = new TrnRequest(); + + req.setRequestCreate("createRequest"); + assertTrue(true); + + } + + @Test + public void testGetRequestHost() { + TrnRequest req = new TrnRequest(); + + req.getRequestHost(); + assertTrue(true); + + } + + @Test + public void testSetRequestHost() { + TrnRequest req = new TrnRequest(); + + req.setRequestHost("requestHost"); + assertTrue(true); + + } + + @Test + public void testGetServerHost() { + TrnRequest req = new TrnRequest(); + + req.getServerHost(); + assertTrue(true); + + } + + @Test + public void testSetServerHost() { + TrnRequest req = new TrnRequest(); + + req.setServerHost("requestHost"); + assertTrue(true); + + } + + @Test + public void testGetMessageProceed() { + TrnRequest req = new TrnRequest(); + + req.getMessageProceed(); + assertTrue(true); + + } + + @Test + public void testSetMessageProceed() { + TrnRequest req = new TrnRequest(); + + req.setMessageProceed("messageProceed"); + assertTrue(true); + + } + + @Test + public void testGetTotalMessage() { + TrnRequest req = new TrnRequest(); + + req.getTotalMessage(); + assertTrue(true); + + } + + @Test + public void testSetTotalMessage() { + TrnRequest req = new TrnRequest(); + + req.setTotalMessage("200"); + assertTrue(true); + + } + + + @Test + public void testGetClientType() { + TrnRequest req = new TrnRequest(); + + req.getClientType(); + assertTrue(true); + + } + + @Test + public void testSetClientType() { + TrnRequest req = new TrnRequest(); + + req.setClientType("admin"); + assertTrue(true); + + } + + @Test + public void testGetUrl() { + TrnRequest req = new TrnRequest(); + + req.getUrl(); + assertTrue(true); + + } + + @Test + public void testSetUrl() { + TrnRequest req = new TrnRequest(); + + req.setUrl("http://google.com"); + assertTrue(true); + + } + +} diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java similarity index 91% rename from src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java index 5260993..9feccce 100644 --- a/src/test/java/com/att/nsa/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/DMaaPSimpleTransactionFactoryTest.java @@ -1,67 +1,67 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction.impl; - -import static org.junit.Assert.*; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; - -public class DMaaPSimpleTransactionFactoryTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testMakeNewTransactionObj() { - - DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory(); - - factory.makeNewTransactionObj("{'transactionId': '123', 'totalMessageCount': '200', " - + "'successMessageCount': '200', 'failureMessageCount': '0'}"); - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - - } - - @Test - public void testMakeNewTransactionId() { - - DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory(); - factory.makeNewTransactionId("123"); - - String trueValue = "True"; - assertTrue(trueValue.equalsIgnoreCase("True")); - - } - - - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction.impl; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.dmf.mr.transaction.impl.DMaaPSimpleTransactionFactory; + +public class DMaaPSimpleTransactionFactoryTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testMakeNewTransactionObj() { + + DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory(); + + factory.makeNewTransactionObj("{'transactionId': '123', 'totalMessageCount': '200', " + + "'successMessageCount': '200', 'failureMessageCount': '0'}"); + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + + } + + @Test + public void testMakeNewTransactionId() { + + DMaaPSimpleTransactionFactory factory = new DMaaPSimpleTransactionFactory(); + factory.makeNewTransactionId("123"); + + String trueValue = "True"; + assertTrue(trueValue.equalsIgnoreCase("True")); + + } + + + +} diff --git a/src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/JUnitTestSuite.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/JUnitTestSuite.java index c18ac8e..a70cf18 100644 --- a/src/test/java/com/att/nsa/cambria/transaction/impl/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.transaction.impl; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ DMaaPSimpleTransactionFactoryTest.class, }) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction.impl; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ DMaaPSimpleTransactionFactoryTest.class, }) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/TestRunner.java b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/TestRunner.java new file mode 100644 index 0000000..e889ec7 --- /dev/null +++ b/src/test/java/org/onap/dmaap/mr/cambria/transaction/impl/TestRunner.java @@ -0,0 +1,41 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.transaction.impl; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/utils/ConfigurationReaderTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/utils/ConfigurationReaderTest.java index 907b935..9a02c38 100644 --- a/src/test/java/com/att/nsa/cambria/utils/ConfigurationReaderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/utils/ConfigurationReaderTest.java @@ -1,56 +1,56 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.utils; - -import static org.junit.Assert.assertNotNull; - -import org.junit.After; -import org.junit.Test; - -import com.att.nsa.cambria.embed.EmbedConfigurationReader; -import com.att.dmf.mr.utils.ConfigurationReader; - -public class ConfigurationReaderTest { - - EmbedConfigurationReader embedConfigurationReader = new EmbedConfigurationReader(); - - @After - public void tearDown() throws Exception { - embedConfigurationReader.tearDown(); - } - - @Test - public void testConfigurationReader() throws Exception { - - ConfigurationReader configurationReader = embedConfigurationReader.buildConfigurationReader(); - - assertNotNull(configurationReader); - assertNotNull(configurationReader.getfApiKeyDb()); - assertNotNull(configurationReader.getfConfigDb()); - assertNotNull(configurationReader.getfConsumerFactory()); - assertNotNull(configurationReader.getfIpBlackList()); - assertNotNull(configurationReader.getfMetaBroker()); - assertNotNull(configurationReader.getfMetrics()); - assertNotNull(configurationReader.getfPublisher()); - assertNotNull(configurationReader.getfSecurityManager()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.utils; + +import static org.junit.Assert.assertNotNull; + +import org.junit.After; +import org.junit.Test; + +import org.onap.dmaap.mr.cambria.embed.EmbedConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; + +public class ConfigurationReaderTest { + + EmbedConfigurationReader embedConfigurationReader = new EmbedConfigurationReader(); + + @After + public void tearDown() throws Exception { + embedConfigurationReader.tearDown(); + } + + @Test + public void testConfigurationReader() throws Exception { + + ConfigurationReader configurationReader = embedConfigurationReader.buildConfigurationReader(); + + assertNotNull(configurationReader); + assertNotNull(configurationReader.getfApiKeyDb()); + assertNotNull(configurationReader.getfConfigDb()); + assertNotNull(configurationReader.getfConsumerFactory()); + assertNotNull(configurationReader.getfIpBlackList()); + assertNotNull(configurationReader.getfMetaBroker()); + assertNotNull(configurationReader.getfMetrics()); + assertNotNull(configurationReader.getfPublisher()); + assertNotNull(configurationReader.getfSecurityManager()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java b/src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPCuratorFactoryTest.java similarity index 90% rename from src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPCuratorFactoryTest.java index 90e6f6f..ff78d7f 100644 --- a/src/test/java/com/att/nsa/cambria/utils/DMaaPCuratorFactoryTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPCuratorFactoryTest.java @@ -1,70 +1,70 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.utils; - -import static org.junit.Assert.*; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import org.apache.curator.framework.CuratorFramework; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.DMaaPCuratorFactory; -import com.att.dmf.mr.utils.PropertyReader; -import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException; -import com.att.nsa.drumlin.till.nv.impl.nvPropertiesFile; -import com.att.nsa.drumlin.till.nv.impl.nvReadableTable; - -public class DMaaPCuratorFactoryTest { - - @Before - public void setUp() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile())); - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testgetCurator() throws loadException { - CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); - assertNotNull(curatorFramework); - - Map map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop); - map.remove(CambriaConstants.kSetting_ZkConfigDbServers); - map.remove(CambriaConstants.kSetting_ZkSessionTimeoutMs); - - - - curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); - assertNotNull(curatorFramework); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.utils; + +import static org.junit.Assert.*; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import org.apache.curator.framework.CuratorFramework; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.att.ajsc.filemonitor.AJSCPropertiesMap; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.DMaaPCuratorFactory; +import org.onap.dmaap.dmf.mr.utils.PropertyReader; +import com.att.nsa.drumlin.till.nv.rrNvReadable.loadException; +import com.att.nsa.drumlin.till.nv.impl.nvPropertiesFile; +import com.att.nsa.drumlin.till.nv.impl.nvReadableTable; + +public class DMaaPCuratorFactoryTest { + + @Before + public void setUp() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + AJSCPropertiesMap.refresh(new File(classLoader.getResource(CambriaConstants.msgRtr_prop).getFile())); + + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testgetCurator() throws loadException { + CuratorFramework curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); + assertNotNull(curatorFramework); + + Map map = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperties(CambriaConstants.msgRtr_prop); + map.remove(CambriaConstants.kSetting_ZkConfigDbServers); + map.remove(CambriaConstants.kSetting_ZkSessionTimeoutMs); + + + + curatorFramework = DMaaPCuratorFactory.getCurator(new PropertyReader()); + assertNotNull(curatorFramework); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java b/src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPResponseBuilderTest.java similarity index 94% rename from src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPResponseBuilderTest.java index 66e4405..aaabb7d 100644 --- a/src/test/java/com/att/nsa/cambria/utils/DMaaPResponseBuilderTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/utils/DMaaPResponseBuilderTest.java @@ -1,141 +1,141 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.utils; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; - -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; - -public class DMaaPResponseBuilderTest { - - DMaaPContext dMaapContext; - MockHttpServletRequest request; - MockHttpServletResponse response; - - @Before - public void setUp() throws Exception { - - dMaapContext = new DMaaPContext(); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); - dMaapContext.setRequest(request); - dMaapContext.setResponse(response); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testsetNoCacheHeadings(){ - DMaaPResponseBuilder.setNoCacheHeadings(dMaapContext); - assertEquals("no-cache", response.getHeader("Pragma")); - } - - @Test - public void testrespondOk() throws JSONException, IOException{ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("Name", "Test"); - - DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject); - assertEquals("application/json", response.getContentType()); - assertEquals(200, response.getStatus()); - - request.setMethod("HEAD"); - - DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject); - assertEquals("application/json", response.getContentType()); - assertEquals(200, response.getStatus()); - } - - @Test - public void testrespondOkNoContent(){ - DMaaPResponseBuilder.respondOkNoContent(dMaapContext); - assertEquals(204, response.getStatus()); - } - - @Test - public void testrespondOkWithHtml(){ - DMaaPResponseBuilder.respondOkWithHtml(dMaapContext, ""); - - assertEquals("text/html", response.getContentType()); - assertEquals(200, response.getStatus()); - } - - @Test - public void testrespondWithError(){ - DMaaPResponseBuilder.respondWithError(dMaapContext, 500, "InternalServerError"); - assertEquals(500, response.getStatus()); - } - - @Test - public void testrespondWithJsonError(){ - JSONObject o = new JSONObject(); - o.put("status", 500); - o.put("message", "InternalServerError"); - DMaaPResponseBuilder.respondWithError(dMaapContext, 500, o); - assertEquals(500, response.getStatus()); - } - - @Test - public void testrespondWithErrorInJson(){ - DMaaPResponseBuilder.respondWithErrorInJson(dMaapContext, 500, "InternalServerError"); - - assertEquals("application/json", response.getContentType()); - assertEquals(500, response.getStatus()); - } - - @Test - public void testsendErrorAndBody(){ - DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html"); - - assertEquals("text/html", response.getContentType()); - assertEquals(500, response.getStatus()); - - request.setMethod("HEAD"); - - DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html"); - - assertEquals("text/html", response.getContentType()); - assertEquals(500, response.getStatus()); - - } - - @Test - public void testgetStreamForBinaryResponse() throws IOException{ - DMaaPResponseBuilder.getStreamForBinaryResponse(dMaapContext); - - assertEquals("application/octet-stream", response.getContentType()); - assertEquals(200, response.getStatus()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + + package org.onap.dmaap.mr.cambria.utils; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; + +public class DMaaPResponseBuilderTest { + + DMaaPContext dMaapContext; + MockHttpServletRequest request; + MockHttpServletResponse response; + + @Before + public void setUp() throws Exception { + + dMaapContext = new DMaaPContext(); + request = new MockHttpServletRequest(); + response = new MockHttpServletResponse(); + dMaapContext.setRequest(request); + dMaapContext.setResponse(response); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testsetNoCacheHeadings(){ + DMaaPResponseBuilder.setNoCacheHeadings(dMaapContext); + assertEquals("no-cache", response.getHeader("Pragma")); + } + + @Test + public void testrespondOk() throws JSONException, IOException{ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("Name", "Test"); + + DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject); + assertEquals("application/json", response.getContentType()); + assertEquals(200, response.getStatus()); + + request.setMethod("HEAD"); + + DMaaPResponseBuilder.respondOk(dMaapContext, jsonObject); + assertEquals("application/json", response.getContentType()); + assertEquals(200, response.getStatus()); + } + + @Test + public void testrespondOkNoContent(){ + DMaaPResponseBuilder.respondOkNoContent(dMaapContext); + assertEquals(204, response.getStatus()); + } + + @Test + public void testrespondOkWithHtml(){ + DMaaPResponseBuilder.respondOkWithHtml(dMaapContext, ""); + + assertEquals("text/html", response.getContentType()); + assertEquals(200, response.getStatus()); + } + + @Test + public void testrespondWithError(){ + DMaaPResponseBuilder.respondWithError(dMaapContext, 500, "InternalServerError"); + assertEquals(500, response.getStatus()); + } + + @Test + public void testrespondWithJsonError(){ + JSONObject o = new JSONObject(); + o.put("status", 500); + o.put("message", "InternalServerError"); + DMaaPResponseBuilder.respondWithError(dMaapContext, 500, o); + assertEquals(500, response.getStatus()); + } + + @Test + public void testrespondWithErrorInJson(){ + DMaaPResponseBuilder.respondWithErrorInJson(dMaapContext, 500, "InternalServerError"); + + assertEquals("application/json", response.getContentType()); + assertEquals(500, response.getStatus()); + } + + @Test + public void testsendErrorAndBody(){ + DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html"); + + assertEquals("text/html", response.getContentType()); + assertEquals(500, response.getStatus()); + + request.setMethod("HEAD"); + + DMaaPResponseBuilder.sendErrorAndBody(dMaapContext, 500, "InternalServerError", "text/html"); + + assertEquals("text/html", response.getContentType()); + assertEquals(500, response.getStatus()); + + } + + @Test + public void testgetStreamForBinaryResponse() throws IOException{ + DMaaPResponseBuilder.getStreamForBinaryResponse(dMaapContext); + + assertEquals("application/octet-stream", response.getContentType()); + assertEquals(200, response.getStatus()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java b/src/test/java/org/onap/dmaap/mr/cambria/utils/UtilsTest.java similarity index 96% rename from src/test/java/com/att/nsa/cambria/utils/UtilsTest.java rename to src/test/java/org/onap/dmaap/mr/cambria/utils/UtilsTest.java index bff4d48..b4645a3 100644 --- a/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java +++ b/src/test/java/org/onap/dmaap/mr/cambria/utils/UtilsTest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package com.att.nsa.cambria.utils; + package org.onap.dmaap.mr.cambria.utils; import static org.junit.Assert.*; @@ -35,8 +35,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.utils.Utils; public class UtilsTest { diff --git a/src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java b/src/test/java/org/onap/dmaap/mr/filter/ContentLengthFilterTest.java similarity index 93% rename from src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java rename to src/test/java/org/onap/dmaap/mr/filter/ContentLengthFilterTest.java index 6930f73..9d329e5 100644 --- a/src/test/java/com/att/nsa/filter/ContentLengthFilterTest.java +++ b/src/test/java/org/onap/dmaap/mr/filter/ContentLengthFilterTest.java @@ -1,88 +1,88 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.filter; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import javax.servlet.ServletException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.mr.filter.ContentLengthFilter; - -public class ContentLengthFilterTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testDestroy() { - ContentLengthFilter filter = new ContentLengthFilter(); - - filter.destroy(); - - assertTrue(true); - } - - - @Test - public void testFilter() { - ContentLengthFilter filter = new ContentLengthFilter(); - - try { - filter.doFilter(null, null, null); - } catch (IOException | ServletException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - - } - - @Test - public void testInit() { - ContentLengthFilter filter = new ContentLengthFilter(); - - try { - filter.init(null); - } catch (ServletException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NullPointerException e) { - // TODO Auto-generated catch block - assertTrue(true); - } - - } - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.filter; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import javax.servlet.ServletException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.onap.dmaap.mr.filter.ContentLengthFilter; + +public class ContentLengthFilterTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testDestroy() { + ContentLengthFilter filter = new ContentLengthFilter(); + + filter.destroy(); + + assertTrue(true); + } + + + @Test + public void testFilter() { + ContentLengthFilter filter = new ContentLengthFilter(); + + try { + filter.doFilter(null, null, null); + } catch (IOException | ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + + } + + @Test + public void testInit() { + ContentLengthFilter filter = new ContentLengthFilter(); + + try { + filter.init(null); + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NullPointerException e) { + // TODO Auto-generated catch block + assertTrue(true); + } + + } + + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/filter/DefaultLengthTest.java b/src/test/java/org/onap/dmaap/mr/filter/DefaultLengthTest.java similarity index 92% rename from src/test/java/com/att/nsa/filter/DefaultLengthTest.java rename to src/test/java/org/onap/dmaap/mr/filter/DefaultLengthTest.java index 8be5ca7..56b8d05 100644 --- a/src/test/java/com/att/nsa/filter/DefaultLengthTest.java +++ b/src/test/java/org/onap/dmaap/mr/filter/DefaultLengthTest.java @@ -1,66 +1,65 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.filter; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import javax.servlet.ServletException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.att.mr.filter.DefaultLength; - -public class DefaultLengthTest { - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetDefaultLength() { - DefaultLength length = new DefaultLength(); - - length.getDefaultLength(); - - assertTrue(true); - } - - @Test - public void testSetDefaultLength() { - DefaultLength length = new DefaultLength(); - - length.setDefaultLength("23"); - - assertTrue(true); - } - - - - - +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.filter; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import javax.servlet.ServletException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + +public class DefaultLengthTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testGetDefaultLength() { + DefaultLength length = new DefaultLength(); + + length.getDefaultLength(); + + assertTrue(true); + } + + @Test + public void testSetDefaultLength() { + DefaultLength length = new DefaultLength(); + + length.setDefaultLength("23"); + + assertTrue(true); + } + + + + + } \ No newline at end of file diff --git a/src/test/java/com/att/nsa/filter/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/filter/JUnitTestSuite.java similarity index 95% rename from src/test/java/com/att/nsa/filter/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/filter/JUnitTestSuite.java index 46df4a3..a534560 100644 --- a/src/test/java/com/att/nsa/filter/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/filter/JUnitTestSuite.java @@ -1,42 +1,42 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.filter; - -import junit.framework.TestSuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.apache.log4j.Logger; - -@RunWith(Suite.class) -@SuiteClasses({ ContentLengthFilterTest.class, DefaultLengthTest.class,}) -public class JUnitTestSuite { - private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); - - public static void main(String[] args) { - LOGGER.info("Running the test suite"); - - TestSuite tstSuite = new TestSuite(); - LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.filter; + +import junit.framework.TestSuite; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; +import org.apache.log4j.Logger; + +@RunWith(Suite.class) +@SuiteClasses({ ContentLengthFilterTest.class, DefaultLengthTest.class,}) +public class JUnitTestSuite { + private static final Logger LOGGER = Logger.getLogger(JUnitTestSuite.class); + + public static void main(String[] args) { + LOGGER.info("Running the test suite"); + + TestSuite tstSuite = new TestSuite(); + LOGGER.info("Total Test Counts " + tstSuite.countTestCases()); + } + +} diff --git a/src/test/java/com/att/nsa/cambria/listener/TestRunner.java b/src/test/java/org/onap/dmaap/mr/filter/TestRunner.java similarity index 95% rename from src/test/java/com/att/nsa/cambria/listener/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/filter/TestRunner.java index 68820c3..ec78329 100644 --- a/src/test/java/com/att/nsa/cambria/listener/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/filter/TestRunner.java @@ -1,41 +1,41 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package com.att.nsa.cambria.listener; - -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.apache.log4j.Logger; - -public class TestRunner { - private static final Logger LOGGER = Logger.getLogger(TestRunner.class); - - public static void main(String[] args) { - // TODO Auto-generated method stub - Result result = JUnitCore.runClasses(JUnitTestSuite.class); - for (Failure failure : result.getFailures()) { - LOGGER.info(failure.toString()); - - } - LOGGER.info(result.wasSuccessful()); - } - -} +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dmaap.mr.filter; + +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.apache.log4j.Logger; + +public class TestRunner { + private static final Logger LOGGER = Logger.getLogger(TestRunner.class); + + public static void main(String[] args) { + // TODO Auto-generated method stub + Result result = JUnitCore.runClasses(JUnitTestSuite.class); + for (Failure failure : result.getFailures()) { + LOGGER.info(failure.toString()); + + } + LOGGER.info(result.wasSuccessful()); + } + +} diff --git a/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/ApiKeyBean.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/ApiKeyBean.java index 3c0bb79..7ecc203 100644 --- a/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/ApiKeyBean.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.Serializable; diff --git a/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapPubSubTest.java similarity index 99% rename from src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapPubSubTest.java index fc91598..a026573 100644 --- a/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapPubSubTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.InputStream; import java.util.Scanner; diff --git a/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java similarity index 99% rename from src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java index 1b5e746..ec1a63a 100644 --- a/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DMaapTopicTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.InputStream; import java.util.Properties; diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapAdminTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapAdminTest.java index f3e7fa9..f8dc500 100644 --- a/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapAdminTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java similarity index 99% rename from src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java index 77a2500..f40025a 100644 --- a/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapApiKeyTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.InputStream; import java.util.Properties; diff --git a/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapMetricsTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapMetricsTest.java index 9728687..4521ad2 100644 --- a/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/DmaapMetricsTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.InputStream; import java.util.Scanner; diff --git a/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/JUnitTestSuite.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/JUnitTestSuite.java index 40a5286..3090773 100644 --- a/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/JUnitTestSuite.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import junit.framework.TestSuite; diff --git a/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/LoadPropertyFile.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/LoadPropertyFile.java index c9d0387..46b88d0 100644 --- a/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/LoadPropertyFile.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/com/att/mr/test/dmaap/TestRunner.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/TestRunner.java similarity index 97% rename from src/test/java/com/att/mr/test/dmaap/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/TestRunner.java index 9a744d9..7f7ca82 100644 --- a/src/test/java/com/att/mr/test/dmaap/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/TestRunner.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import org.junit.runner.JUnitCore; import org.junit.runner.Result; diff --git a/src/test/java/com/att/mr/test/dmaap/TopicBean.java b/src/test/java/org/onap/dmaap/mr/test/dmaap/TopicBean.java similarity index 98% rename from src/test/java/com/att/mr/test/dmaap/TopicBean.java rename to src/test/java/org/onap/dmaap/mr/test/dmaap/TopicBean.java index 62f9d0c..b1950e2 100644 --- a/src/test/java/com/att/mr/test/dmaap/TopicBean.java +++ b/src/test/java/org/onap/dmaap/mr/test/dmaap/TopicBean.java @@ -22,7 +22,7 @@ /** * */ -package com.att.mr.test.dmaap; +package org.onap.dmaap.mr.test.dmaap; import java.io.Serializable; diff --git a/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java b/src/test/java/org/onap/dmaap/mr/test/dme2/ApiKeyBean.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/ApiKeyBean.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/ApiKeyBean.java index e6545e1..96c9c78 100644 --- a/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/ApiKeyBean.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.io.Serializable; diff --git a/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/DME2AdminTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java index 5f6f9c4..3222046 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2AdminTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -32,7 +32,6 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; -import com.att.mr.test.dmaap.DmaapAdminTest; //import com.ibm.disthub2.impl.client.PropSchema; public class DME2AdminTest extends TestCase { diff --git a/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java similarity index 99% rename from src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java index bde61d5..54148b2 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ApiKeyTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java index 30c13ea..59e1845 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerFilterTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -33,7 +33,6 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; -import com.att.mr.test.dmaap.DmaapAdminTest; public class DME2ConsumerFilterTest extends TestCase { private static final Logger LOGGER = Logger.getLogger(DME2ConsumerFilterTest.class); diff --git a/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerTest.java index 810f451..b12f001 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ConsumerTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -32,7 +32,6 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; -import com.att.mr.test.dmaap.DmaapAdminTest; public class DME2ConsumerTest extends TestCase { private static final Logger LOGGER = Logger.getLogger(DME2ConsumerTest.class); diff --git a/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2MetricsTest.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2MetricsTest.java index e7ccebe..35c3218 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2MetricsTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -32,7 +32,6 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; -import com.att.mr.test.dmaap.DmaapAdminTest; public class DME2MetricsTest extends TestCase { private static final Logger LOGGER = Logger.getLogger(DME2MetricsTest.class); diff --git a/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ProducerTest.java similarity index 96% rename from src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2ProducerTest.java index 71c5e0f..c053502 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2ProducerTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -33,10 +33,9 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.internal.jackson.map.ObjectMapper; -import com.att.mr.test.dmaap.DmaapAdminTest; public class DME2ProducerTest extends TestCase { - private static final Logger LOGGER = Logger.getLogger(DmaapAdminTest.class); + private static final Logger LOGGER = Logger.getLogger(DME2ProducerTest.class); public void testProducer() { DME2TopicTest topicTestObj = new DME2TopicTest(); diff --git a/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2TopicTest.java similarity index 99% rename from src/test/java/com/att/mr/test/dme2/DME2TopicTest.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/DME2TopicTest.java index 9d26083..94c507c 100644 --- a/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/DME2TopicTest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.net.URI; import java.net.URISyntaxException; @@ -35,7 +35,6 @@ import junit.framework.TestCase; import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.internal.jackson.map.ObjectMapper; -import com.att.mr.test.dmaap.DmaapAdminTest; public class DME2TopicTest extends TestCase { private String latitude; diff --git a/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java b/src/test/java/org/onap/dmaap/mr/test/dme2/JUnitTestSuite.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/JUnitTestSuite.java index b3f2683..163d3c1 100644 --- a/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/JUnitTestSuite.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import junit.framework.TestSuite; diff --git a/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java b/src/test/java/org/onap/dmaap/mr/test/dme2/LoadPropertyFile.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/LoadPropertyFile.java index a274d68..c534cce 100644 --- a/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/LoadPropertyFile.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/com/att/mr/test/dme2/TestRunner.java b/src/test/java/org/onap/dmaap/mr/test/dme2/TestRunner.java similarity index 97% rename from src/test/java/com/att/mr/test/dme2/TestRunner.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/TestRunner.java index dce6e6c..f8696f4 100644 --- a/src/test/java/com/att/mr/test/dme2/TestRunner.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/TestRunner.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import org.junit.runner.JUnitCore; import org.junit.runner.Result; diff --git a/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java b/src/test/java/org/onap/dmaap/mr/test/dme2/TopicBeanDME2.java similarity index 98% rename from src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java rename to src/test/java/org/onap/dmaap/mr/test/dme2/TopicBeanDME2.java index 4de5015..597546b 100644 --- a/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java +++ b/src/test/java/org/onap/dmaap/mr/test/dme2/TopicBeanDME2.java @@ -22,7 +22,7 @@ /** * */ -package com.att.mr.test.dme2; +package org.onap.dmaap.mr.test.dme2; import java.io.Serializable;