ensure data for si matches on macro requests

Fixed failing ValidationExceptionTest
Moved MacroRequest.json to test specific folder
Moved resource files to test specific folder
Cleaned up comments from UserParamsValidationTest
Refactored modelInfoValidation method
Removed unused constants from ValidationException
Removed unused ValidationException
ADded overrideExistingMessage boolean
Added test for missing modelType in userParams service object
Fixed failing JUnit tests in MsoRequestTest
Started fixing failing JUnit tests
Began adding validation and tests for userParams modelInfo
Began adding validation for instanceName

Change-Id: I442f6b660af4e716d75746f8d8155aac1e183e80
Issue-ID: SO-1405
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java b/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java
index b3ae7ba9f5..27fb584b3b 100644
--- a/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java
+++ b/common/src/test/java/org/onap/so/exceptions/ValidationExceptionTest.java
@@ -47,7 +47,7 @@ public class ValidationExceptionTest {
 
     @Test
     public void validationExceptionVersion(){
-        ValidationException e = new ValidationException("testMessage", "1.0");
-        Assert.assertEquals("testMessage is not valid in the 1.0 version", e.getMessage());
+        ValidationException e = new ValidationException("testMessage", "secondTestMessage");
+        Assert.assertEquals("testMessage does not match secondTestMessage", e.getMessage());
     }
 }