summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBMatajsz <90217645+BMatajsz@users.noreply.github.com>2024-12-03 12:41:22 -0500
committerBMatajsz <90217645+BMatajsz@users.noreply.github.com>2024-12-03 12:41:22 -0500
commit80c0584575d62ffd487668909ed3d6b0a0353591 (patch)
treebb60789c473dcf4c137cb3ab2f439c0928094112
parent21f4046ae1bf51dfe00f6d481e323f06b4300071 (diff)
downloadsoen423-80c0584575d62ffd487668909ed3d6b0a0353591.zip
Re-added logs
-rw-r--r--SystemTest.log5
-rw-r--r--src/main/java/derms/client/ResponderClient.java8
-rw-r--r--src/main/java/derms/client/ResponderClientCLI.java1
-rw-r--r--src/test/java/derms/test/SystemTest.java2
4 files changed, 12 insertions, 4 deletions
diff --git a/SystemTest.log b/SystemTest.log
index 55e561f..d919d3c 100644
--- a/SystemTest.log
+++ b/SystemTest.log
@@ -1,2 +1,3 @@
-[2024-12-03 11:21:45] REPLICA 1: {BYZANTINE: FALSE}
-[2024-12-03 11:21:45] REPLICA 1: {CRASH: FALSE}
+[2024-12-03 12:37:50] REPLICA 1: {BYZANTINE: FALSE}
+[2024-12-03 12:37:50] REPLICA 1: {CRASH: FALSE}
+[2024-12-03 12:38:10] [FAILED: Fail: No response from any server]
diff --git a/src/main/java/derms/client/ResponderClient.java b/src/main/java/derms/client/ResponderClient.java
index 4db30c8..6834c76 100644
--- a/src/main/java/derms/client/ResponderClient.java
+++ b/src/main/java/derms/client/ResponderClient.java
@@ -14,7 +14,13 @@ public class ResponderClient {
}
public String addResource(String resourceID, String resourceName, int duration) {
- return server.addResource(resourceID, resourceName, duration);
+ String res = server.addResource(resourceID, resourceName, duration);
+ if (res.contains("Fail")) {
+ TestLogger.log("[FAILED: " + res + "]");
+ } else {
+ TestLogger.log("[SUCCESS: " + res + "]");
+ }
+ return res;
}
public String removeResource(String resourceID, int duration) {
diff --git a/src/main/java/derms/client/ResponderClientCLI.java b/src/main/java/derms/client/ResponderClientCLI.java
index 86a5a9a..de046d5 100644
--- a/src/main/java/derms/client/ResponderClientCLI.java
+++ b/src/main/java/derms/client/ResponderClientCLI.java
@@ -1,6 +1,7 @@
package derms.client;
import derms.frontend.DERMSInterface;
+import derms.util.TestLogger;
import java.net.MalformedURLException;
diff --git a/src/test/java/derms/test/SystemTest.java b/src/test/java/derms/test/SystemTest.java
index 59b08fa..3cc3f6b 100644
--- a/src/test/java/derms/test/SystemTest.java
+++ b/src/test/java/derms/test/SystemTest.java
@@ -28,7 +28,7 @@ class SystemTest {
// [TODO]
// input IP and NET config
- private static String IP = "127.0.0.1";
+ private static String IP = "172.16.62.225";
@BeforeEach
void clearLogFile() throws IOException {