Update license files, sonar plugin and fix tests

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

diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java
index 5c82e45..52c44c1 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java
@@ -5,16 +5,16 @@
  * 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=========================================================
  */
 
@@ -41,8 +41,7 @@ import org.openecomp.aai.restcore.HttpMethod;
 
 public class URIToExtensionInformationTest {
 
-       private Loader v6Loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8);
-       private Loader v7Loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8);
+       private Loader v8Loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8);
        
        /**
         * Configure.
@@ -62,60 +61,18 @@ public class URIToExtensionInformationTest {
         * @throws UnsupportedEncodingException the unsupported encoding exception
         */
        @Test
-    public void vserversV7() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException {
-               URI uri = UriBuilder.fromPath("/aai/" + v7Loader.getVersion() + "/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/key1/vservers/vserver/key2").build();
-               URIToExtensionInformation parse = new URIToExtensionInformation(v7Loader, uri);
+    public void vserversV8() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException {
+               URI uri = UriBuilder.fromPath("/aai/" + v8Loader.getVersion() + "/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/key1/vservers/vserver/key2").build();
+               URIToExtensionInformation parse = new URIToExtensionInformation(v8Loader, uri);
                
                String namespace = "cloudInfrastructure";
                String preMethodName = "DynamicAddCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverPreProc";
                String postMethodName = "DynamicAddCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverPostProc";
                String topLevel = "CloudRegion";
                testSpec(parse, HttpMethod.PUT, namespace, preMethodName, postMethodName, topLevel);
-               
-       }
-       
-       /**
-        * New vce V 6.
-        *
-        * @throws JAXBException the JAXB exception
-        * @throws AAIException the AAI exception
-        * @throws IllegalArgumentException the illegal argument exception
-        * @throws UnsupportedEncodingException the unsupported encoding exception
-        */
-       @Test
-    public void newVceV6() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException {
-               URI uri = UriBuilder.fromPath("/aai/" + v6Loader.getVersion() + "/network/newvces/newvce/key1").build();
-               URIToExtensionInformation parse = new URIToExtensionInformation(v6Loader, uri);
-               
-               String namespace = "network";
-               String preMethodName = "DynamicDelNetworkNewvcesNewvcePreProc";
-               String postMethodName = "DynamicDelNetworkNewvcesNewvcePostProc";
-               String topLevel = "Newvce";
-               testSpec(parse, HttpMethod.DELETE, namespace, preMethodName, postMethodName, topLevel);
-               
-       }
-       
-       /**
-        * New vce V 7.
-        *
-        * @throws JAXBException the JAXB exception
-        * @throws AAIException the AAI exception
-        * @throws IllegalArgumentException the illegal argument exception
-        * @throws UnsupportedEncodingException the unsupported encoding exception
-        */
-       @Test
-    public void newVceV7() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException {
-               URI uri = UriBuilder.fromPath("/aai/" + v7Loader.getVersion() + "/network/newvces/newvce/key1").build();
-               URIToExtensionInformation parse = new URIToExtensionInformation(v7Loader, uri);
-               
-               String namespace = "network";
-               String preMethodName = "DynamicDelNetworkNewvcesNewvcePreProc";
-               String postMethodName = "DynamicDelNetworkNewvcesNewvcePostProc";
-               String topLevel = "Newvce";
-               testSpec(parse, HttpMethod.DELETE, namespace, preMethodName, postMethodName, topLevel);
-               
+
        }
-       
+
        /**
         * Test spec.
         *