import static org.mockito.Mockito.when;
import java.io.File;
-import java.util.Hashtable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import java.util.Vector;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.jetbrains.annotations.NotNull;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.node.NodeConfigManager")
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
public class DeliveryQueueTest {
@Mock
when(destInfo.isPrivilegedSubscriber()).thenReturn(true);
deliveryQueue = new DeliveryQueue(deliveryQueueHelper, destInfo);
NodeConfigManager configManager = mockNodeConfigManager();
- FieldUtils.writeDeclaredStaticField(StatusLog.class, "config", configManager, true);
+ FieldUtils.writeDeclaredStaticField(NodeConfigManager.class, "base", configManager, true);
}
@Test
DeliveryTask task = new DeliveryTask(deliveryQueue, "123.node.datarouternew.com");
task.clean();
tasks.add(task);
- FieldUtils.writeField(deliveryQueue, "todo", tasks, true);
+ FieldUtils.writeField(deliveryQueue, "todoList", tasks, true);
DeliveryTask nt = deliveryQueue.getNext();
assertNull(nt);
}
long timeInFuture = 2558366240223L;
task.setResumeTime(timeInFuture);
tasks.add(task);
- FieldUtils.writeField(deliveryQueue, "todo", tasks, true);
+ FieldUtils.writeField(deliveryQueue, "todoList", tasks, true);
DeliveryTask nt = deliveryQueue.getNext();
assertNull(nt);
}
long timeInPast = 1058366240223L;
task.setResumeTime(timeInPast);
tasks.add(task);
- FieldUtils.writeField(deliveryQueue, "todo", tasks, true);
+ FieldUtils.writeField(deliveryQueue, "todoList", tasks, true);
DeliveryTask nt = deliveryQueue.getNext();
assertNull(nt);
}
@Test
public void Given_Delivery_Task_Is_Working_Cancel_Task_Returns_Zero() throws IllegalAccessException {
- Hashtable<String, DeliveryTask> tasks = new Hashtable<>();
+ HashMap<String, DeliveryTask> tasks = new HashMap<>();
tasks.put("123.node.datarouternew.com", new DeliveryTask(deliveryQueue, "123.node.datarouternew.com"));
FieldUtils.writeField(deliveryQueue, "working", tasks, true);
long rc = deliveryQueue.cancelTask("123.node.datarouternew.com");
@Test
public void Given_Delivery_Task_In_Todo_Cancel_Task_Returns_Zero() throws IllegalAccessException {
- Vector<DeliveryTask> tasks = new Vector<>();
+ List<DeliveryTask> tasks = new ArrayList<>();
tasks.add(new DeliveryTask(deliveryQueue, "123.node.datarouternew.com"));
- FieldUtils.writeField(deliveryQueue, "todo", tasks, true);
+ FieldUtils.writeField(deliveryQueue, "todoList", tasks, true);
long rc = deliveryQueue.cancelTask("123.node.datarouternew.com");
assertEquals(0, rc);
}
@Test
public void Given_Task_In_Working_MarkTaskSuccess_Returns_True() throws IllegalAccessException {
- Hashtable<String, DeliveryTask> tasks = new Hashtable<>();
+ HashMap<String, DeliveryTask> tasks = new HashMap<>();
tasks.put("123.node.datarouternew.com", new DeliveryTask(deliveryQueue, "123.node.datarouternew.com"));
FieldUtils.writeField(deliveryQueue, "working", tasks, true);
assertTrue(deliveryQueue.markTaskSuccess("123.node.datarouternew.com"));
@Test
public void Given_Task_In_Retry_MarkTaskSuccess_Returns_True() throws IllegalAccessException {
- Hashtable<String, DeliveryTask> tasks = new Hashtable<>();
+ HashMap<String, DeliveryTask> tasks = new HashMap<>();
tasks.put("123.node.datarouternew.com", new DeliveryTask(deliveryQueue, "123.node.datarouternew.com"));
FieldUtils.writeField(deliveryQueue, "retry", tasks, true);
assertTrue(deliveryQueue.markTaskSuccess("123.node.datarouternew.com"));