Fix tests in EI front-end (#262)

* Fix tests in EI front-end
* Update query missed notification test

Author: Anders Breid

src/functionaltest/java/com/ericsson/ei/frontend/SeleniumBaseClass.java

@@ -73,7 +73,7 @@ public void tearDown() throws Exception {
     protected void initBaseMocks(CloseableHttpClient mockedHttpClient) throws ClientProtocolException, IOException {
         CloseableHttpResponse responseData = createMockedHTTPResponse("\"\":\"\"", 200);
         Mockito.doReturn(responseData).when(mockedHttpClient)
-                .execute(Mockito.argThat(request -> (request).getURI().toString().contains("/auth/checkStatus")));
+                .execute(Mockito.argThat(request -> (request).getURI().toString().contains("/status")));
 
         Mockito.doReturn(responseData).when(mockedHttpClient)
                 .execute(Mockito.argThat(request -> (request).getURI().toString().contains("/auth")));

src/functionaltest/java/com/ericsson/ei/frontend/TestRulesFunctionality.java

@@ -76,7 +76,7 @@ public void testJourneyToFindAggregatedObjectButton() throws Exception {
     public static void setUpMocks() throws IOException {
         mockServer = startClientAndServer();
         mockClient = new MockServerClient(BASE_URL, mockServer.getLocalPort());
-        mockClient.when(request().withMethod("GET").withPath("/auth/checkStatus"))
+        mockClient.when(request().withMethod("GET").withPath("/status"))
             .respond(response().withStatusCode(200));
     }
 

src/functionaltest/java/com/ericsson/ei/frontend/TestSubscriptionHandling.java

@@ -330,8 +330,8 @@ private void setupMockEndpoints(boolean security, String user) throws IOExceptio
         clientAndServer.when(request().withMethod("GET").withPath("/subscriptions/Subscription1"))
                        .respond(response().withStatusCode(200).withBody(subscriptionResponse2));
 
-        String responseStatus = "{\"status\":\"OK\"}";
-        clientAndServer.when(request().withMethod("GET").withPath("/auth/checkStatus"))
+        String responseStatus = "{\"eiffelIntelligenceStatus\" : \"AVAILABLE\"}";
+        clientAndServer.when(request().withMethod("GET").withPath("/status"))
                        .respond(response().withStatusCode(200).withBody(responseStatus));
 
         String mockedTemplateResponse = getJSONStringFromFile(SUBSCRIPTION_TEMPLATE_FILE_PATH);

src/functionaltest/java/com/ericsson/ei/frontend/TestSwitchBackend.java

@@ -127,7 +127,7 @@ private void addBackendInstances() {
     }
 
     private static void setupMockEndpoints() throws IOException {
-        mockClient2.when(request().withMethod("GET").withPath("/auth/checkStatus")).respond(response().withStatusCode(200).withBody(""));
+        mockClient2.when(request().withMethod("GET").withPath("/status")).respond(response().withStatusCode(200).withBody("{\"eiffelIntelligenceStatus\" : \"AVAILABLE\"}"));
 
         mockClient2.when(request().withMethod("GET").withPath("/auth")).respond(response().withStatusCode(200).withBody("{\"security\":false}"));
 
@@ -139,7 +139,7 @@ private static void setupMockEndpoints() throws IOException {
         mockClient1.when(request().withMethod("GET").withPath("/subscriptions"))
                 .respond(response().withStatusCode(200).withBody(defaultInstanceSubscriptionResponse));
 
-        mockClient1.when(request().withMethod("GET").withPath("/auth/checkStatus")).respond(response().withStatusCode(200).withBody(""));
+        mockClient1.when(request().withMethod("GET").withPath("/status")).respond(response().withStatusCode(200).withBody("{\"eiffelIntelligenceStatus\" : \"AVAILABLE\"}"));
 
         mockClient1.when(request().withMethod("GET").withPath("/auth")).respond(response().withStatusCode(200).withBody("{\"security\":false}"));
     }

src/integrationtest/java/com/ericsson/ei/frontend/StatusRunnerIT.java

@@ -0,0 +1,14 @@
+package com.ericsson.ei.frontend;
+
+import org.junit.runner.RunWith;
+
+import cucumber.api.CucumberOptions;
+import cucumber.api.junit.Cucumber;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(features = "src/integrationtest/resources/features/status.feature", glue = {
+        "com.ericsson.ei.frontend" }, plugin = {
+                "html:target/cucumber-reports/StatusRunnerIT" })
+public class StatusRunnerIT {
+
+}

src/integrationtest/resources/features/auth.feature

@@ -9,15 +9,6 @@ Feature: Authentication test
     Then response code 200 is received
     And response body '{"security":true}' is received
 
-  @AuthCheckStatusScenario
-  Scenario: Check status test
-    Given frontend is up and running
-    When a 'GET' request is prepared for REST API '/auth/checkStatus'
-    And username "gauss" and password "password" is used as credentials
-    And request is sent
-    Then response code 200 is received
-    And response body 'Backend server is up and running' is received
-
   @AuthMultipleUsersLoginAndLogoutScenario
   Scenario: Multiple Users Login And Logout test
     Given frontend is up and running
@@ -75,13 +66,13 @@ Feature: Authentication test
     Given frontend is up and running
 
     # Invalid Username
-    When a 'GET' request is prepared for REST API '/auth/checkStatus'
+    When a 'GET' request is prepared for REST API '/auth/login'
     And username "invalid_username" and password "password" is used as credentials
     And request is sent
     Then response code 401 is received
 
     # Invalid Password
-    When a 'GET' request is prepared for REST API '/auth/checkStatus'
+    When a 'GET' request is prepared for REST API '/auth/login'
     And username "gauss" and password "invalid_password" is used as credentials
     And request is sent
     Then response code 401 is received

src/integrationtest/resources/features/query.feature

@@ -5,7 +5,7 @@ Feature: Query test
   Scenario: Query missed notifications
     Given frontend is up and running
     When a 'GET' request is prepared for REST API '/queryMissedNotifications'
-    And param key 'SubscriptionName' with value 'NonExistingSubscription' is added
+    And param key 'subscriptionName' with value 'NonExistingSubscription' is added
     And request is sent
     Then response code 200 is received
     And response body '{"queryResponseEntity":{}}' is received

src/integrationtest/resources/features/status.feature

@@ -0,0 +1,13 @@
+@StatusFeature
+Feature: Status test
+
+  @StatusScenario
+  Scenario: Check status test
+    Given frontend is up and running
+    When a 'GET' request is prepared for REST API '/status'
+    And request is sent
+    Then response code 200 is received
+    And response body contains '"eiffelIntelligenceStatus" : "AVAILABLE"'
+    And response body contains '"rabbitMQStatus" : "AVAILABLE"'
+    And response body contains '"mongoDBStatus" : "AVAILABLE"'
+