EdgeRules throws descriptive error on invalid rule

[aai/aai-common.git] / aai-core / src / test / java / org / openecomp / aai / exceptions / AAIExceptionWithInfoTest.java

diff --git a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java
index 03de45d..41841ac 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java
@@ -5,28 +5,29 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * ============LICENSE_END=========================================================
  */
 
 package org.openecomp.aai.exceptions;
 
 import org.junit.Test;
+import org.openecomp.aai.AAISetup;
 
 import java.util.HashMap;
 
 import static org.junit.Assert.assertEquals;
 
-public class AAIExceptionWithInfoTest {
+public class AAIExceptionWithInfoTest extends AAISetup {
 
        
        private static final HashMap<String, Object> map = new HashMap<String, Object>();
@@ -38,7 +39,7 @@ public class AAIExceptionWithInfoTest {
        }
 
        private static final String info = "An error has occurred.";
-       private static final String code = "4004";
+       private static final String code = "AAI_4004";
        private static final String details = "This is a detailed description of the exception.";
        private static final Throwable cause = new RuntimeException("This is a runtime exception.");
 
@@ -64,7 +65,7 @@ public class AAIExceptionWithInfoTest {
        public void testConstructorWith3Params() throws Exception {
                AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, map, info);
 
-               assertEquals(code, exception.getErrorObject().getErrorCode());
+               assertEquals("4004", exception.getErrorObject().getErrorCode());
                assertEquals(map, exception.getInfoHash());
                assertEquals(info, exception.getInfo());
        }
@@ -78,7 +79,7 @@ public class AAIExceptionWithInfoTest {
        public void testConstructorWith4ParamsI() throws Exception {
                AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, details, map, info);
 
-               assertEquals(code, exception.getErrorObject().getErrorCode());
+               assertEquals("4004", exception.getErrorObject().getErrorCode());
                assertEquals(details, exception.getMessage());
                assertEquals(map, exception.getInfoHash());
                assertEquals(info, exception.getInfo());
@@ -93,8 +94,8 @@ public class AAIExceptionWithInfoTest {
        public void testConstructorWith4ParamsII() throws Exception {
                AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, map, info);
 
-               assertEquals(code, exception.getErrorObject().getErrorCode());
-               assertEquals(cause.getMessage(), exception.getMessage());
+               assertEquals("4004", exception.getErrorObject().getErrorCode());
+               assertEquals(cause.toString(), exception.getMessage());
                assertEquals(map, exception.getInfoHash());
                assertEquals(info, exception.getInfo());
        }
@@ -108,8 +109,8 @@ public class AAIExceptionWithInfoTest {
        public void testConstructorWith5Params() throws Exception {
                AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, details, map, info);
 
-               assertEquals(code, exception.getErrorObject().getErrorCode());
-               assertEquals(cause.getMessage() + "-" + details, exception.getMessage());
+               assertEquals("4004", exception.getErrorObject().getErrorCode());
+               assertEquals(details, exception.getMessage());
                assertEquals(map, exception.getInfoHash());
                assertEquals(info, exception.getInfo());
        }