diff options
Diffstat (limited to 'model/policy-model/src/test/java/org/onap/policy')
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java index f148f7d2a..0a1e80a20 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java @@ -44,26 +44,26 @@ public class PolicyModelComparerTest { String resultString = policyModelComparer.asString(false, false); String checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt"); - assertEquals(resultString.trim().replaceAll("[\\r?\\n]+", " "), - checkString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(resultString.trim().replaceAll("\\s+", ""), + checkString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(false, true); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(true, false); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(true, true); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); final AxKeyInfo leftOnlyKeyInfo = new AxKeyInfo(new AxArtifactKey("LeftOnlyKeyInfo", "0.0.1"), UUID.fromString("ce9168c-e6df-414f-9646-6da464b6f000"), "Left only key info"); @@ -83,26 +83,26 @@ public class PolicyModelComparerTest { resultString = policyModelComparer.asString(false, false); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt"); - assertEquals(resultString.trim().replaceAll("[\\r?\\n]+", " "), - checkString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(resultString.trim().replaceAll("\\s+", ""), + checkString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(false, true); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(true, false); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); resultString = policyModelComparer.asString(true, true); checkString = TextFileUtils .getTextFileAsString("src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt"); - assertEquals(checkString.trim().replaceAll("[\\r?\\n]+", " "), - resultString.trim().replaceAll("[\\r?\\n]+", " ")); + assertEquals(checkString.trim().replaceAll("\\s+", ""), + resultString.trim().replaceAll("\\s+", "")); assertNotNull(policyModelComparer.getContextAlbumComparisonResult()); assertNotNull(policyModelComparer.getContextAlbumKeyDifference()); |