From 130aa901dd94519cd6bc99140a9d935365220cc5 Mon Sep 17 00:00:00 2001 From: ayalaben Date: Wed, 10 Oct 2018 09:40:57 +0300 Subject: Unit test coverage Change-Id: I3634ccaa60c72ee91b89ae42b8da8926b5823436 Issue-ID: SDC-1822 Signed-off-by: ayalaben --- ...ationTemplateFileExtensionErrorBuilderTest.java | 33 +++++++++++++-------- ...orSoftwareProductCreationFailedBuilderTest.java | 22 ++++++++++++-- ...dorSoftwareProductNotFoundErrorBuilderTest.java | 34 +++++++++++++--------- 3 files changed, 61 insertions(+), 28 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib') diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java index 1e643fa787..3cf91f1f32 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java @@ -1,26 +1,35 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ package org.openecomp.sdc.vendorsoftwareproduct.dao.errors; import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.INVALID_EXTENSION; -import org.junit.Before; +import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; -import org.testng.Assert; public class OrchestrationTemplateFileExtensionErrorBuilderTest { - private OrchestrationTemplateFileExtensionErrorBuilder orchestrationTemplateFileExtensionErrorBuilder; - - @Before - public void setUp() { - orchestrationTemplateFileExtensionErrorBuilder = new OrchestrationTemplateFileExtensionErrorBuilder(); - } - @Test - public void shouldReturnInvalidExtentionErrorCode(){ + public void shouldReturnInvalidExtentionErrorCode() { + OrchestrationTemplateFileExtensionErrorBuilder orchestrationTemplateFileExtensionErrorBuilder = + new OrchestrationTemplateFileExtensionErrorBuilder(); ErrorCode actual = orchestrationTemplateFileExtensionErrorBuilder.build(); - Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION); - Assert.assertEquals(actual.id(), INVALID_EXTENSION); + Assert.assertEquals(ErrorCategory.APPLICATION, actual.category()); + Assert.assertEquals(INVALID_EXTENSION,actual.id()); } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java index 921881d322..150fcc50f3 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java @@ -1,12 +1,28 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ package org.openecomp.sdc.vendorsoftwareproduct.dao.errors; import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.FAILED_TO_CREATE_VSP; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; -import org.testng.Assert; + public class VendorSoftwareProductCreationFailedBuilderTest { @@ -21,7 +37,7 @@ public class VendorSoftwareProductCreationFailedBuilderTest { @Test public void shouldReturnVspNotFoundErrorCode(){ ErrorCode actual = vendorSoftwareProductCreationFailedBuilder.build(); - Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION); - Assert.assertEquals(actual.id(), FAILED_TO_CREATE_VSP); + Assert.assertEquals(ErrorCategory.APPLICATION, actual.category()); + Assert.assertEquals(FAILED_TO_CREATE_VSP, actual.id()); } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java index 75e6b1f6df..9268178fbd 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java @@ -1,27 +1,35 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * 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. + */ package org.openecomp.sdc.vendorsoftwareproduct.dao.errors; import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.VSP_NOT_FOUND; -import org.junit.Before; +import org.junit.Assert; import org.junit.Test; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; -import org.testng.Assert; public class VendorSoftwareProductNotFoundErrorBuilderTest { - private static final String VSP_ID = "testVsp1"; - private VendorSoftwareProductNotFoundErrorBuilder vendorSoftwareProductNotFoundErrorBuilder; - - @Before - public void setUp() { - vendorSoftwareProductNotFoundErrorBuilder = new VendorSoftwareProductNotFoundErrorBuilder(VSP_ID); - } - @Test - public void shouldReturnVspNotFoundErrorCode(){ + public void shouldReturnVspNotFoundErrorCode() { + VendorSoftwareProductNotFoundErrorBuilder vendorSoftwareProductNotFoundErrorBuilder = + new VendorSoftwareProductNotFoundErrorBuilder("testVsp1"); ErrorCode actual = vendorSoftwareProductNotFoundErrorBuilder.build(); - Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION); - Assert.assertEquals(actual.id(), VSP_NOT_FOUND); + Assert.assertEquals(ErrorCategory.APPLICATION, actual.category()); + Assert.assertEquals(VSP_NOT_FOUND, actual.id()); } } -- cgit 1.2.3-korg