Usecase de feu.

maxi297 · Apr 19, 2013 · 1bcba85 · 1bcba85
1 parent 11c8753
commit 1bcba85
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 12 deletions.
diff --git a/...sts/src/test/java/ca/ulaval/glo4002/acceptanceTests/TestSendAlarmWhenSmokeIsDetected.java b/...sts/src/test/java/ca/ulaval/glo4002/acceptanceTests/TestSendAlarmWhenSmokeIsDetected.java
@@ -39,7 +39,7 @@ public void emergenciesCalledWhenSmokeDetected() {
         fixture.detectSmoke();
 
         fixture.verifySirenIsOn();
-        fixture.emergencyServerWasCalled();
+        fixture.firemenWereCalled();
         fixture.verifyZoneWasTransmittedToCentral();
     }
 

diff --git a/acceptanceTests/src/test/java/ca/ulaval/glo4002/testFixtures/TestFixture.java b/acceptanceTests/src/test/java/ca/ulaval/glo4002/testFixtures/TestFixture.java
@@ -129,7 +129,7 @@ public void triggerMovementDetector() {
 
     public void verifyPoliceWasCalledAfterThirtySeconds() throws InterruptedException {
         Awaitility.setDefaultTimeout(THIRTY_TWO_SECONDS_IN_MILLISECONDS, TimeUnit.MILLISECONDS);
-        Awaitility.await().until(emergencyServerWasCalled());
+        Awaitility.await().until(emergenciesWereCalled());
         long endTime = System.currentTimeMillis();
 
         assertTrue(endTime - startTime >= THIRTY_SECONDS_IN_MILLISECONDS);
@@ -146,11 +146,11 @@ public void verifyAlarmSystemWaitsThirtySecondsBeforeArming() throws Interrupted
     }
 
     public void verifyPoliceWasCalled() {
-        assertTrue(EmergencyServer.called);
+        assertTrue(EmergencyServer.policeWasCalled);
     }
 
     public void verifyPoliceWasNotCalled() {
-        assertFalse(EmergencyServer.called);
+        assertFalse(EmergencyServer.policeWasCalled);
     }
 
     public void verifyAlarmLogIsEmpty() throws Exception {
@@ -194,14 +194,14 @@ private JSONObject getJSONResponseFromServer(HttpURLConnection connection) throw
     }
 
     public void setReceivedCallToFalse() {
-        EmergencyServer.called = false;
+        EmergencyServer.policeWasCalled = false;
     }
 
-    public static Callable<Boolean> emergencyServerWasCalled() {
+    public static Callable<Boolean> emergenciesWereCalled() {
         return new Callable<Boolean>() {
 
             public Boolean call() throws Exception {
-                return EmergencyServer.called;
+                return EmergencyServer.policeWasCalled;
             }
 
         };
@@ -244,7 +244,11 @@ public void verifySirenIsOn() {
     }
 
     public void verifyZoneWasTransmittedToCentral() {
-        // TODO
+        assertEquals(EmergencyServer.calledZone, A_ZONE);
+    }
+
+    public void firemenWereCalled() {
+        assertTrue(EmergencyServer.fireFightersWereCalled);
     }
 
 }
diff --git a/client/src/main/java/ca/ulaval/glo4002/communication/Communicator.java b/client/src/main/java/ca/ulaval/glo4002/communication/Communicator.java
@@ -40,8 +40,8 @@ public void sendMessageToCentralServer(TargetResource targetResource) {
     }
 
     public String sendMessageToCentralServer(TargetResource targetResource, String messageToSend) {
-        System.out.println(messageToSend);
         String resourceURL = generateResourceURL(targetResource);
+        System.out.println("resourceURL: " + resourceURL);
         String response = requestSender.sendPOSTRequest(resourceURL, messageToSend);
         return response;
     }

diff --git a/client/src/main/java/ca/ulaval/glo4002/policies/FirePolicy.java b/client/src/main/java/ca/ulaval/glo4002/policies/FirePolicy.java
@@ -14,6 +14,7 @@ public FirePolicy(AlarmSystem alarmSystem, Communicator communicator) {
     @Override
     public void executeProcedure(int zone) {
         if (alarmSystem.isArmed()) {
+            System.out.println(targetResource);
             communicator.sendMessageToCentralServer(targetResource, String.valueOf(zone));
             alarmSystem.activateSiren();
         }

diff --git a/common/src/main/java/ca/ulaval/glo4002/common/requestSender/HTTPRequestSender.java b/common/src/main/java/ca/ulaval/glo4002/common/requestSender/HTTPRequestSender.java
@@ -48,6 +48,8 @@ public String sendPOSTRequest(String resource) {
     public String sendGETRequest(String resource) {
         WebResource webResource = prepareRequest(resource);
 
+        System.out.println(webResource);
+
         ClientResponse response = webResource.type(APPLICATION_TYPE).get(ClientResponse.class);
 
         treatAnswerFromRequest(response);

diff --git a/emergencyServer/pom.xml b/emergencyServer/pom.xml
@@ -45,6 +45,15 @@
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-servlet</artifactId>
     </dependency>
+<dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>1.17</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/main/EmergencyServer.java b/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/main/EmergencyServer.java
@@ -15,7 +15,8 @@ public class EmergencyServer {
     private static final String PACKAGE_NAME = "ca.ulaval.glo4002.emergencyServer.rest";
     private static final String CONTEXT_PATH = "/";
     private static final String PATH_SPEC = "/*";
-    public static boolean called = false;
+    public static boolean policeWasCalled = false;
+    public static boolean fireFightersWereCalled = false;
     public static int calledZone = 0;
 
     private Server server;

diff --git a/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/rest/FireResource.java b/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/rest/FireResource.java
@@ -0,0 +1,26 @@
+package ca.ulaval.glo4002.emergencyServer.rest;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.codehaus.jettison.json.JSONObject;
+import org.json.JSONException;
+
+import ca.ulaval.glo4002.emergencyServer.main.EmergencyServer;
+
+@Path("/fire/")
+public class FireResource {
+
+    private static final String RESPONSE_TO_POST_REQUEST = "POST request received at emergency server";
+    private static final int RESPONSE_OK = 200;
+
+    @POST
+    public Response treatRequest(String helpRequesterInformations) throws JSONException, org.codehaus.jettison.json.JSONException {
+        JSONObject jsonObject = new JSONObject(helpRequesterInformations);
+        EmergencyServer.fireFightersWereCalled = true;
+        EmergencyServer.calledZone = jsonObject.getInt("message");
+
+        return Response.status(RESPONSE_OK).build();
+    }
+}
diff --git a/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/rest/PoliceResource.java b/emergencyServer/src/main/java/ca/ulaval/glo4002/emergencyServer/rest/PoliceResource.java
@@ -12,8 +12,7 @@ public class PoliceResource {
 
     @POST
     public String treatRequest(String helpRequesterInformations) {
-        EmergencyServer.called = true;
-        System.out.println(helpRequesterInformations);
+        EmergencyServer.policeWasCalled = true;
         return RESPONSE_TO_POST_REQUEST;
     }