Change expected structure of aggregated object in tests (#251)

Change the expected structure of aggregated object in integration tests.

Author: e-pettersson-ericsson

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

@@ -142,7 +142,7 @@ public void aggregation_is_prepared(String rulesFileName, String eventsFileName)
         httpRequest.setBody(body);
     }
 
-    @When("^username \"(\\w+)\" and password \"(\\w+)\" is used as credentials$")
+    @When("^username \"([^\"]*)\" and password \"([^\"]*)\" is used as credentials$")
     public void with_credentials(String username, String password) throws Throwable {
         String auth = username + ":" + password;
         String encodedAuth = new String(Base64.encodeBase64(auth.getBytes()), "UTF-8");

src/integrationtest/resources/bodies/queryFreestyle.json

@@ -1,5 +1,5 @@
 {
   "criteria": {
-    "aggregatedObject.identity": "pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0"
+    "identity": "pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0"
   }
 }

src/integrationtest/resources/integration-test.properties

@@ -55,13 +55,6 @@ spring.data.mongodb.database: eiffel_intelligence
 server.session-timeout: 1200
 sessions.collection.name: sessions
 
-# name of the aggregated object for user to prefix each query criteria
-# This property will be used as a prefix to each criteria of the
-# query. It is replaced dynamically with the name of the object stored, in
-# the data base.
-search.query.prefix: object
-# name of the aggregated object in the collection
-aggregated.object.name: aggregatedObject
 # name of the collection where aggregated objects are stored
 aggregated.collection.name: aggregated_objects
 # time to live value in seconds for aggregated objects.

src/integrationtest/resources/responses/rulesAggregation.json

@@ -1,39 +1,37 @@
 [
     {
         "_id": "df4cdb42-1580-4cff-b97a-4d0faa9b2b22_ARTIFACT_TEST",
-        "aggregatedObject": {
-            "fileInformation": [
-                {
-                    "extension": "war",
-                    "classifier": ""
-                }
-            ],
-            "buildCommand": "trigger",
-            "identity": "pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0",
-            "confidenceLevels": [
-                {
-                    "eventId": "e3be0cf8-2ebd-4d6d-bf5c-a3b535cd084e_ARTIFACT_TEST",
-                    "name": "dummy_1_stable",
-                    "time": 1521452400324,
-                    "value": "SUCCESS"
-                }
-            ],
-            "TemplateName": "ARTIFACT_TEST",
-            "id": "df4cdb42-1580-4cff-b97a-4d0faa9b2b22_ARTIFACT_TEST",
-            "time": 1521452368194,
-            "type": "EiffelArtifactCreatedEvent",
-            "publications": [
-                {
-                    "eventId": "2acd348d-05e6-4945-b441-dc7c1e55534e_ARTIFACT_TEST",
-                    "locations": [
-                        {
-                            "type": "NEXUS",
-                            "uri": "http://localhost:8081/repository/test"
-                        }
-                    ],
-                    "time": 1521452368758
-                }
-            ]
-        }
+        "fileInformation": [
+            {
+                "extension": "war",
+                "classifier": ""
+            }
+        ],
+        "buildCommand": "trigger",
+        "identity": "pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0",
+        "confidenceLevels": [
+            {
+                "eventId": "e3be0cf8-2ebd-4d6d-bf5c-a3b535cd084e_ARTIFACT_TEST",
+                "name": "dummy_1_stable",
+                "time": 1521452400324,
+                "value": "SUCCESS"
+            }
+        ],
+        "TemplateName": "ARTIFACT_TEST",
+        "id": "df4cdb42-1580-4cff-b97a-4d0faa9b2b22_ARTIFACT_TEST",
+        "time": 1521452368194,
+        "type": "EiffelArtifactCreatedEvent",
+        "publications": [
+            {
+                "eventId": "2acd348d-05e6-4945-b441-dc7c1e55534e_ARTIFACT_TEST",
+                "locations": [
+                    {
+                        "type": "NEXUS",
+                        "uri": "http://localhost:8081/repository/test"
+                    }
+                ],
+                "time": 1521452368758
+            }
+        ]
     }
 ]