diff options
| author |   Brinda Santh <bs2796@att.com> | 2019-11-18 11:38:54 -0500 |
|---|---|---|
| committer | Brinda Santh <bs2796@att.com> | 2019-11-18 11:38:54 -0500 |
| commit | 0ff4184e485c31a3a1faa54f6172710bea86c286 (patch) | |
| tree | 93923e710e0c9e8924dee5c9dc93ef8d036dacf8 /ms/blueprintsprocessor/functions/message-prioritizaion/src | |
| parent | 1dd0c293d8a076d0c2cabced73572f15790e8736 (diff) | |
Fix Message Prioritization merge conflicts
Issue-ID: CCSDK-1917
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I92cdca04036c23c212b7b333ca14455eef20555c
Diffstat (limited to 'ms/blueprintsprocessor/functions/message-prioritizaion/src')
| -rw-r--r-- | ms/blueprintsprocessor/functions/message-prioritizaion/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/functions/message-prioritizaion/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt b/ms/blueprintsprocessor/functions/message-prioritizaion/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt index bd99f72d0..84f13dc1d 100644 --- a/ms/blueprintsprocessor/functions/message-prioritizaion/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt +++ b/ms/blueprintsprocessor/functions/message-prioritizaion/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt @@ -24,8 +24,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.runner.RunWith -import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintProperties -import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertyConfiguration +import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService +import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertyConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.functions.message.prioritization.db.PrioritizationMessageRepository import org.onap.ccsdk.cds.blueprintsprocessor.functions.message.prioritization.service.MessagePrioritizationStateService import org.onap.ccsdk.cds.blueprintsprocessor.functions.message.prioritization.utils.MessagePrioritizationSample @@ -49,7 +49,7 @@ import kotlin.test.assertNotNull @DataJpaTest @DirtiesContext @ContextConfiguration(classes = [BluePrintMessageLibConfiguration::class, - BlueprintPropertyConfiguration::class, BluePrintProperties::class, + BluePrintPropertyConfiguration::class, BluePrintPropertiesService::class, MessagePrioritizationConfiguration::class, TestDatabaseConfiguration::class]) @TestPropertySource(properties = [ |