Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMaaP DR] JKD 11 migration
[dmaap/datarouter.git]
/
datarouter-node
/
src
/
test
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
node
/
DeliveryTaskTest.java
diff --git
a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryTaskTest.java
b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryTaskTest.java
index
0123c31
..
0f01916
100644
(file)
--- a/
datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryTaskTest.java
+++ b/
datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryTaskTest.java
@@
-23,6
+23,9
@@
package org.onap.dmaap.datarouter.node;
import java.io.ByteArrayOutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.io.ByteArrayOutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@
-31,17
+34,21
@@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
@PrepareForTest({URL.class})
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
@PrepareForTest({URL.class})
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
public class DeliveryTaskTest {
@Mock
private DeliveryQueue deliveryQueue;
public class DeliveryTaskTest {
@Mock
private DeliveryQueue deliveryQueue;
+ private ExecutorService executorService;
+
@Before
public void setUp() throws Exception {
DestInfo destInfo = getPrivDestInfo();
@Before
public void setUp() throws Exception {
DestInfo destInfo = getPrivDestInfo();
@@
-86,15
+93,23
@@
public class DeliveryTaskTest {
}
@Test
}
@Test
- public void Validate_Delivery_Tasks_Success_For_Standard_File() {
+ public void Validate_Delivery_Tasks_Success_For_Standard_File()
throws InterruptedException
{
DeliveryTask task = new DeliveryTask(deliveryQueue, "123456789.test-dr-node");
DeliveryTask task = new DeliveryTask(deliveryQueue, "123456789.test-dr-node");
- task.run();
+ executorService = Executors.newSingleThreadExecutor();
+ executorService.execute(task);
+
+ executorService.shutdown();
+ executorService.awaitTermination(2, TimeUnit.SECONDS);
}
@Test
}
@Test
- public void Validate_Delivery_Tasks_Success_For_Compressed_File() {
+ public void Validate_Delivery_Tasks_Success_For_Compressed_File()
throws InterruptedException
{
DeliveryTask task = new DeliveryTask(deliveryQueue, "123456789.test-dr-node.gz");
DeliveryTask task = new DeliveryTask(deliveryQueue, "123456789.test-dr-node.gz");
- task.run();
+ executorService = Executors.newSingleThreadExecutor();
+ executorService.execute(task);
+
+ executorService.shutdown();
+ executorService.awaitTermination(2, TimeUnit.SECONDS);
}
private DestInfo getPrivDestInfo() {
}
private DestInfo getPrivDestInfo() {