diff options
| author |   PawelSzalapski <pawel.szalapski@nokia.com> | 2018-08-08 11:01:03 +0200 |
|---|---|---|
| committer | PawelSzalapski <pawel.szalapski@nokia.com> | 2018-08-10 14:21:34 +0200 |
| commit | e1ccd83e39090f16a446b23e154b8e28530e2fdd (patch) | |
| tree | c38f54e6690f58438cb5e66fed2f6aad177b4bfc /src/test/java/org/onap/dcae/commonFunction | |
| parent | 5deddeb4892243627ad342a41d4dcef0f7280a29 (diff) | |
Refactor the code base a bit
Remove potential race condition coming from
shared 'version' veriable in singleton instance of
RestController.
Move the logic behind reading the json schemas out
of a on-request phase to application startup.
Minor refactoring done that will bump up test coverage.
Change-Id: I2ad1ba91dafafd785ede61591a4dc146abf6a1eb
Signed-off-by: PawelSzalapski <pawel.szalapski@nokia.com>
Issue-ID: DCAEGEN2-526
Diffstat (limited to 'src/test/java/org/onap/dcae/commonFunction')
| -rw-r--r-- | src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java index f5c5d5f9..97dccb5b 100644 --- a/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java +++ b/src/test/java/org/onap/dcae/commonFunction/EventProcessorTest.java @@ -29,7 +29,6 @@ import org.mockito.ArgumentCaptor; import org.onap.dcae.ApplicationSettings; import org.onap.dcae.CLIUtils; import org.onap.dcae.commonFunction.event.publishing.EventPublisher; -import org.onap.dcae.vestest.TestingUtilities; import java.util.List; @@ -43,12 +42,11 @@ public class EventProcessorTest { private final String ev = "{\"event\": {\"commonEventHeader\": { \"reportingEntityName\": \"VM name will be provided by ECOMP\", \"startEpochMicrosec\": 1477012779802988,\"lastEpochMicrosec\": 1477012789802988,\"eventId\": \"83\",\"sourceName\": \"Dummy VM name - No Metadata available\",\"sequence\": 83,\"priority\": \"Normal\",\"functionalRole\": \"vFirewall\",\"domain\": \"measurementsForVfScaling\",\"reportingEntityId\": \"VM UUID will be provided by ECOMP\",\"sourceId\": \"Dummy VM UUID - No Metadata available\",\"version\": 1.1},\"measurementsForVfScalingFields\": {\"measurementInterval\": 10,\"measurementsForVfScalingVersion\": 1.1,\"vNicUsageArray\": [{\"multicastPacketsIn\": 0,\"bytesIn\": 3896,\"unicastPacketsIn\": 0, \"multicastPacketsOut\": 0,\"broadcastPacketsOut\": 0, \"packetsOut\": 28,\"bytesOut\": 12178,\"broadcastPacketsIn\": 0,\"packetsIn\": 58,\"unicastPacketsOut\": 0,\"vNicIdentifier\": \"eth0\"}]}}}"; - Map<String, String[]> streamID; + private Map<String, String[]> streamID; private ApplicationSettings properties; @Before public void setUp() { - streamID = TestingUtilities.convertDMaaPStreamsPropertyToMap("fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling"); properties = new ApplicationSettings(new String[]{}, CLIUtils::processCmdLine); streamID = properties.dMaaPStreamsMapping(); } |