Test Rule Page Back-end Status- Entry Point (#143)

saif-ericsson · web-flow · commit 923d05847fd8 · 2018-08-15T10:27:21.000+02:00
* JMESPath REST API * JMESPath API with fixed reviews * partial work jmespath rest * JMESPath API with RAML 0.8 specification * remove componet comment * replace tab with spaces * fix usage examples * prepare for new asserts in flow test * fix unit tests * Subscription for individual events * pom file * subscription individual objects * pom * error removal * Subscription Individual Object * deleting unused import * jmespath comment correction * space removal and new clean build * review changes * review change file deleted * review change * review changes * log.info to log.error * required changes * raml * raml files * resolving conflict * self generated code raml * controllers auto generated * auto generated * removing ttl * adding ttl * copied pom * changes in app.properties * resolving conflict with upstream * adding more files * added time lapse variable * rebased... * new clone and update * reviewed changes * review changes-evasiba * review changes 2:evasiba * handling of authorization by Subscription REST API: 9584 * changing property name * pom updated * method change * reviewed changes-1 * some review changes regarding comments * some changes ´to get pass throguh tests * review changes * Update application.properties * Fix test * development * changes * code changes related to story 9561 * error * error removal * requested changes * reviewed change * reviewed changes * added random port in FunctionalTestBase * Add threading and waitlist tests - Still in progress * working code * changing test resources from location to properties * some changes in time units * Update ThreadingAndWaitlistRepeatSteps.java * Update ThreadingAndWaitlistRepeatSteps.java * Update ThreadingAndWaitlistRepeatSteps.java * timing related changes * reviewed changes * reviewed change * refactored functionaltest base class * reviewed changes * reviewed changes * reviewed changes:removing fields * resolving conflict due to latest commit * Test Rule Page Enabling: entry point and junit test * rebase from ericsson master (#3) rebase from ericsson master * temporary file to record log * reviewed changes * reviewed changes: test for each of default, true and false cases * test rule page: functional test added
diff --git a/src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java b/src/functionaltests/java/com/ericsson/ei/rules/RuleCheckSteps.java
@@ -104,5 +104,20 @@ public void get_content(String contentFileName) throws Throwable {
             assertEquals(expectedObject, responseObject, true);
         }
     }
+    
+    @Then("^get request from REST API \"([^\"]*)\" return response code of (\\d+) and status as \"([^\"]*)\"$")
+    public void get_request_from_REST_API_return_response_code_of_and_status_as(String endpoint, int statusCode, String status) throws Throwable {
+        String responseBody = new JSONObject().put("status", Boolean.valueOf(status)).toString();
+        HttpRequest getRequest = new HttpRequest(HttpMethod.GET);
+        ResponseEntity<String> apiResponse = getRequest.setPort(applicationPort)
+                .setHost(hostName)
+                .setHeaders("content-type", "application/json")
+                .setHeaders("Accept", "application/json")
+                .setEndpoint(endpoint)
+                .performRequest();
+        
+        assertEquals(statusCode, apiResponse.getStatusCodeValue());
+        assertEquals(responseBody, apiResponse.getBody());
+    }
 
 }
