Merge branch 'test_grep' into 'main'

Add testcases

See merge request trangtd2/cs425_mp1!8

.gitignore

@@ -3,3 +3,5 @@
 *.DS_Store
 files/generated_log/*
 out/artifacts/grep_server_jar/*
+out/artifacts/grep_client_jar/*
+files/demo_data/*

files/bash/run_jars.sh

@@ -9,6 +9,5 @@ for ((i=1; i<=upperlim; i++)); do
         else
           ssh maitp2@fa22-cs425-52$i.cs.illinois.edu 'java -jar /home/maitp2/grep_server.jar -p 5000'
         fi
-        sleep 3s
         logout
 done
\ No newline at end of file

files/bash/send_jars.sh

@@ -5,8 +5,8 @@ upperlim=10
 for ((i=1; i<=upperlim; i++)); do
         echo "Sending jar file to VM $i"
         if [ "$i" -lt 10 ]; then
-          scp /home/maipham/uiuc/cs425/mp1/grep/out/artifacts/grep_server_jar/grep_server.jar maitp2@fa22-cs425-520$i.cs.illinois.edu:/home/maitp2/
+          scp /home/maipham/uiuc/cs425/mp1/grep/out/artifacts/grep_client_jar/grep_client.jar maitp2@fa22-cs425-520$i.cs.illinois.edu:/home/maitp2/
         else
-          scp /home/maipham/uiuc/cs425/mp1/grep/out/artifacts/grep_server_jar/grep_server.jar maitp2@fa22-cs425-52$i.cs.illinois.edu:/home/maitp2/
+          scp /home/maipham/uiuc/cs425/mp1/grep/out/artifacts/grep_client_jar/grep_client.jar maitp2@fa22-cs425-52$i.cs.illinois.edu:/home/maitp2/
         fi
 done
\ No newline at end of file

files/bash/send_log.sh

+#!/bin/bash
+# This bash will send Client and server jars files to all VMs
+upperlim=10
+
+for ((i=1; i<=upperlim; i++)); do
+        echo "Sending log file to VM $i"
+        if [ "$i" -lt 10 ]; then
+#          scp /home/maipham/uiuc/cs425/mp1/grep/files/demo_data/vm$i.log maitp2@fa22-cs425-520$i.cs.illinois.edu:/home/maitp2/
+           scp /home/maipham/uiuc/cs425/mp1/grep/files/config.txt maitp2@fa22-cs425-520$i.cs.illinois.edu:/home/maitp2/
+        else
+#          scp /home/maipham/uiuc/cs425/mp1/grep/files/demo_data/vm$i.log maitp2@fa22-cs425-52$i.cs.illinois.edu:/home/maitp2/
+           scp /home/maipham/uiuc/cs425/mp1/grep/files/config.txt maitp2@fa22-cs425-52$i.cs.illinois.edu:/home/maitp2/
+        fi
+done
\ No newline at end of file

files/config.txt

-fa22-cs425-5201.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5202.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5203.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5204.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5205.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5206.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5207.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5208.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5209.cs.illinois.edu 5000 /home/maitp2/generated_log.log
-fa22-cs425-5210.cs.illinois.edu 5000 /home/maitp2/generated_log.log
+fa22-cs425-5201.cs.illinois.edu 5000 /home/maitp2/vm1.log
+fa22-cs425-5202.cs.illinois.edu 5000 /home/maitp2/vm2.log
+fa22-cs425-5203.cs.illinois.edu 5000 /home/maitp2/vm3.log
+fa22-cs425-5204.cs.illinois.edu 5000 /home/maitp2/vm4.log
+fa22-cs425-5205.cs.illinois.edu 5000 /home/maitp2/vm5.log
+fa22-cs425-5206.cs.illinois.edu 5000 /home/maitp2/vm6.log
+fa22-cs425-5207.cs.illinois.edu 5000 /home/maitp2/vm7.log
+fa22-cs425-5208.cs.illinois.edu 5000 /home/maitp2/vm8.log
+fa22-cs425-5209.cs.illinois.edu 5000 /home/maitp2/vm9.log
+fa22-cs425-5210.cs.illinois.edu 5000 /home/maitp2/vm10.log
\ No newline at end of file

files/configTest.txt

-localhost 5001 /home/maipham/uiuc/cs425/mp1/grep/files/generated_log/test1.log
+localhost 5001 /home/maipham/uiuc/cs425/mp1/grep/files/demo_data/vm1.log
\ No newline at end of file

files/test_1.rtf

-{\rtf1\ansi\ansicpg1252\cocoartf2638
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\margl1440\margr1440\vieww11520\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-
-\f0\fs24 \cf0 Error: This is an error for multi test case 1\
-}
\ No newline at end of file

files/test_2.rtf

-{\rtf1\ansi\ansicpg1252\cocoartf2638
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\margl1440\margr1440\vieww11520\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-
-\f0\fs24 \cf0 Error: This is a confirm for multi test case 2\
-!}
\ No newline at end of file

files/test_result/match_all.txt

+vm1.log: 283553
+vm2.log: 267938
+vm3.log: 268804
+vm4.log: 270917
+vm5.log: 271205
+vm6.log: 268894
+vm7.log: 268084
+vm8.log: 274522
+vm9.log: 269822
+vm10.log: 265524
+Total number of matching lines: 2709263
\ No newline at end of file

files/test_result/match_none.txt

+vm1.log: 0
+vm2.log: 0
+vm3.log: 0
+vm4.log: 0
+vm5.log: 0
+vm6.log: 0
+vm7.log: 0
+vm8.log: 0
+vm9.log: 0
+vm10.log: 0
+Total number of matching lines: 0
\ No newline at end of file

files/test_result/match_one.txt

+vm1.log: 1
+vm2.log: 0
+vm3.log: 0
+vm4.log: 0
+vm5.log: 0
+vm6.log: 0
+vm7.log: 0
+vm8.log: 0
+vm9.log: 0
+vm10.log: 0
+Total number of matching lines: 1
\ No newline at end of file

files/test_result/match_several.txt

+vm1.log: 84965
+vm2.log: 80130
+vm3.log: 80591
+vm4.log: 81191
+vm5.log: 81284
+vm6.log: 80448
+vm7.log: 80768
+vm8.log: 82096
+vm9.log: 80626
+vm10.log: 79214
+Total number of matching lines: 811313
\ No newline at end of file

files/test_result/normal_case.txt

+vm1.log: 32473
+vm2.log: 21726
+vm3.log: 23171
+vm4.log: 24521
+vm5.log: 25238
+vm6.log: 22684
+vm7.log: 22013
+vm8.log: 27898
+vm9.log: 23753
+vm10.log: 19447
+Total number of matching lines: 242924
\ No newline at end of file

files/test_result/rare_case.txt

+vm1.log: 2
+vm2.log: 1
+vm3.log: 1
+vm4.log: 2
+vm5.log: 0
+vm6.log: 0
+vm7.log: 1
+vm8.log: 1
+vm9.log: 0
+vm10.log: 0
+Total number of matching lines: 8
\ No newline at end of file

pom.xml

@@ -11,6 +11,10 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <jdk.version>1.8</jdk.version>
+        <junit.jupiter.version>5.8.2</junit.jupiter.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
     <dependencies>
         <dependency>
@@ -36,5 +40,26 @@
             <version>2.0.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <finalName>running-unit-tests</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>
\ No newline at end of file

src/main/java/cs425/mp1/Client.java

@@ -29,10 +29,12 @@ public class Client {
             System.exit(1);
         }
 
+        long start = System.currentTimeMillis();
         /* Read config file */
         String configFile = ns.getString("configFile");
         String pattern = String.join(" ", ns.getList("command"));
         ClientHandler.start(configFile, pattern);
