Merge "Adding decompress option to documentation"
authorConor Ward <conor.ward@est.tech>
Tue, 26 Mar 2019 16:49:37 +0000 (16:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 26 Mar 2019 16:49:37 +0000 (16:49 +0000)
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoaderTest.java [new file with mode: 0644]
pom.xml

index ab1a3a7..af9f829 100644 (file)
@@ -218,7 +218,7 @@ public class LogfileLoader extends Thread {
         }\r
     }\r
 \r
-    private boolean pruneRecords() {\r
+    boolean pruneRecords() {\r
         boolean did1 = false;\r
         long count = countRecords();\r
         long threshold = DEFAULT_LOG_RETENTION;\r
@@ -282,7 +282,7 @@ public class LogfileLoader extends Thread {
         return did1;\r
     }\r
 \r
-    private long countRecords() {\r
+    long countRecords() {\r
         long count = 0;\r
         Connection conn = null;\r
         try {\r
@@ -303,7 +303,7 @@ public class LogfileLoader extends Thread {
         return count;\r
     }\r
 \r
-    private Map<Long, Long> getHistogram() {\r
+    Map<Long, Long> getHistogram() {\r
         Map<Long, Long> map = new HashMap<Long, Long>();\r
         Connection conn = null;\r
         try {\r
@@ -382,7 +382,7 @@ public class LogfileLoader extends Thread {
     }\r
 \r
     @SuppressWarnings("resource")\r
-    private int[] process(File f) {\r
+    int[] process(File f) {\r
         int ok = 0, total = 0;\r
         try {\r
             Connection conn = db.getConnection();\r
@@ -442,7 +442,7 @@ public class LogfileLoader extends Thread {
         return new int[]{ok, total};\r
     }\r
 \r
-    private Loadable[] buildRecords(String line) throws ParseException {\r
+    Loadable[] buildRecords(String line) throws ParseException {\r
         String[] pp = line.split("\\|");\r
         if (pp != null && pp.length >= 7) {\r
             String rtype = pp[1].toUpperCase();\r
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoaderTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoaderTest.java
new file mode 100644 (file)
index 0000000..e24a9a3
--- /dev/null
@@ -0,0 +1,130 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dmaap.datarouter.provisioning.utils;
+
+import org.junit.*;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+
+import org.onap.dmaap.datarouter.provisioning.InternalServlet;
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Map;
+
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+
+
+@RunWith(PowerMockRunner.class)
+@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.provisioning.beans.Parameters")
+public class LogfileLoaderTest {
+
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
+    private LogfileLoader lfl = LogfileLoader.getLoader();
+
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+
+    @BeforeClass
+    public static void init() {
+        emf = Persistence.createEntityManagerFactory("dr-unit-tests");
+        em = emf.createEntityManager();
+        System.setProperty(
+                "org.onap.dmaap.datarouter.provserver.properties",
+                "src/test/resources/h2Database.properties");
+        InternalServlet internalServlet = new InternalServlet();
+    }
+
+
+    @AfterClass
+    public static void tearDownClass() {
+        em.clear();
+        em.close();
+        emf.close();
+    }
+
+
+    @Test
+    public void Verify_File_Processing_when_Req_Type_LOG() throws IOException {
+        String fileContent = "2018-08-29-10-10-10-543.|LOG|1|1|url/file123|method|1|1|type|1|128.0.0.9|user123|2|1|1|1|other|1";
+        int[] actual = lfl.process(prepFile(fileContent));
+        int[] expect = {0, 1};
+        Assert.assertArrayEquals(expect, actual);
+    }
+
+
+    @Test
+    public void Verify_File_Processing_when_Req_Type_EXP() throws IOException {
+        String fileContent = "2018-08-29-10-10-10-543.|EXP|1|1|1|'url/file123'|method|ctype|3|other|4";
+        int[] actual = lfl.process(prepFile(fileContent));
+        int[] expect = {0, 1};
+        Assert.assertArrayEquals(expect, actual);
+    }
+
+
+    @Test
+    public void Verify_Records_Prune_When_Record_Count_Is_Less_Then_Threshold() throws IOException{
+        String fileContent = "2018-08-29-10-10-10-543.|PUB|1|1|https://dmaap-dr-prov:8443/publish/1/file123/|POST|application/vnd.att-dr.feed|2|128.0.0.9|user123|200";
+        lfl.process(prepFile(fileContent));
+        PowerMockito.mockStatic(Parameters.class);
+        PowerMockito.when(Parameters.getParameter(Parameters.PROV_LOG_RETENTION)).thenReturn(new Parameters(Parameters.PROV_LOG_RETENTION, "0"));
+        Assert.assertEquals(lfl.pruneRecords(), false);
+    }
+
+
+    @Test
+    public void Verify_Histogram_When_Request_Type_Post() throws Exception {
+        String fileContent = "2018-08-29-10-10-10-543.|PUB|1|1|https://dmaap-dr-prov:8443/publish/1/file123/|POST|application/vnd.att-dr.feed|2|128.0.0.9|user123|200";
+        lfl.process(prepFile(fileContent));
+        Map<Long, Long> expect = new HashMap<>();
+        expect.put(17772L,2L);
+        expect.put(29353L,1L);
+        Map<Long, Long> actual = lfl.getHistogram();
+        assertTrue(actual.equals(expect));
+    }
+
+
+    private File prepFile(String content) throws IOException{
+        File file1 = folder.newFile("myfile1.txt");
+        try (FileWriter fileWriter = new FileWriter(file1)) {
+            fileWriter.write(content);
+        }catch (IOException e){
+            System.out.println(e.getMessage());
+        }
+        return file1;
+    }
+}
diff --git a/pom.xml b/pom.xml
index f726f1a..a515dc5 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
         <skip.docker.tag>true</skip.docker.tag>
         <skip.docker.push>true</skip.docker.push>
         <commons-codec.version>1.10</commons-codec.version>
+        <sonar.coverage.exclusions>datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/*</sonar.coverage.exclusions>
     </properties>
     <modules>
         <module>datarouter-prov</module>