EdgeRules throws descriptive error on invalid rule

[aai/aai-common.git] / aai-core / src / test / java / org / openecomp / aai / parsers / uri / URIParserTest.java

diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java
index b413c9d..da863c1 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java
@@ -5,58 +5,46 @@
  * 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.parsers.uri;
 
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.is;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-
-import javax.ws.rs.core.UriBuilder;
-import javax.xml.bind.JAXBException;
-
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
+import org.openecomp.aai.AAISetup;
 import org.openecomp.aai.exceptions.AAIException;
 import org.openecomp.aai.introspection.Loader;
 import org.openecomp.aai.introspection.LoaderFactory;
 import org.openecomp.aai.introspection.ModelType;
 import org.openecomp.aai.introspection.Version;
 
+import javax.ws.rs.core.UriBuilder;
+import javax.xml.bind.JAXBException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
 
-public class URIParserTest {
+public class URIParserTest extends AAISetup {
 
        private Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8);
 
        @Rule
        public ExpectedException thrown = ExpectedException.none();
        
-       /**
-        * Configure.
-        */
-       @BeforeClass
-       public static void configure() {
-               System.setProperty("AJSC_HOME", "./src/test/resources/");
-               System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");
-       }
-       
        /**
         * Invalid path.
         *
@@ -70,7 +58,7 @@ public class URIParserTest {
                URI uri = UriBuilder.fromPath("/aai/" + loader.getVersion() + "/network/tenants/tenant/key1/vservers/vserver/key2/l-interfaces/l-interface/key3").build();
                
                thrown.expect(AAIException.class);
-               thrown.expect(hasProperty("code",  is("AAI_3001")));
+               thrown.expect(hasProperty("code",  is("AAI_3000")));
                
                new URIToDBKey(loader, uri);
        }