Merge pull request #5 from refapps/add-test

updated tests and added logs

Author: singhabhi1999

srv/src/main/java/com/sap/cap/incident_management/handler/ProcessorServiceHandler.java

@@ -32,6 +32,7 @@ public class ProcessorServiceHandler implements EventHandler {
  * Change the urgency of an incident to "high" if the title contains the word "urgent"
  */
 	private static final Logger logger = LoggerFactory.getLogger(ProcessorServiceHandler.class);
+
 	@Before(event = CqnService.EVENT_CREATE)  
 	public void ensureHighUrgencyForIncidentsWithUrgentInTitle(List<Incidents> incidents) {  
 		for (Incidents incident : incidents) {
@@ -50,6 +51,7 @@ public void ensureHighUrgencyForIncidentsWithUrgentInTitle(List<Incidents> incid
 	public void onUpdate(Incidents incident) { 
         Incidents in = db.run(Select.from((Class<Incidents_>) Incidents_.class).where(i -> i.ID().eq(incident.getId()))).single(Incidents.class);
 		if(in.getStatusCode().equals("C")){
+			logger.error("Incident"+ incident.getId() +"has already been closed");  
             throw new ServiceException(ErrorStatuses.CONFLICT, "Can't modify a closed incident");
         }
 

srv/src/test/java/com/sap/cap/incident_management/IncidentsODataTests.java

@@ -31,7 +31,7 @@ class IncidentsODataTests {
      */
     @Test
     @WithMockUser(username = "alice")
-    void incidentReturned() throws Exception {
+    void incidentReturned(@Autowired MockMvc mockMvc) throws Exception {
         mockMvc.perform(get(incidentsURI))
             .andExpect(status().isOk())
                 .andExpect(jsonPath("$.value", hasSize(4)));
@@ -65,30 +65,61 @@ void expandEntityEndpoint() throws Exception {
 
     }
 
+
     /**
-     * Test to create an Incident.
-     * Test custom handler ensuring High Urgency For Incidents With "Urgent" in Title
-     * @throws Exception
+     * Test for creating an Draft Incident
+     * Activating the draft Incident and check Urgency code as H using custom logic
+     * Delete the Incident
      */
-    @Test
-    @WithMockUser(username = "alice")
-    void createIncident() throws Exception {
-        String incidentJson = "{ \"title\": \"Urgent attention required!\", \"status_code\": \"N\", \"urgency_code\": \"M\", \"IsActiveEntity\": true }";
 
-        mockMvc.perform(MockMvcRequestBuilders.post("/odata/v4/ProcessorService/Incidents")
-                .content(incidentJson)
-                .contentType("application/json")
-                .accept("application/json"))
-                .andExpect(status().isCreated())
-                .andExpect(jsonPath("$").isMap())
-                .andExpect(jsonPath("$.title").value("Urgent attention required!"))
-                .andExpect(jsonPath("$.status_code").value("N"))
-                .andExpect(jsonPath("$.urgency_code").value("H"));
-    }
+     @Test
+     @WithMockUser(username = "alice")
+     void draftIncident() throws Exception {
+         String incidentCreateJson = "{ \"title\": \"Urgent attention required!\", \"status_code\": \"N\",\"urgency_code\": \"M\"}";
+
+                /**
+                  * Create a draft Incident
+                  */
+
+                MvcResult createResult=  mockMvc.perform(MockMvcRequestBuilders.post("/odata/v4/ProcessorService/Incidents")
+                 .content(incidentCreateJson)
+                 .contentType("application/json")
+                 .accept("application/json"))
+                 .andExpect(status().isCreated())
+                 .andExpect(jsonPath("$.title").value("Urgent attention required!"))
+                 .andExpect(jsonPath("$.status_code").value("N"))
+                 .andExpect(jsonPath("$.urgency_code").value("M"))
+                 .andReturn();
+ 
+                 String createResponseContent = createResult.getResponse().getContentAsString();
+                 String ID = JsonPath.read(createResponseContent, "$.ID");
+                 System.out.println("Incident ID : " + ID);
+         
+                 /**
+                  * Activating the draft Incident
+                  */
+
+                 mockMvc.perform(MockMvcRequestBuilders.post("/odata/v4/ProcessorService/Incidents(ID="+ID+",IsActiveEntity=false)/ProcessorService.draftActivate")
+                 .contentType("application/json")
+                 .accept("application/json"))
+                 .andExpect(status().isOk())
+                 .andExpect(jsonPath("$").isMap())
+                 .andExpect(jsonPath("$.title").value("Urgent attention required!"))
+                 .andExpect(jsonPath("$.status_code").value("N"))
+                 .andExpect(jsonPath("$.urgency_code").value("H"));  
+
+                /**
+                 * Deleting an Incident
+                 */
+
+                 mockMvc.perform(MockMvcRequestBuilders.delete("/odata/v4/ProcessorService/Incidents(ID="+ID+",IsActiveEntity=true)"))
+                 .andExpect(status().is(204));
+     }
+
 
     /**
-     * Test for creating an Incident
-     * Test for closing the Incident
+     * Test for creating an Active Incident
+     * Test for closing the Active Incident
      * Test for custom handler ensuing prevent users from modifying a closed Incident
      */