From 5e6a9f65049e8e8d39e8dcab227e5d75b328b173 Mon Sep 17 00:00:00 2001 From: econwar Date: Wed, 8 May 2019 12:06:50 +0000 Subject: Remove datarouter-node critical code smells Change-Id: Iff0f9e2c4f326e75ee4bb5c8328c3a341468cf1b Issue-ID: DMAAP-1195 Signed-off-by: econwar --- .../org/onap/dmaap/datarouter/node/DeliveryQueueTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'datarouter-node/src/test/java') diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java index 6dc334fc..fa868b26 100644 --- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java +++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/DeliveryQueueTest.java @@ -45,20 +45,18 @@ public class DeliveryQueueTest { DeliveryQueueHelper deliveryQueueHelper; private String dirPath = "/tmp/dir001/"; - private String FileName1 = "10000000000004.fileName.M"; + private String fileName = "10000000000004.fileName.M"; @Before public void setUp() { - when(destInfo.getSpool()).thenReturn("tmp"); + when(destInfo.getSpool()).thenReturn(dirPath); deliveryQueue = new DeliveryQueue(deliveryQueueHelper, destInfo); } @Test public void Given_New_DeliveryQueue_Directory_Is_Created_As_Defined_By_DestInfo() { - when(destInfo.getSpool()).thenReturn("tmp"); - File file = new File("tmp"); + File file = new File("/tmp"); assertTrue(file.exists()); - deleteFile("tmp"); } @Test @@ -75,7 +73,7 @@ public class DeliveryQueueTest { deliveryQueue = new DeliveryQueue(deliveryQueueHelper, destInfo); DeliveryTask nt = deliveryQueue.getNext(); assertEquals("10000000000004.fileName", nt.getPublishId()); - deleteFile(dirPath + FileName1); + deleteFile(dirPath + fileName); deleteFile(dirPath); } @@ -87,9 +85,7 @@ public class DeliveryQueueTest { private void prepareFiles() throws Exception { createFolder(dirPath); - createFile(FileName1, dirPath); - String[] files = new String[2]; - files[0] = dirPath + FileName1; + createFile(fileName, dirPath); } private void createFolder(String dirName) { -- cgit 1.2.3-korg