-
+        long end = System.currentTimeMillis();
+        System.out.println("Elapsed Time: " + (end - start) + " ms" );
     }
 }

src/main/java/cs425/mp1/ClientHandler.java

 package cs425.mp1;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 
 public class ClientHandler {
-    public static String start(String confFile, String grepCommand) throws IOException {
+
+    private static final Logger logger = LoggerFactory.getLogger(ClientHandler.class);
+
+    public static ArrayList<ResultInfo> start(String confFile, String grepCommand) throws IOException {
         /* Read server hosts, ports, and log files from config files */
         FileReader file = new FileReader(confFile);
         ArrayList<ServerConf> servers = new ArrayList<>();
         String line;
         BufferedReader reader = new BufferedReader(file);
+        int totalLines = 0;
+
         while (true) {
             line = reader.readLine();
             if (line != null) {
@@ -31,24 +39,31 @@ public class ClientHandler {
         Creating threads based on number of servers
          */
         int n = servers.size();
-        StringBuilder result = new StringBuilder();
-        ArrayList<JobThread> threads = new ArrayList<>(n);
+        ArrayList<GrepThread> threads = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
-            JobThread t = new JobThread(servers.get(i), grepCommand);
+            GrepThread t = new GrepThread(servers.get(i), grepCommand);
             threads.add(t);
             t.start();
         }
 
         /* End threads */
-        for (JobThread t: threads) {
+        ArrayList<ResultInfo> results = new ArrayList<>();
+        for (GrepThread t: threads) {
             try {
                 t.join();
-                result.append(t.getResult()).append("\n");
+                if (t.getResult() != null){
+                    results.add(t.getResult());
+                    totalLines += t.getResult().getMatches();
+                }
+
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
         }
 
-        return result.toString();
+        System.out.println("Total lines: " + totalLines);
+        results.add(new ResultInfo("total", "total", totalLines));
+
+        return results;
     }
 }

src/main/java/cs425/mp1/Constant.java

-package cs425.mp1;
-
-public class Constant {
-    public static final String SUCCESS_CREATE_LOG = "SUCCESSFUL CREATE LOG";
-    public static final String ERROR_CREATE_LOG = "FAIL TO CREATE LOG FILE";
-    public static final String LOG_FILE_DOES_NOT_EXIST = "LOG FILE DOES NOT EXIST";
-}