diff options
Diffstat (limited to 'adapters/mso-tenant-adapter')
5 files changed, 134 insertions, 2 deletions
diff --git a/adapters/mso-tenant-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-tenant-adapter/WebContent/WEB-INF/web.xml index 780bdd08ee..472aa71ff7 100644 --- a/adapters/mso-tenant-adapter/WebContent/WEB-INF/web.xml +++ b/adapters/mso-tenant-adapter/WebContent/WEB-INF/web.xml @@ -29,6 +29,10 @@ </param-value> </context-param> <context-param> + <param-name>resteasy.providers</param-name> + <param-value>org.openecomp.mso.adapters.providers.JettisonStyleMapperProvider</param-value> + </context-param> + <context-param> <param-name>resteasy.servlet.mapping.prefix</param-name> <param-value>/rest</param-value> </context-param> diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml index 916c3a7afd..0b15b0dd6f 100644 --- a/adapters/mso-tenant-adapter/pom.xml +++ b/adapters/mso-tenant-adapter/pom.xml @@ -49,9 +49,9 @@ </configuration> </plugin> <plugin> - <groupId>org.jvnet.jax-ws-commons</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>jaxws-maven-plugin</artifactId> - <version>2.3</version> + <version>2.4.1</version> <executions> <execution> <goals> diff --git a/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantAlreadyExistsTest.java b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantAlreadyExistsTest.java new file mode 100644 index 0000000000..7f30b70742 --- /dev/null +++ b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantAlreadyExistsTest.java @@ -0,0 +1,32 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* ============LICENSE_END========================================================= +*/ + +package org.openecomp.mso.adapters.tenant.exceptions; + +import org.junit.Test; + +public class TenantAlreadyExistsTest { + + @Test + public void test() { + TenantAlreadyExists tar= new TenantAlreadyExists("name", "cloudId", "tenantId"); + assert(tar!=null); + } +}
\ No newline at end of file diff --git a/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionBeanTest.java b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionBeanTest.java new file mode 100644 index 0000000000..c2f1d4e7aa --- /dev/null +++ b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionBeanTest.java @@ -0,0 +1,47 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* ============LICENSE_END========================================================= +*/ + +package org.openecomp.mso.adapters.tenant.exceptions; + +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory; + +public class TenantExceptionBeanTest { + +@Mock +private MsoExceptionCategory mec; + +@InjectMocks +private TenantExceptionBean teb; + +@Test + public void test() { + teb =new TenantExceptionBean("message",mec); + teb.setMessage("message"); + teb.setCategory(MsoExceptionCategory.INTERNAL); + teb.setCategory(MsoExceptionCategory.IO); + teb.setCategory(MsoExceptionCategory.OPENSTACK); + teb.setCategory(MsoExceptionCategory.USERDATA); + assert(teb.getMessage().equals("message")); + assert(teb.getCategory()!=null); + } +} diff --git a/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionTest.java b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionTest.java new file mode 100644 index 0000000000..32e1fd198d --- /dev/null +++ b/adapters/mso-tenant-adapter/src/test/java/org/openecomp/mso/adapters/tenant/exceptions/TenantExceptionTest.java @@ -0,0 +1,49 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* 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. +* ============LICENSE_END========================================================= +*/ + +package org.openecomp.mso.adapters.tenant.exceptions; + +import org.junit.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory; + +public class TenantExceptionTest { + + @Mock + private TenantExceptionBean teb; + + @Mock + private MsoExceptionCategory mec; + + @InjectMocks + private TenantException te; + + @Test + public void test() { + teb=new TenantExceptionBean("message"); + teb.setMessage("message"); + teb.setCategory(MsoExceptionCategory.INTERNAL); + te = new TenantException("message", mec); + te.setFaultInfo(teb); + assert(te.getFaultInfo()!=null); + assert(te.getFaultInfo().equals(teb)); + } +} |