From: Singal, Kapil (ks220y) <ks220y@att.com>
Date: Fri, 27 Sep 2019 16:28:49 +0000 (-0400)
Subject: ResourceAssignmentUtils Junit Fixes
X-Git-Tag: 0.7.0~205
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F96342%2F1;p=ccsdk%2Fcds.git

ResourceAssignmentUtils Junit Fixes

Fixing Junit which are failing in Windows due to carriage return type

Issue-ID: CCSDK-1763
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I83ba91608683963b839bf5bd3afb8509ef947e11
---

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt
index 728e1165a..d7a696848 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt
@@ -131,7 +131,7 @@ class ResourceAssignmentUtilsTest {
 
         //then the assignment should produce a valid result
         val expected = "{\n" + "  \"pnf-id\" : \"valid_value\"\n" + "}"
-        assertEquals(expected, outcome, "unexpected outcome generated")
+        assertEquals(expected, outcome.replace("\r\n","\n"), "unexpected outcome generated")
     }
 
     @Test
@@ -147,7 +147,7 @@ class ResourceAssignmentUtilsTest {
 
         //then the assignment should produce a valid result
         val expected = "{\n" + "  \"pnf-id\" : \"\${pnf-id}\"\n" + "}"
-        assertEquals(expected, outcome, "unexpected outcome generated")
+        assertEquals(expected, outcome.replace("\r\n","\n"), "unexpected outcome generated")
 
     }