summaryrefslogtreecommitdiffstats
path: root/feature-pooling-dmaap/src
diff options
context:
space:
mode:
Diffstat (limited to 'feature-pooling-dmaap/src')
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java (renamed from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest2.java)6
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/ForwardTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/HeartbeatTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/IdentificationTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/LeaderTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/OfflineTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/QueryTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java (renamed from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/BasicMessageTester.java)4
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportMessageWithAssignmentsTester.java (renamed from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageWithAssignmentsTester.java)5
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ActiveStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/IdleStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/InactiveStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java2
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/SupportBasicStateTester.java (renamed from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/BasicStateTester.java)4
18 files changed, 24 insertions, 23 deletions
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest2.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java
index 050ca612..616d95fe 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/FeatureTest2.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java
@@ -73,9 +73,9 @@ import org.slf4j.LoggerFactory;
* <p>The following fields must be set before executing this: <ul> <li>UEB_SERVERS</li>
* <li>INTERNAL_TOPIC</li> <li>EXTERNAL_TOPIC</li> </ul>
*/
-public class FeatureTest2 {
+public class EndToEndFeatureTest {
- private static final Logger logger = LoggerFactory.getLogger(FeatureTest2.class);
+ private static final Logger logger = LoggerFactory.getLogger(EndToEndFeatureTest.class);
/**
* UEB servers for both internal & external topics.
@@ -95,7 +95,7 @@ public class FeatureTest2 {
/**
* Consumer group to use when polling the external topic.
*/
- private static final String EXTERNAL_GROUP = FeatureTest2.class.getName();
+ private static final String EXTERNAL_GROUP = EndToEndFeatureTest.class.getName();
/**
* Name of the controller.
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/ForwardTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/ForwardTest.java
index c51cafed..99df69ec 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/ForwardTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/ForwardTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
-public class ForwardTest extends BasicMessageTester<Forward> {
+public class ForwardTest extends SupportBasicMessageTester<Forward> {
// values set by makeValidMessage()
public static final CommInfrastructure VALID_PROTOCOL = CommInfrastructure.UEB;
public static final int VALID_HOPS = 0;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/HeartbeatTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/HeartbeatTest.java
index 43f1afd4..d1a82f4f 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/HeartbeatTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/HeartbeatTest.java
@@ -22,7 +22,7 @@ package org.onap.policy.drools.pooling.message;
import static org.junit.Assert.assertEquals;
-public class HeartbeatTest extends BasicMessageTester<Heartbeat> {
+public class HeartbeatTest extends SupportBasicMessageTester<Heartbeat> {
/**
* Sequence number to validate time stamps within the heart beat.
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/IdentificationTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/IdentificationTest.java
index 7b28afc0..06336b3e 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/IdentificationTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/IdentificationTest.java
@@ -23,7 +23,7 @@ package org.onap.policy.drools.pooling.message;
import org.junit.Before;
import org.junit.Test;
-public class IdentificationTest extends MessageWithAssignmentsTester<Identification> {
+public class IdentificationTest extends SupportMessageWithAssignmentsTester<Identification> {
public IdentificationTest() {
super(Identification.class);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/LeaderTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/LeaderTest.java
index e30d7d09..eefd45d4 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/LeaderTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/LeaderTest.java
@@ -23,7 +23,7 @@ package org.onap.policy.drools.pooling.message;
import org.junit.Before;
import org.junit.Test;
-public class LeaderTest extends MessageWithAssignmentsTester<Leader> {
+public class LeaderTest extends SupportMessageWithAssignmentsTester<Leader> {
public LeaderTest() {
super(Leader.class);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageTest.java
index 4e683ff9..db8cd9f9 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNull;
import org.junit.Test;
-public class MessageTest extends BasicMessageTester<Message> {
+public class MessageTest extends SupportBasicMessageTester<Message> {
public MessageTest() {
super(Message.class);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/OfflineTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/OfflineTest.java
index 4fe37366..906733e9 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/OfflineTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/OfflineTest.java
@@ -20,7 +20,7 @@
package org.onap.policy.drools.pooling.message;
-public class OfflineTest extends BasicMessageTester<Offline> {
+public class OfflineTest extends SupportBasicMessageTester<Offline> {
public OfflineTest() {
super(Offline.class);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/QueryTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/QueryTest.java
index e0ab016a..933dddfd 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/QueryTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/QueryTest.java
@@ -20,7 +20,7 @@
package org.onap.policy.drools.pooling.message;
-public class QueryTest extends BasicMessageTester<Query> {
+public class QueryTest extends SupportBasicMessageTester<Query> {
public QueryTest() {
super(Query.class);
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/BasicMessageTester.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java
index 2dab38d1..e30d78d4 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/BasicMessageTester.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportBasicMessageTester.java
@@ -33,7 +33,7 @@ import org.onap.policy.drools.pooling.PoolingFeatureException;
*
* @param <T> type of {@link Message} subclass that this tests
*/
-public abstract class BasicMessageTester<T extends Message> {
+public abstract class SupportBasicMessageTester<T extends Message> {
// values set by makeValidMessage()
public static final String VALID_HOST_PREDECESSOR = "hostA";
public static final String VALID_HOST = "hostB";
@@ -54,7 +54,7 @@ public abstract class BasicMessageTester<T extends Message> {
*
* @param subclazz subclass of {@link Message} being tested
*/
- public BasicMessageTester(Class<T> subclazz) {
+ public SupportBasicMessageTester(Class<T> subclazz) {
this.subclazz = subclazz;
}
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageWithAssignmentsTester.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportMessageWithAssignmentsTester.java
index e5dfae9b..bf245feb 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/MessageWithAssignmentsTester.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/message/SupportMessageWithAssignmentsTester.java
@@ -30,7 +30,8 @@ import org.junit.Test;
*
* @param <T> type of {@link MessageWithAssignments} subclass that this tests
*/
-public abstract class MessageWithAssignmentsTester<T extends MessageWithAssignments> extends BasicMessageTester<T> {
+public abstract class SupportMessageWithAssignmentsTester<T extends MessageWithAssignments>
+ extends SupportBasicMessageTester<T> {
// values set by makeValidMessage()
public static final String[] VALID_ARRAY = {VALID_HOST, VALID_HOST + "_xxx"};
public static final BucketAssignments VALID_ASGN = new BucketAssignments(VALID_ARRAY);
@@ -46,7 +47,7 @@ public abstract class MessageWithAssignmentsTester<T extends MessageWithAssignme
*
* @param subclazz subclass of {@link MessageWithAssignments} being tested
*/
- public MessageWithAssignmentsTester(Class<T> subclazz) {
+ public SupportMessageWithAssignmentsTester(Class<T> subclazz) {
super(subclazz);
}
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ActiveStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ActiveStateTest.java
index 9cb835c9..c8cbdbb5 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ActiveStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ActiveStateTest.java
@@ -47,7 +47,7 @@ import org.onap.policy.drools.pooling.message.Query;
import org.onap.policy.drools.utils.Pair;
import org.onap.policy.drools.utils.Triple;
-public class ActiveStateTest extends BasicStateTester {
+public class ActiveStateTest extends SupportBasicStateTester {
private ActiveState state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/IdleStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/IdleStateTest.java
index cf2c9c7c..9e3ddcf9 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/IdleStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/IdleStateTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.drools.pooling.message.Message;
import org.onap.policy.drools.pooling.message.Offline;
import org.onap.policy.drools.pooling.message.Query;
-public class IdleStateTest extends BasicStateTester {
+public class IdleStateTest extends SupportBasicStateTester {
private IdleState state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/InactiveStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/InactiveStateTest.java
index ee7fd5e5..77491616 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/InactiveStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/InactiveStateTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.drools.pooling.message.Message;
import org.onap.policy.drools.pooling.message.Query;
import org.onap.policy.drools.utils.Pair;
-public class InactiveStateTest extends BasicStateTester {
+public class InactiveStateTest extends SupportBasicStateTester {
private InactiveState state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
index 4f634516..14784fc2 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/ProcessingStateTest.java
@@ -41,7 +41,7 @@ import org.onap.policy.drools.pooling.message.Message;
import org.onap.policy.drools.pooling.message.Query;
import org.onap.policy.drools.pooling.state.ProcessingState.HostBucket;
-public class ProcessingStateTest extends BasicStateTester {
+public class ProcessingStateTest extends SupportBasicStateTester {
private ProcessingState state;
private HostBucket hostBucket;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
index 5601932e..97c9c95a 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
@@ -41,7 +41,7 @@ import org.onap.policy.drools.pooling.message.Message;
import org.onap.policy.drools.pooling.message.Offline;
import org.onap.policy.drools.utils.Pair;
-public class QueryStateTest extends BasicStateTester {
+public class QueryStateTest extends SupportBasicStateTester {
private QueryState state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
index faafb8cb..092657e5 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.drools.pooling.message.Query;
import org.onap.policy.drools.utils.Pair;
import org.onap.policy.drools.utils.Triple;
-public class StartStateTest extends BasicStateTester {
+public class StartStateTest extends SupportBasicStateTester {
private StartState state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
index 42bb35f2..65d9ee31 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
@@ -44,7 +44,7 @@ import org.onap.policy.drools.pooling.message.Message;
import org.onap.policy.drools.pooling.message.Offline;
import org.onap.policy.drools.pooling.message.Query;
-public class StateTest extends BasicStateTester {
+public class StateTest extends SupportBasicStateTester {
private State state;
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/BasicStateTester.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/SupportBasicStateTester.java
index 20f49a0e..4727652a 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/BasicStateTester.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/SupportBasicStateTester.java
@@ -47,7 +47,7 @@ import org.onap.policy.drools.utils.Triple;
/**
* Superclass used to test subclasses of {@link State}.
*/
-public class BasicStateTester {
+public class SupportBasicStateTester {
protected static final long STD_HEARTBEAT_WAIT_MS = 10;
protected static final long STD_REACTIVATE_WAIT_MS = STD_HEARTBEAT_WAIT_MS + 1;
@@ -110,7 +110,7 @@ public class BasicStateTester {
protected PoolingProperties props;
protected State prevState;
- public BasicStateTester() {
+ public SupportBasicStateTester() {
super();
}