summaryrefslogtreecommitdiffstats
path: root/feature-test-transaction/src
diff options
context:
space:
mode:
Diffstat (limited to 'feature-test-transaction/src')
-rw-r--r--feature-test-transaction/src/main/java/org/onap/policy/drools/testtransaction/TestTransaction.java10
-rw-r--r--feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java24
2 files changed, 17 insertions, 17 deletions
diff --git a/feature-test-transaction/src/main/java/org/onap/policy/drools/testtransaction/TestTransaction.java b/feature-test-transaction/src/main/java/org/onap/policy/drools/testtransaction/TestTransaction.java
index e5cff243..a23f2a46 100644
--- a/feature-test-transaction/src/main/java/org/onap/policy/drools/testtransaction/TestTransaction.java
+++ b/feature-test-transaction/src/main/java/org/onap/policy/drools/testtransaction/TestTransaction.java
@@ -42,8 +42,18 @@ public interface TestTransaction {
public static final TestTransaction manager = new TTImpl();
+ /**
+ * register a controller for monitoring test transactions
+ *
+ * @param controller policy controller
+ */
public void register(PolicyController controller);
+ /**
+ * unregisters a controller for monitoring test transactions
+ *
+ * @param controller policy controller
+ */
public void unregister(PolicyController controller);
}
diff --git a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java
index 6c60c5ac..5dd630e1 100644
--- a/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java
+++ b/feature-test-transaction/src/test/java/org/onap/policy/drools/testtransaction/TestTransactionTest.java
@@ -74,37 +74,25 @@ public class TestTransactionTest {
}
@Test
- public void registerUnregisterTest() {
+ public void registerUnregisterTest() throws InterruptedException {
final Properties controllerProperties = new Properties();
controllerProperties.put(PolicyProperties.PROPERTY_CONTROLLER_NAME, TEST_CONTROLLER_NAME);
final PolicyController controller =
PolicyEngine.manager.createPolicyController(TEST_CONTROLLER_NAME, controllerProperties);
+ assertNotNull(PolicyController.factory.get(TEST_CONTROLLER_NAME));
+ logger.info(controller.toString());
+
Thread ttThread = null;
TestTransaction.manager.register(controller);
assertNotNull(TestTransaction.manager);
/*
- * If the controller was successfully registered it will have a thread created.
- */
- ttThread = this.getThread("tt-controller-task-" + TEST_CONTROLLER_NAME);
- assertNotNull(ttThread);
-
- /*
* Unregistering the controller should terminate its TestTransaction thread if it hasn't already
* been terminated
*/
TestTransaction.manager.unregister(controller);
- /*
- * Put this thread to sleep so the TestTransaction thread has enough time to terminate before we
- * check.
- */
- try {
- Thread.sleep(2000);
- } catch (final InterruptedException e) {
-
- }
ttThread = this.getThread("tt-controller-task-" + TEST_CONTROLLER_NAME);
assertEquals(null, ttThread);
@@ -114,7 +102,9 @@ public class TestTransactionTest {
/*
* Returns thread object based on String name
*/
- public Thread getThread(String threadName) {
+ public Thread getThread(String threadName) throws InterruptedException {
+ // give a chance to the transaction thread to be spawned/destroyed
+ Thread.sleep(5000L);
final Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
for (final Thread thread : threadSet) {