From 4a4144cabda83c02eed0917eed884f3ec5641ba9 Mon Sep 17 00:00:00 2001
From: BMatajsz <90217645+BMatajsz@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:39:46 -0500
Subject: Uncommented tests

---
 .gitignore                               |  1 +
 SystemTest.log                           | 12 +++---------
 TestExpected.log                         |  2 +-
 src/test/java/derms/test/SystemTest.java | 12 ++++++------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index acc6ea8..4357efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ QUEServer.log
 MTLServer.log
 SHEServer.log
 server.log
+SystemTest.log
 *.run.xml
 *.toc
 javadoc
diff --git a/SystemTest.log b/SystemTest.log
index 42385cd..a7e7939 100644
--- a/SystemTest.log
+++ b/SystemTest.log
@@ -1,9 +1,3 @@
-[2024-12-03 09:30:31] REPLICA 1: {BYZANTINE: TRUE}
-[2024-12-03 09:30:31] REPLICA 1: {CRASH: FALSE}
-[2024-12-03 09:30:31] REPLICA 3: {BYZANTINE: FALSE}
-[2024-12-03 09:30:31] REPLICA 3: {CRASH: TRUE}
-[2024-12-03 09:30:31] REPLICA 3: {CRASH: DETECTED}
-[2024-12-03 09:30:31] [FAILED TO INFORM FE (RM IS DOWN)]
-[2024-12-03 09:30:31] REPLICA 3: {RESTARTED}
-[2024-12-03 09:30:51] [FAILED: Fail: No response from any server]
-[2024-12-03 09:31:11] [FAILED: Fail: No response from any server]
+[2024-12-03 09:37:37] REPLICA 1: {BYZANTINE: FALSE}
+[2024-12-03 09:37:37] REPLICA 1: {CRASH: FALSE}
+[2024-12-03 09:37:57] [FAILED: Fail: No response from any server]
diff --git a/TestExpected.log b/TestExpected.log
index 805775e..1cea96b 100644
--- a/TestExpected.log
+++ b/TestExpected.log
@@ -1,3 +1,3 @@
 [2024-12-03 07:48:36] REPLICA 1: {BYZANTINE: FALSE}
 [2024-12-03 07:48:36] REPLICA 1: {CRASH: FALSE}
-[2024-12-03 08:53:10] [SUCCESS: Something Something]
\ No newline at end of file
+[2024-12-03 08:53:10] [SUCCESS: OK]
\ No newline at end of file
diff --git a/src/test/java/derms/test/SystemTest.java b/src/test/java/derms/test/SystemTest.java
index 6ee1f35..2112ce9 100644
--- a/src/test/java/derms/test/SystemTest.java
+++ b/src/test/java/derms/test/SystemTest.java
@@ -64,7 +64,7 @@ class SystemTest {
         DERMSServerPublisher.stop();
     }
 
-    /* @Test
+    @Test
     void testNormal() throws IOException {
         // Replica 1
         String[] argsRM = {"1", "MTL", IP, "0", "0"};
@@ -80,9 +80,9 @@ class SystemTest {
 
         // Compare the number of lines in the log files, to determine if they match or not
         assertTrue(LogComparator.compareFiles(TEST_LOG_PATH, EXPECTED_LOG_PATH_NORM));
-    } */
+    }
 
-    /* @Test
+    @Test
     void testByzantine() throws IOException {
         // Replica 1
         String[] argsRM = {"1", "MTL", IP, "1", "0"};
@@ -98,9 +98,9 @@ class SystemTest {
 
         // Compare the number of lines in the log files, to determine if they match or not
         assertTrue(LogComparator.compareFiles(TEST_LOG_PATH, EXPECTED_LOG_PATH_BYZ));
-    } */
+    }
 
-    /* @Test
+    @Test
     void testCrash() throws IOException {
         // Replica 1
         String[] argsRM = {"1", "MTL", IP, "0", "1"};
@@ -116,7 +116,7 @@ class SystemTest {
 
         // Compare the number of lines in the log files, to determine if they match or not
         assertTrue(LogComparator.compareFiles(TEST_LOG_PATH, EXPECTED_LOG_PATH_CRASH));
-    } */
+    }
 
     @Test
     void testCombined() throws IOException {
-- 
cgit v1.2.3