diff --git a/src/functionaltests/java/com/ericsson/ei/threadingAndWaitlistRepeat/ThreadingAndWaitlistRepeatSteps.java b/src/functionaltests/java/com/ericsson/ei/threadingAndWaitlistRepeat/ThreadingAndWaitlistRepeatSteps.java
@@ -32,7 +32,7 @@
 @Ignore
 public class ThreadingAndWaitlistRepeatSteps extends FunctionalTestBase {
 
-    private static final String LOGFILE = "src/functionaltests/resources/logfile.txt";
+    private File tempLogFile;
     private static final String EIFFEL_EVENTS_JSON_PATH = "src/functionaltests/resources/eiffel_events_for_thread_testing.json";
 
     @Value("${threads.corePoolSize}")
@@ -46,14 +46,9 @@ public class ThreadingAndWaitlistRepeatSteps extends FunctionalTestBase {
 
     @Before("@ThreadingAndWaitlistRepeatScenario")
     public void beforeScenario() throws IOException {
-        File logfile = new File(LOGFILE);
-        logfile.createNewFile();
-        System.setOut(new PrintStream(logfile));
-    }
-
-    @After("@ThreadingAndWaitlistRepeatScenario")
-    public void afterScenario() throws IOException {
-        Files.deleteIfExists(Paths.get(LOGFILE));
+        tempLogFile = File.createTempFile("logfile", ".tmp");
+        tempLogFile.deleteOnExit(); 
+        System.setOut(new PrintStream(tempLogFile));
     }
 
     @Given("^that eiffel events are sent$")
@@ -75,11 +70,11 @@ public void no_event_is_aggregated() throws Throwable {
         assertEquals("aggregatedObjectExists was true, should be false, ", false, aggregatedObjectExists);
     }
 
-    @Then("^the waitlist will try to resent the events at given time interval$")
-    public void the_waitlist_will_try_to_resent_the_events_at_given_time_interval() throws Throwable {
+    @Then("^the waitlist will try to resend the events at given time interval$")
+    public void the_waitlist_will_try_to_resend_the_events_at_given_time_interval() throws Throwable {
         TimeUnit.SECONDS.sleep(5);
-        List<String> resentEvents = new ArrayList<String>();
-        List<String> lines = new ArrayList<String>(Files.readAllLines(Paths.get(LOGFILE)));
+        List<String> resentEvents = new ArrayList<>();
+        List<String> lines = new ArrayList<>(Files.readAllLines(tempLogFile.toPath()));
 
         for (String line : lines) {
             Pattern pattern = Pattern.compile("\\[EIFFEL EVENT RESENT\\] id:([a-zA-Z\\d-]+)");
diff --git a/src/functionaltests/resources/features/ruleCheck.feature b/src/functionaltests/resources/features/ruleCheck.feature
@@ -46,4 +46,12 @@ Feature: Test Rules Checker
     Given rules checking is not enabled
     And file with JMESPath rules "/AggregateListRules.json" and file with events "/AggregateListEvents.json"
     When make a POST request to the REST API "/rules/rule-check/aggregation"
-    Then get response code of 503
+    Then get response code of 503
+    
+  #@tag5
+  Scenario: Check status of test rule page using REST API
+    When rules checking is enabled
+    Then get request from REST API "/rules/rule-check/testRulePageEnabled" return response code of 200 and status as "true"
+    When rules checking is not enabled
+    Then get request from REST API "/rules/rule-check/testRulePageEnabled" return response code of 200 and status as "false"    
+      
diff --git a/src/functionaltests/resources/features/threadingAndWaitlistRepeat.feature b/src/functionaltests/resources/features/threadingAndWaitlistRepeat.feature
@@ -24,6 +24,6 @@ Feature: Subscription trigger test
   	Given that eiffel events are sent  	
 	Then waitlist should not be empty
 	And no event is aggregated
-	And the waitlist will try to resent the events at given time interval
+	And the waitlist will try to resend the events at given time interval
 	And correct amount of threads should be spawned
 	And after the time to live has ended, the waitlist should be empty
diff --git a/src/main/java/com/ericsson/ei/controller/RuleCheckController.java b/src/main/java/com/ericsson/ei/controller/RuleCheckController.java
@@ -42,4 +42,11 @@ public ResponseEntity<?> updateAggregation(
         @RequestBody
         RuleCheckBody ruleCheckBody);
 
+    /**
+     * This call for the current status of test rule entry point, we get status as output
+     * 
+     */
+    @RequestMapping(value = "/testRulePageEnabled", method = RequestMethod.GET)
+    public ResponseEntity<?> getTestRulePageEnabled();
+
 }
diff --git a/src/main/java/com/ericsson/ei/controller/RuleCheckControllerImpl.java b/src/main/java/com/ericsson/ei/controller/RuleCheckControllerImpl.java
@@ -17,13 +17,17 @@
 package com.ericsson.ei.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
 
 import com.ericsson.ei.controller.model.RuleCheckBody;
+import com.ericsson.ei.exception.SubscriptionNotFoundException;
 import com.ericsson.ei.jmespath.JmesPathInterface;
 import com.ericsson.ei.services.IRuleCheckService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.Setter;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -68,17 +72,17 @@ public class RuleCheckControllerImpl implements RuleCheckController {
 
     @Autowired
     private IRuleCheckService ruleCheckService;
-
+    
+    @Setter
     @Value("${testaggregated.enabled:false}")
     private Boolean testEnable;
 
     /**
-     * This method interacts with JmesPathInterface class method runRuleOnEvent
-     * to evaluate a rule on JSON object.
+     * This method interacts with JmesPathInterface class method runRuleOnEvent to
+     * evaluate a rule on JSON object.
      * 
      * @param rule-
-     *            takes a String as a rule that need to be evaluated on JSON
-     *            content
+     *            takes a String as a rule that need to be evaluated on JSON content
      * @param jsonContent-
      *            takes JSON object as a String
      * @return a String object
@@ -87,8 +91,9 @@ public class RuleCheckControllerImpl implements RuleCheckController {
     @Override
     @CrossOrigin
     @ApiOperation(value = "To execute rule on JSON", response = String.class)
-    public ResponseEntity<?> updateRulesRuleCheck(@ApiParam(value = "JMESPath rule", required = true) @RequestParam String rule,
-                                                  @ApiParam(value = "JSON object", required = true) @RequestBody String jsonContent) {
+    public ResponseEntity<?> updateRulesRuleCheck(
+            @ApiParam(value = "JMESPath rule", required = true) @RequestParam String rule,
+            @ApiParam(value = "JSON object", required = true) @RequestBody String jsonContent) {
         try {
             JSONObject jsonObj = new JSONObject(jsonContent);
             String res = jmesPathInterface.runRuleOnEvent(rule, jsonObj.toString()).toString();
@@ -104,11 +109,12 @@ public ResponseEntity<?> updateRulesRuleCheck(@ApiParam(value = "JMESPath rule",
     @Override
     @CrossOrigin
     @ApiOperation(value = "To execute the list of rules on list of Eiffel events. Return the aggregated object(s)", response = String.class)
-    public ResponseEntity<?> updateAggregation(@ApiParam(value = "Object that include list of rules and list of Eiffel events", required = true)
-                                                   @RequestBody RuleCheckBody body) {
+    public ResponseEntity<?> updateAggregation(
+            @ApiParam(value = "Object that include list of rules and list of Eiffel events", required = true) @RequestBody RuleCheckBody body) {
         if (testEnable) {
             try {
-                String aggregatedObject = ruleCheckService.prepareAggregatedObject(new JSONArray(body.getListRulesJson()), new JSONArray(body.getListEventsJson()));
+                String aggregatedObject = ruleCheckService.prepareAggregatedObject(
+                        new JSONArray(body.getListRulesJson()), new JSONArray(body.getListEventsJson()));
                 if (aggregatedObject != null && !aggregatedObject.equals("[]")) {
                     return new ResponseEntity<>(aggregatedObject, HttpStatus.OK);
                 } else {
@@ -123,11 +129,24 @@ public ResponseEntity<?> updateAggregation(@ApiParam(value = "Object that includ
             }
         } else {
             String errorMessage = "Test Rules functionality is disabled in backend server. "
-                + "Configure \"testaggregated.controller.enabled\" setting in backend servers properties "
-                + "to enable this functionality. This should normally only be enabled in backend test servers.";
+                    + "Configure \"testaggregated.controller.enabled\" setting in backend servers properties "
+                    + "to enable this functionality. This should normally only be enabled in backend test servers.";
             LOGGER.error(errorMessage);
             return new ResponseEntity<>(errorMessage, HttpStatus.SERVICE_UNAVAILABLE);
         }
     }
 
+    @Override
+    @CrossOrigin
+    @ApiOperation(value = "To get Rules Check Srvice enabled status", response = String.class)
+    public ResponseEntity<?> getTestRulePageEnabled() {
+        LOGGER.debug("Getting Enabling Status of Rules Check Service");
+        try {
+            return new ResponseEntity<>(new JSONObject().put("status", testEnable).toString(), HttpStatus.OK);
+        } catch (Exception e) {
+            String errorMessage = "Failed to get Status. Error message:\n" + e.getMessage();
+            LOGGER.error(errorMessage, e);
+            return new ResponseEntity<>(errorMessage, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
 }
diff --git a/src/main/resources/public/raml/rules.raml b/src/main/resources/public/raml/rules.raml
@@ -35,4 +35,14 @@
           responses:
             200:
               body:
-                application/string:
+                application/string:
+           
+      /testRulePageEnabled:
+        get:
+          description: This call for the current status of test rule entry point, we get status as output
+          displayName: findTestRuleServiceStatus
+          responses:
+            200:
+              body:
+                application/string:
+                   example: "status: false"
diff --git a/src/test/java/com/ericsson/ei/rules/test/TestRulesRestAPI.java b/src/test/java/com/ericsson/ei/rules/test/TestRulesRestAPI.java
@@ -17,6 +17,8 @@
 package com.ericsson.ei.rules.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.File;
 
@@ -37,6 +39,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
@@ -45,13 +48,12 @@
 import org.springframework.util.SocketUtils;
 
 import com.ericsson.ei.App;
+import com.ericsson.ei.controller.RuleCheckControllerImpl;
 import com.ericsson.ei.services.IRuleCheckService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {
-        App.class, 
-        EmbeddedMongoAutoConfiguration.class // <--- Don't forget THIS
-    })
+@SpringBootTest(classes = { App.class, EmbeddedMongoAutoConfiguration.class // <--- Don't forget THIS
+})
 @AutoConfigureMockMvc
 public class TestRulesRestAPI {
 
@@ -70,7 +72,7 @@ public class TestRulesRestAPI {
 
     @Value("${testaggregated.enabled:false}")
     private Boolean testEnable;
-    
+
     @BeforeClass
     public static void init() {
         int port = SocketUtils.findAvailableTcpPort();
@@ -113,8 +115,10 @@ public void testAggregationRestApi() throws Exception {
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
         }
-        String body = "{\"listRulesJson\":" + extractionRules_test.toString() + ",\"listEventsJson\":" + jsonInput.toString() + "}";
-        Mockito.when(ruleCheckService.prepareAggregatedObject(Mockito.any(JSONArray.class), Mockito.any(JSONArray.class)))
+        String body = "{\"listRulesJson\":" + extractionRules_test.toString() + ",\"listEventsJson\":"
+                + jsonInput.toString() + "}";
+        Mockito.when(
+                ruleCheckService.prepareAggregatedObject(Mockito.any(JSONArray.class), Mockito.any(JSONArray.class)))
                 .thenReturn(aggregatedResult);
         RequestBuilder requestBuilder = MockMvcRequestBuilders.post("/rules/rule-check/aggregation")
                 .accept(MediaType.ALL).content(body).contentType(MediaType.APPLICATION_JSON);
@@ -127,7 +131,34 @@ public void testAggregationRestApi() throws Exception {
         } else {
             assertEquals(HttpStatus.SERVICE_UNAVAILABLE.value(), result.getResponse().getStatus());
         }
+    }
 
+    @Test
+    public void testGetTestRulePageEnabledAPI_setPropertyDefult() throws Exception {
+        String responseBody = new JSONObject().put("status", false).toString();
+        mockMvc.perform(MockMvcRequestBuilders.get("/rules/rule-check/testRulePageEnabled")
+                .accept(MediaType.APPLICATION_JSON_VALUE)).andExpect(status().isOk())
+                .andExpect(content().string(responseBody)).andReturn();
     }
 
+    @Test
+    public void testGetTestRulePageEnabledAPI_setPropertyTrue() throws Exception {
+        String responseBody = new JSONObject().put("status", true).toString();
+        RuleCheckControllerImpl ruleCheckControllerImpl = new RuleCheckControllerImpl();
+        ruleCheckControllerImpl.setTestEnable(true);
+        ResponseEntity<?> responseEntity = ruleCheckControllerImpl.getTestRulePageEnabled();
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        assertEquals(responseBody, responseEntity.getBody().toString());
+
+    }
+
+    @Test
+    public void testGetTestRulePageEnabledAPI_setPropertyFalse() throws Exception {
+        String responseBody = new JSONObject().put("status", false).toString();
+        RuleCheckControllerImpl ruleCheckControllerImpl = new RuleCheckControllerImpl();
+        ruleCheckControllerImpl.setTestEnable(false);
+        ResponseEntity<?> responseEntity = ruleCheckControllerImpl.getTestRulePageEnabled();
+        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
+        assertEquals(responseBody, responseEntity.getBody().toString());
+    }
 }
