From d9beaff898d0d923a97c4f49150a0efead6af4f8 Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Thu, 23 May 2019 01:26:28 -0700 Subject: [PATCH] added unit tst for getProcessStatus(), fixed scoping issue in processmanager --- src/main/java/JobServ/ProcessManager.java | 2 +- src/test/java/JobServ/ProcessManagerTest.java | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/JobServ/ProcessManager.java b/src/main/java/JobServ/ProcessManager.java index 7e53e58..1679f51 100644 --- a/src/main/java/JobServ/ProcessManager.java +++ b/src/main/java/JobServ/ProcessManager.java @@ -264,7 +264,7 @@ class ProcessManager { * (AKA when user hits control c in the shell) * releases resources held in the processController objects */ - private void shutdown() { + public void shutdown() { this.processQueueMutex = true; Iterator> iterator = this.processMap.entrySet().iterator(); diff --git a/src/test/java/JobServ/ProcessManagerTest.java b/src/test/java/JobServ/ProcessManagerTest.java index b6d9b45..505c03f 100644 --- a/src/test/java/JobServ/ProcessManagerTest.java +++ b/src/test/java/JobServ/ProcessManagerTest.java @@ -38,12 +38,27 @@ public class ProcessManagerTest { */ @Test public void addProcessesTest() { - int pid1 = manager.newProcess("ping google"); - assertEquals(0, pid1); + int pid1 = manager.newProcess("ping google.com"); + int pid2 = manager.newProcess("ping google.com"); + assertEquals(2, pid2); + assertEquals(1, pid1); - int pid2 = manager.newProcess("ping google"); - assertEquals(1, pid2); + manager.shutdown(); } + /* + * getStatusTest + * positive unit test for getStatus + */ + @Test + public void getStatusTest() { + int pid1 = manager.newProcess("ping google.com"); + assertEquals(0, pid1); + + int status = manager.getProcessStatus(pid1); + assertEquals(0, status); + + manager.shutdown(); + } }