From 09a41f5bfa6008ce545f8745306145ad9264103b Mon Sep 17 00:00:00 2001
From: Gautam Shah <gautams@amdocs.com>
Date: Wed, 11 Apr 2018 19:55:29 +0530
Subject: Reducing onboarding backend maven build time

Reducing onboarding backend maven build time

Change-Id: Iab7af70c0e9f60b8a50bef7937e802df5be89fd0
Issue-ID: SDC-1189
Signed-off-by: GAUTAMS <gautams@amdocs.com>
---
 .../openecomp-sdc-validation-core/pom.xml                         | 1 +
 .../openecomp-sdc-validation-sdk/pom.xml                          | 2 +-
 .../org/openecomp/sdc/validation/util/ValidationTestUtil.java     | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-validation-lib')

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
index 01fce0153d..cedb850165 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml
@@ -80,6 +80,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testng.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
index fe342f58b2..ad49dac2f6 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/pom.xml
@@ -23,7 +23,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testng.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java
index 068e147874..13f2d638d2 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/util/ValidationTestUtil.java
@@ -21,7 +21,7 @@ import org.openecomp.sdc.validation.ResourceValidator;
 import org.openecomp.sdc.validation.ValidationContext;
 import org.openecomp.sdc.validation.Validator;
 import org.openecomp.sdc.validation.base.ResourceBaseValidator;
-import org.testng.Assert;
+
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -169,9 +169,11 @@ public class ValidationTestUtil {
   }
 
   public static void validateErrorMessage(String actualMessage, String expected, String... params) {
-    Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""),
+    if (!Objects.equals(actualMessage.replace("\n", "").replace("\r", ""),
         ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "")
-            .replace("\r", ""));
+            .replace("\r", ""))){
+      throw new RuntimeException("validation failed");
+    }
 
   }
 
-- 
cgit 1.2.3-korg