+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>reflections</artifactId>
<version>${org.reflections.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.sdc.common</groupId>
<artifactId>onap-tosca-datatype</artifactId>
<parent>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.version}</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- Java Stuff -->
+/*
+ * 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.sdcrests.vendorlicense.rest.mapping;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-
/**
* Any change to ChoiceOrOther easily break reconstruction of objects of this type.
* This test protects from such accidental changes.
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapChoiceOrOtherDtoToChoiceOrOtherTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
-import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
-import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
-
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
+import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
+import org.testng.annotations.Test;
+
public class MapChoiceOrOtherToChoiceOrOtherDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
-import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
-import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
-import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
-import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto;
+import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-
-import static org.testng.Assert.assertEquals;
+import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
+import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
+import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
+import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto;
+import org.testng.annotations.Test;
public class MapEntitlementPoolEntityToEntitlementPoolEntityDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.HashSet;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolRequestDto;
import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
-
-import java.util.Collections;
-import java.util.HashSet;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapEntitlementPoolRequestDtoToEntitlementPoolEntityTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapFeatureGroupDescriptorDtoToFeatureGroupEntityTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapFeatureGroupEntityToFeatureGroupDescriptorDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm;
import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntityTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm;
import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
-import org.openecomp.sdc.vendorlicense.dao.types.*;
-import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto;
+import static org.testng.Assert.assertEquals;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-
-import static org.testng.Assert.assertEquals;
+import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
+import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType;
+import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
+import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
+import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
+import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto;
+import org.testng.annotations.Test;
public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType;
import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupRequestDto;
import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntityTest {
*/
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import static org.junit.Assert.assertEquals;
+import static org.testng.Assert.assertEquals;
-import org.junit.Test;
import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity;
+import org.testng.annotations.Test;
public class MapLimitEntityToLimitCreationDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.AggregationFunction;
import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity;
import org.openecomp.sdc.vendorlicense.dao.types.LimitType;
import org.openecomp.sdcrests.vendorlicense.types.LimitEntityDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapLimitEntityToLimitDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
-import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
-import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
+import static org.testng.Assert.assertEquals;
import java.util.HashSet;
import java.util.Set;
-
-import static org.testng.Assert.assertEquals;
+import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
+import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
+import org.testng.annotations.Test;
public class MapMultiChoiceOrOtherDtoToMultiChoiceOrOtherTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
-import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
-import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
+import static org.testng.Assert.assertEquals;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-
-import static org.testng.Assert.assertEquals;
+import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
+import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
+import org.testng.annotations.Test;
public class MapMultiChoiceOrOtherToMultiChoiceOrOtherDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity;
import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelEntityDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapVendorLicenseModelEntityToDtoTest {
package org.openecomp.sdcrests.vendorlicense.rest.mapping;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+
import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity;
import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelRequestDto;
-
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntityTest {
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>openecomp-nosqldb-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-application-config-manager</artifactId>
<parent>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>openecomp-heat-lib</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng-common</artifactId>
- <version>1.6.3</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.5</version>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
- <version>1.6.3</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-activity-log-api</artifactId>
+++ /dev/null
-package org.openecomp.sdc.vendorsoftwareproduct;
-
-public class ComputeTest {
-
- /*private static final String USER1 = "componentsTestUser1";
- private static final String USER2 = "componentsTestUser2";
- private static final Version VERSION01 = new Version(0, 1);
- private static final VendorSoftwareProductManager vendorSoftwareProductManager =
- new VendorSoftwareProductManagerImpl();
- private static final VendorSoftwareProductDao vendorSoftwareProductDao =
- VendorSoftwareProductDaoFactory
- .getInstance().createInterface();
-
- private static String vsp1Id;
- private static String vsp2Id;
- private static String comp1 = "{\"displayName\": \"VFC_Manual\", " +
- "\"description\": \"desc manual\"}";
- private static String compute1 = "{\"name\": \"Compute_A\", " +
- "\"description\": \"desc manual compute\"}";
- private static String computeDelete = "{\"name\": \"Compute_Delete\", " +
- "\"description\": \"desc manual compute delete\"}";
-
- private static String comp1Id;
- private static String compute1Id;
- private ComputeEntity createdCompute;
-
- static ComponentEntity createComponent(String vspId, Version version, String compId) {
- ComponentEntity componentEntity = new ComponentEntity(vspId, version, compId);
- ComponentData compData = new ComponentData();
- compData.setName(compId + " name");
- compData.setDisplayName(compId + " display name");
- compData.setDescription(compId + " desc");
- componentEntity.setComponentCompositionData(compData);
- vendorSoftwareProductDao.createComponent(componentEntity);
- return componentEntity;
- }
-
- static ComputeEntity createComputeEntity(String vspId, String componentId, String data ){
- ComputeEntity comp = new ComputeEntity();
- comp.setVspId(vspId);
- comp.setComponentId(componentId);
- comp.setCompositionData(data);
- return comp;
- }
-
- @BeforeClass
- private void init() {
- VspDetails
- vsp1 = vendorSoftwareProductManager.createNewVsp(VSPCommon
- .createVspDetails(null, null, "VSP_" + CommonMethods.nextUuId(), "Test-vsp1", "vendorName",
- "vlm1Id", "icon", "category", "subCategory", "123", null,
- VSPCommon.OnboardingMethod.HEAT.name()), USER1
- );
- vsp1Id = vsp1.getId(); //HEAT onboarded
-
- VspDetails vsp2 = vendorSoftwareProductManager.createNewVsp(VSPCommon
- .createVspDetails(null, null, "VSP_" + CommonMethods.nextUuId(), "Test-vsp3",
- "vendorName",
- "vlm1Id", "icon", "category", "subCategory", "123", null, VSPCommon
- .OnboardingMethod.Manual.name()), USER1);
- vsp2Id = vsp2.getId(); //MANUAL onboarded
-
- ComponentEntity component = new ComponentEntity();
- component.setVspId(vsp2Id);
- component.setCompositionData(comp1);
- ComponentEntity createdComp = vendorSoftwareProductManager.createComponent(component, USER1);
- comp1Id = createdComp.getId();
- }
-
- @Test
- public void testListWhenNone() {
-
- final Collection<ListComputeResponse> listComputeResponses =
- vendorSoftwareProductManager.listCompute(vsp2Id, null, comp1Id, USER1);
- Assert.assertEquals(listComputeResponses.size(), 0);
- }
-
- @Test
- public void testCreateComputeInHeatOnboardedVsp_negative() {
- ComputeEntity comp = createComputeEntity(vsp1Id,comp1Id,compute1);
- try {
- createdCompute = vendorSoftwareProductManager.createCompute(comp, USER1);
- Assert.fail();
- }
- catch(CoreException exception){
- Assert.assertEquals(exception.code().id(),ADD_COMPUTE_NOT_ALLOWED_IN_HEAT_ONBOARDING);
- }
- }
-
- @Test(dependsOnMethods = "testListWhenNone")
- public void testCreateCompute() {
- ComputeEntity comp = createComputeEntity(vsp2Id,comp1Id,compute1);
-
- createdCompute = vendorSoftwareProductManager.createCompute(comp, USER1);
- compute1Id = createdCompute.getId();
- Assert.assertNotNull(compute1Id);
- Assert.assertNotNull(createdCompute.getCompositionData());
- Assert.assertNotNull(
- vendorSoftwareProductManager.getCompute(vsp2Id, VERSION01, comp1Id,compute1Id,
- USER1).getData());
- }
-
- @Test(dependsOnMethods = "testCreateCompute")
- public void testCreateComputeNegative() {
- ComputeEntity comp = createComputeEntity(vsp2Id,comp1Id,compute1);
-
- try {
- ComputeEntity createdCompute = vendorSoftwareProductManager.createCompute(comp, USER1);
- Assert.fail();
- }
- catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(),DUPLICATE_COMPUTE_NAME_NOT_ALLOWED);
- }
- }
-
- @Test
- public void testGetNonExistingComponentId_negative() {
- testGet_negative(vsp1Id, null, "non existing component id", compute1Id, USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testGetNonExistingVspId_negative() {
- testGet_negative("non existing vsp id", null, comp1Id, compute1Id, USER1,
- VersioningErrorCodes.VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- @Test
- public void testGetNonExistingComputeId_negative() {
- testGet_negative(vsp1Id, null, comp1Id, "non existing compute id", USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test(dependsOnMethods = "testCreateCompute")
- public void testGetCompute() {
- testGet(vsp2Id, VERSION01, comp1Id, compute1Id, USER1, createdCompute);
- }
-
-
- @Test(dependsOnMethods = "testCreateCompute")
- public void testListCompute() {
-
- final Collection<ListComputeResponse> actual =
- vendorSoftwareProductManager.listCompute(vsp2Id, null, comp1Id, USER1);
- Assert.assertEquals(actual.size(), 1);
- actual.forEach(listComputeResponse -> {
- Assert.assertEquals(listComputeResponse.isAssociatedWithDeploymentFlavor(), false);
- } );
- }
-
-
- @Test(dependsOnMethods = "testListCompute")
- public void testListComputeAssociatedWithDeployment() {
-
- //Create DF and associate compute1Id CF to it
- String deployment1Id = null;
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vsp2Id,
- VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("DF_testListComputeAssociatedWithDeployment");
- deploymentFlavor.setDescription("creating a deployment flavor with compute flavor association");
- ComponentComputeAssociation association = new ComponentComputeAssociation();
- association.setComponentId(comp1Id);
- association.setComputeFlavorId(compute1Id);
- List<ComponentComputeAssociation> associations = new ArrayList<ComponentComputeAssociation>();
- associations.add(association);
- deploymentFlavor.setComponentComputeAssociations(associations);
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
-
- DeploymentFlavorEntity createddeployment = vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- Assert.assertEquals((createddeployment.getId() != null), true);
- deployment1Id = createddeployment.getId();
-
- final Collection<ListComputeResponse> actual =
- vendorSoftwareProductManager.listCompute(vsp2Id, null, comp1Id, USER1);
- Assert.assertEquals(actual.size(), 1);
- actual.forEach(listComputeResponse -> {
- Assert.assertEquals(listComputeResponse.isAssociatedWithDeploymentFlavor(), true);
- } );
- }
-
- @Test
- public void testUpdateNonExistingComponentId_negative() {
- testUpdate_negative(vsp1Id, "non existing component id", USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testUpdateNonExistingVspId_negative() {
- testUpdate_negative("non existing vsp id", comp1Id, USER1,
- VersioningErrorCodes.VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- @Test
- public void testDelete() {
- ComputeEntity comp = createComputeEntity(vsp2Id,comp1Id,computeDelete);
-
- ComputeEntity created = vendorSoftwareProductManager.createCompute(comp, USER1);
-
- vendorSoftwareProductManager.deleteCompute(vsp2Id,comp1Id,created.getId(),USER1);
- testGet_negative(vsp2Id,null, comp1Id, created.getId(),USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testDeleteNonExistingComputeId_negative() {
- testDelete_negative(vsp2Id,comp1Id,"InvalidComputeId",USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testDeleteNonExistingComponentId_negative() {
- testDelete_negative(vsp2Id,"InvalidComponentId",compute1Id,USER1,
- VersioningErrorCodes.VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testDeleteNonExistingVspId_negative() {
- testDelete_negative("InvalidVspId",comp1Id,compute1Id,USER1,
- VersioningErrorCodes.VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- private void testGet(String vspId, Version version, String componentId, String computeId, String
- user, ComputeEntity expected) {
- CompositionEntityResponse<ComputeData>
- response = vendorSoftwareProductManager.getCompute(vspId, null, componentId, computeId,
- user);
- Assert.assertEquals(response.getId(), expected.getId());
- Assert.assertEquals(response.getData(), expected.getComputeCompositionData());
- Assert.assertNotNull(response.getSchema());
- }
-
- private void testGet_negative(String vspId, Version version, String componentId, String computeId,
- String user, String expectedErrorCode) {
- try {
- vendorSoftwareProductManager.getCompute(vspId, version, componentId, computeId, user);
- Assert.fail();
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }
-
- private void testDelete_negative(String vspId, String componentId, String computeId, String user,
- String expectedErrorCode){
- try {
- vendorSoftwareProductManager.deleteCompute(vspId, componentId, computeId, user);
- Assert.fail();
- }
- catch(CoreException exception){
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }
-
- private void testUpdate_negative(String vspId, String componentId, String user,
- String expectedErrorCode) {
- try {
- vendorSoftwareProductManager
- .updateComponent(new ComponentEntity(vspId, null, componentId), user);
- Assert.fail();
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }*/
-}
+++ /dev/null
-package org.openecomp.sdc.vendorsoftwareproduct;
-
-public class DeploymentFlavorTest {
- /*private static final String USER1 = "deploymentTestUser1";
- private static final String USER2 = "deploymentTestUser2";
- private static final Version VERSION01 = new Version(0, 1);
- private static final VendorSoftwareProductManager vendorSoftwareProductManager =
- new VendorSoftwareProductManagerImpl();
- private static final VendorSoftwareProductDao vendorSoftwareProductDao =
- VendorSoftwareProductDaoFactory.getInstance().createInterface();
-
- private static String vsp1Id;
- private static String vsp2Id;
- private static String vsp3Id;
- private static String component11Id;
- private static String component21Id;
- private static String deployment1Id = "deployment1";
- private static String deployment2Id = "deployment2";
-
- @BeforeClass
- private void init() {
- List<String> featureGroups = new ArrayList<>();
- featureGroups.add("fg01");
- featureGroups.add("fg02");
- vsp1Id = vendorSoftwareProductManager.createNewVsp(VSPCommon
- .createVspDetails(null, null, "VSP_" + CommonMethods.nextUuId(), "Test-vsp1", "vendorName1",
- "vlm1Id", "icon", "category", "subCategory", "123", featureGroups,
- VSPCommon.OnboardingMethod.
- Manual.name()), USER1).getId();
- component11Id = ComponentsTest.createComponent(vsp1Id, VERSION01, "component11").getId();
-
- vsp2Id = vendorSoftwareProductManager.createNewVsp(VSPCommon
- .createVspDetails(null, null, "VSP_" + CommonMethods.nextUuId(), "Test-vsp2", "vendorName1",
- "vlm1Id", "icon", "category", "subCategory", "123", null,
- VSPCommon.OnboardingMethod.Manual.name()), USER1).getId();
- component21Id = ComponentsTest.createComponent(vsp2Id, VERSION01, "component21").getId();
-
- vsp3Id = vendorSoftwareProductManager.createNewVsp(VSPCommon
- .createVspDetails(null, null, "VSP_" + CommonMethods.nextUuId(), "Test-vsp3forDeployment",
- "vendorName1",
- "vlm1Id", "icon", "category", "subCategory", "123", null,
- VSPCommon.OnboardingMethod.HEAT.name()), USER1).getId();
- }
-
- static DeploymentFlavorEntity createDeploymentFlavor(String vspId, Version version, String deploymentFlavorId) {
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vspId, version, deploymentFlavorId);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel(deploymentFlavorId + " name");
- deploymentFlavor.setDescription(deploymentFlavorId + " desc");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- DeploymentFlavorEntity createdDeployment = vendorSoftwareProductManager
- .createDeploymentFlavor(deploymentFlavorEntity, USER1);
- deployment2Id = createdDeployment.getId();
- return deploymentFlavorEntity;
- }
-
- @Test
- public void testCreate() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentcreatewithoutFG");
- deploymentFlavor.setDescription("creating a deployment flavor without any FG and any " +
- "association");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- DeploymentFlavorEntity createddeployment = vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- Assert.assertEquals((createddeployment.getId() != null), true);
- deployment1Id = createddeployment.getId();
- }
-
- @Test(dependsOnMethods = "testCreate")
- public void testUniqueModelCreate() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentcreatewithoutFG");
- deploymentFlavor.setDescription("creating a deployment flavor without any FG and any " +
- "association");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), DUPLICATE_DEPLOYMENT_FLAVOR_MODEL_NOT_ALLOWED);
- }
- }
-
- @Test
- public void testInvalidFeatureGroup() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestInvalidFeatureGroup");
- deploymentFlavor.setDescription("creating a deployment flavor with invalid FG and without any" +
- " " +
- "association");
- deploymentFlavor.setFeatureGroupId("fg01");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), FEATURE_GROUP_NOT_EXIST_FOR_VSP);
- }
- }
-
- @Test
- public void testInvalidAssociation() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("testInvalidAssociation");
- deploymentFlavor.setDescription("creating a deployment flavor with wrong association with " +
- "null compute flavor id");
- List<ComponentComputeAssociation> componentComputeAssociationList = new ArrayList<>();
- ComponentComputeAssociation componentComputeAssociation = new ComponentComputeAssociation();
- componentComputeAssociation.setComputeFlavorId("72138712");
- componentComputeAssociationList.add(componentComputeAssociation);
- deploymentFlavor.setComponentComputeAssociations(componentComputeAssociationList);
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), INVALID_COMPONENT_COMPUTE_ASSOCIATION);
- }
-
- }
-
- @Test
- public void testInvalidComputeFlavorIdAssociation() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("testInvalidComputeFlavorIdAssociation");
- deploymentFlavor.setDescription("creating a deployment flavor with wrong compute flavor id in" +
- " assocation");
- List<ComponentComputeAssociation> componentComputeAssociationList = new ArrayList<>();
- ComponentComputeAssociation componentComputeAssociation = new ComponentComputeAssociation();
- componentComputeAssociation.setComponentId(component21Id);
- componentComputeAssociation.setComputeFlavorId("123123");
- componentComputeAssociationList.add(componentComputeAssociation);
- deploymentFlavor.setComponentComputeAssociations(componentComputeAssociationList);
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), INVALID_COMPUTE_FLAVOR_ID);
- }
-
- }
-
- @Test
- public void testInvalidVfcIdAssociation() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("testInvalidVfcIdAssociation");
- deploymentFlavor.setDescription("creating a deployment flavor with invalid vfcid association");
- List<ComponentComputeAssociation> componentComputeAssociationList = new ArrayList<>();
- ComponentComputeAssociation componentComputeAssociation = new ComponentComputeAssociation();
- componentComputeAssociation.setComponentId("WRONGVFCID");
- componentComputeAssociation.setComputeFlavorId("123123");
- componentComputeAssociationList.add(componentComputeAssociation);
- deploymentFlavor.setComponentComputeAssociations(componentComputeAssociationList);
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
- }
-
- @Test
- public void testNegativeforVspHeatOnboarded() {
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp3Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentcreatewithoutFG");
- deploymentFlavor.setDescription("creating a deployment flavor for VSP onboarded with HEAT");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- try {
- vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(),
- CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING);
- }
- }
-
- @Test
- public void testGetNegative_InvalidVspId(){
- testGetNegative("InvalidVspId", VERSION01, deployment1Id, USER1, VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- @Test
- public void testGetNegative_InvalidDeploymentFlavorId(){
- testGetNegative(vsp1Id, VERSION01, deployment1Id, USER1, VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testGet(){
- DeploymentFlavorEntity expected = createDeploymentFlavor(vsp1Id, VERSION01,deployment2Id);
- testGet(vsp1Id, VERSION01, deployment2Id, USER1, expected);
- }
-
- private void testGet(String vspId, Version version, String componentId, String user,
- DeploymentFlavorEntity expected) {
- CompositionEntityResponse<DeploymentFlavor> response = vendorSoftwareProductManager
- .getDeploymentFlavor(vspId, null, componentId, user);
- Assert.assertEquals(response.getId(), expected.getId());
- Assert.assertEquals(response.getData().getDescription(),
- expected.getDeploymentFlavorCompositionData().getDescription());
- Assert.assertEquals(response.getData().getModel(),
- expected.getDeploymentFlavorCompositionData().getModel());
- Assert.assertEquals(response.getData().getFeatureGroupId(),
- expected.getDeploymentFlavorCompositionData().getFeatureGroupId());
- Assert.assertEquals(response.getData().getComponentComputeAssociations(),
- expected.getDeploymentFlavorCompositionData().getComponentComputeAssociations());
- Assert.assertNotNull(response.getSchema());
- }
-
- private void testGetNegative(String vspId, Version version, String deploymentFlavorId, String User,
- String expectedErrorCode){
- try{
- vendorSoftwareProductManager.getDeploymentFlavor(vspId, version, deploymentFlavorId, User);
- Assert.fail();
- } catch (CoreException exception){
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }
-
- @Test
- public void testUpdateNegative_InvalidVspId(){
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity("InvalidVspId",
- VERSION01,deployment2Id);
- DeploymentFlavor deploymentFlavorData = new DeploymentFlavor();
- deploymentFlavorData.setModel(deployment2Id);
- deploymentFlavorData.setDescription("updating a deployment flavor with invalid VspId and without any" +
- "association");
- deploymentFlavorData.setFeatureGroupId("fg01");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavorData);
-
- testUpdateNegative(deploymentFlavorEntity, USER1, VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- @Test
- public void testUpdateNegative_InvalidDeploymentFlavorId(){
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vsp1Id,
- VERSION01,"InvalidDeploymentFlavorId");
- testUpdateNegative(deploymentFlavorEntity, USER1, VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test(dependsOnMethods = "testCreate")
- public void testUpdateNegative_InvalidFeatureGroup(){
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vsp2Id,
- VERSION01,deployment1Id);
- DeploymentFlavor deploymentFlavorData = new DeploymentFlavor();
- deploymentFlavorData.setModel("TestDeploymentCreateWithoutFG");
- deploymentFlavorData.setDescription("updating a deployment flavor with invalid FeatureGroupId and without any" +
- "association");
- deploymentFlavorData.setFeatureGroupId("fg01");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavorData);
- String expectedError = "#/featureGroupId: "
- +deploymentFlavorData.getFeatureGroupId()+" is not a valid value. Possible values: ";
-
- final CompositionEntityValidationData validationData = vendorSoftwareProductManager
- .updateDeploymentFlavor(deploymentFlavorEntity, USER1);
- final Collection<String> errors = validationData.getErrors();
- final Object[] objects = errors.toArray();
- Assert.assertEquals(errors.size(), 1);
- Assert.assertEquals(objects[0], expectedError);
- }
-
- @Test(dependsOnMethods = "testCreate")
- public void testUpdateNegative_InvalidComputeFlavorIdAssociation(){
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vsp2Id,
- VERSION01,deployment1Id);
- DeploymentFlavor deploymentFlavorData = new DeploymentFlavor();
- deploymentFlavorData.setModel("TestDeploymentcreatewithInvalidComputFlavorId");
- deploymentFlavorData.setDescription("updating a deployment flavor with wrong compute flavor id in" +
- " assocation");
- List<ComponentComputeAssociation> componentComputeAssociationList = new ArrayList<>();
- ComponentComputeAssociation componentComputeAssociation = new ComponentComputeAssociation();
- componentComputeAssociation.setComponentId(component21Id);
- componentComputeAssociation.setComputeFlavorId("123123");
- componentComputeAssociationList.add(componentComputeAssociation);
- deploymentFlavorData.setComponentComputeAssociations(componentComputeAssociationList);
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavorData);
-
- testUpdateNegative(deploymentFlavorEntity, USER1, INVALID_COMPUTE_FLAVOR_ID);
- }
-
- @Test
- public void testUpdate(){
- //Creating a separate deployment flavor for testing deletion
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp1Id, VERSION01, deployment2Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentCreateforUpdate");
- deploymentFlavor.setDescription("creating a deployment flavor for updation");
- deploymentFlavor.setFeatureGroupId("fg01");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- DeploymentFlavorEntity createdDeployment = vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- deployment2Id = createdDeployment.getId();
-
- final DeploymentFlavor deploymentFlavorCompositionData = createdDeployment.getDeploymentFlavorCompositionData();
- deploymentFlavorCompositionData.setModel("TestDeploymentCreateforUpdate"); //no change
- deploymentFlavorCompositionData.setDescription("updating deployment flavor"); //allow change
- deploymentFlavorCompositionData.setFeatureGroupId("fg01"); //no change
- createdDeployment.setDeploymentFlavorCompositionData(deploymentFlavorCompositionData);
-
- vendorSoftwareProductManager.updateDeploymentFlavor(createdDeployment, USER1);
- CompositionEntityResponse<DeploymentFlavor> deploymentFlavorCompositionEntityResponse = vendorSoftwareProductManager
- .getDeploymentFlavor(vsp1Id, VERSION01, deployment2Id, USER1);
- final DeploymentFlavor data = deploymentFlavorCompositionEntityResponse.getData();
-
- Assert.assertEquals(
- data.getDescription(),createdDeployment.getDeploymentFlavorCompositionData().getDescription());
- }
-
- @Test
- public void testUpdateVspWithNoFeatureGroup(){
- //Creating a separate deployment flavor for testing deletion
- DeploymentFlavorEntity deploymentFlavorEntity = new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment1Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentCreateforUpdate");
- deploymentFlavor.setDescription("creating a deployment flavor for updation");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- DeploymentFlavorEntity createdDeployment = vendorSoftwareProductManager
- .createDeploymentFlavor(deploymentFlavorEntity, USER1);
- deployment1Id = createdDeployment.getId();
-
- final DeploymentFlavor deploymentFlavorCompositionData = createdDeployment.getDeploymentFlavorCompositionData();
- deploymentFlavorCompositionData.setModel("TestDeploymentCreateforUpdate"); //no change
- deploymentFlavorCompositionData.setDescription("updating deployment flavor"); //allow change
- createdDeployment.setDeploymentFlavorCompositionData(deploymentFlavorCompositionData);
-
- vendorSoftwareProductManager.updateDeploymentFlavor(createdDeployment, USER1);
- CompositionEntityResponse<DeploymentFlavor> deploymentFlavorCompositionEntityResponse =
- vendorSoftwareProductManager.getDeploymentFlavor(vsp2Id, VERSION01, deployment1Id, USER1);
- final DeploymentFlavor data = deploymentFlavorCompositionEntityResponse.getData();
-
- Assert.assertEquals(data.getDescription(),createdDeployment.getDeploymentFlavorCompositionData()
- .getDescription());
- }
-
- private void testUpdateNegative(DeploymentFlavorEntity deploymentFlavorEntity, String user,
- String expectedErrorCode) {
- try {
- vendorSoftwareProductManager
- .updateDeploymentFlavor(deploymentFlavorEntity, user);
- System.out.print("updated");
- Assert.fail();
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }
-
- @Test
- public void testDelete(){
- //Creating a separate deployment flavor for testing deletion
- DeploymentFlavorEntity deploymentFlavorEntity =
- new DeploymentFlavorEntity(vsp2Id, VERSION01, deployment2Id);
- DeploymentFlavor deploymentFlavor = new DeploymentFlavor();
- deploymentFlavor.setModel("TestDeploymentcreateWithoutFG");
- deploymentFlavor.setDescription("creating a deployment flavor without any FG and any " +
- "association");
- deploymentFlavorEntity.setDeploymentFlavorCompositionData(deploymentFlavor);
- DeploymentFlavorEntity createddeployment = vendorSoftwareProductManager.createDeploymentFlavor
- (deploymentFlavorEntity, USER1);
- deployment2Id = createddeployment.getId();
- vendorSoftwareProductManager.deleteDeploymentFlavor(vsp2Id, deployment2Id, USER1);
- testDeleteNegative(vsp2Id, deployment2Id, USER1,
- VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- @Test
- public void testDeleteNegative_InvalidVspId(){
- testDeleteNegative("InvalidVspId", deployment2Id, USER1,
- VERSIONABLE_ENTITY_NOT_EXIST);
- }
-
- @Test
- public void testDeleteNegative_NonExistingDeploymentFlavorId(){
- testDeleteNegative(vsp2Id, "NonExistingDeploymentFlavorId", USER1,
- VERSIONABLE_SUB_ENTITY_NOT_FOUND);
- }
-
- private void testDeleteNegative(String vspId, String deploymentId, String user,
- String expectedErrorCode) {
- try {
- vendorSoftwareProductManager
- .deleteDeploymentFlavor(vspId, deploymentId, user);
- Assert.fail();
- } catch (CoreException exception) {
- Assert.assertEquals(exception.code().id(), expectedErrorCode);
- }
- }*/
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct;
-
-public class VspHealTest {/*
- private static VendorSoftwareProductManager vendorSoftwareProductManager = null;
- //new VendorSoftwareProductManagerImpl();
- private VendorSoftwareProductManagerImplTest vendorSoftwareProductManagerTest =
- new VendorSoftwareProductManagerImplTest();
- private static OrchestrationTemplateCandidateDao orchestrationTemplateCandidateDataDao =
- OrchestrationTemplateCandidateDaoFactory.getInstance().createInterface();
- private static VendorSoftwareProductDao vendorSoftwareProductDao =
- VendorSoftwareProductDaoFactory.getInstance().createInterface();
- private static ComponentDao componentDao =
- ComponentDaoFactory.getInstance().createInterface();
- private static CompositionDataExtractor compositionDataExtractor =
- CompositionDataExtractorFactory.getInstance().createInterface();
- private static NetworkDao networkDao = NetworkDaoFactory.getInstance().createInterface();
- private static NicDao nicDao = NicDaoFactory.getInstance().createInterface();
- private static VspDetails vspDetails;
- private static final String USER = "vspTestUser1";
- public static final Version VERSION01 = new Version(0, 1);
- private static String vspId;
- private OrchestrationTemplateCandidateManager candidateManager;
-
- @BeforeTest
- private void init() {
- try {
- vspDetails = new VspDetails();
- vspDetails.setName("vspName_" + CommonMethods.nextUuId());
- vspDetails.setVendorName("vendor");
- vspId = vendorSoftwareProductManager.createVsp(vspDetails, USER).getId();
-
- } catch (Exception ignored) {
- System.out.println(ignored.getMessage());
- }
- }
-
- @Test
- public void shouldReturnEmptyFileDataStructureBeforeZipUpload() {
- Optional<FilesDataStructure> candidateFilesDataStructure = candidateManager
- .getFilesDataStructure(vspId, VERSION01, USER);
- Assert.assertNotNull(candidateFilesDataStructure);
- Assert.assertTrue(candidateFilesDataStructure.isPresent());
-
- checkFileDataStructureListsAreEmpty(candidateFilesDataStructure.get());
- }
-
- @Test(dependsOnMethods = "shouldReturnEmptyFileDataStructureBeforeZipUpload")
- public void shouldReturnFileDataStructureOnEmptyFileDataStructureInDB() {
- uploadAndProcessOrchestrationTemplate(vspId, USER, "/vspmanager/zips/emptyComposition.zip");
-
- orchestrationTemplateCandidateDataDao
- .deleteOrchestrationTemplateCandidateFileDataStructure(vspId, VERSION01);
- Assert.assertEquals(Optional.empty(), orchestrationTemplateCandidateDataDao
- .getOrchestrationTemplateCandidateFileDataStructure(vspId, VERSION01));
-
- Optional<FilesDataStructure> candidateFilesDataStructure = candidateManager
- .getFilesDataStructure(vspId, VERSION01, USER);
- Assert.assertNotNull(candidateFilesDataStructure);
- Assert.assertTrue(candidateFilesDataStructure.isPresent());
- }
-
- @Test(dependsOnMethods = "shouldReturnEmptyFileDataStructureBeforeZipUpload")
- public void shouldReturnEmptyFileDataStructureOnEmptyUpload() {
- try {
- uploadAndProcessOrchestrationTemplate(vspId, USER, "/vspmanager/zips/zipFileWithFolder.zip");
- } catch (Exception e) {
- Assert.assertEquals(e.getMessage(),
- "Failed to get orchestration template for VSP with id " + vspId);
- }
- }
-
- @Test(dependsOnMethods = {"shouldReturnEmptyFileDataStructureOnEmptyUpload"})
- public void shouldHealVspOnIsOldTrue() {
- vspDetails.setOldVersion(VersionHealingValues.True);
- vendorSoftwareProductDao.updateQuestionnaire(vspId, VERSION01, null);
-
- vendorSoftwareProductManager.heal(vspId, VERSION01, USER);
-
- VspQuestionnaireEntity questionnaire =
- vendorSoftwareProductDao.getQuestionnaire(vspId, VERSION01);
-
- Assert.assertNotNull(questionnaire.getQuestionnaireData());
- }
-
- @Test(dependsOnMethods = {"shouldHealVspOnIsOldTrue"})
- public void shouldHealNullQuestionnaire() {
- vendorSoftwareProductDao.updateQuestionnaire(vspId, VERSION01, null);
- vendorSoftwareProductManager.heal(vspId, VERSION01, USER);
- QuestionnaireResponse vspQuestionnaire =
- vendorSoftwareProductManager.getVspQuestionnaire(vspId, VERSION01, USER);
-
- Assert.assertNotNull(vspQuestionnaire.getData());
- }
-
- @Test(dependsOnMethods = {"shouldHealNullQuestionnaire"})
- public void shouldHealNullCompositionData() {
- uploadAndProcessOrchestrationTemplate(vspId, USER, "/vspmanager/zips/fullComposition.zip");
-
- Collection<ComponentEntity> componentEntitiesBeforeHeal =
- vendorSoftwareProductDao.listComponents(vspId, VERSION01);
- Collection<NetworkEntity> networkEntitiesBeforeHeal =
- vendorSoftwareProductDao.listNetworks(vspId, VERSION01);
-
- deleteCompositionData(vspId, VERSION01);
-
- vendorSoftwareProductManager.heal(vspId, VERSION01, USER);
-
- Collection<ComponentEntity> componentEntitiesAfterHeal =
- vendorSoftwareProductDao.listComponents(vspId, VERSION01);
- Collection<NetworkEntity> networkEntitiesAfterHeal =
- vendorSoftwareProductDao.listNetworks(vspId, VERSION01);
-
- checkCompositionDataIsHealed(componentEntitiesBeforeHeal, networkEntitiesBeforeHeal,
- componentEntitiesAfterHeal, networkEntitiesAfterHeal);
- }
-
- @Test(dependsOnMethods = {"shouldHealNullCompositionData"})
- public void shouldChangeComponentDisplayName() {
- uploadAndProcessOrchestrationTemplate(vspId, USER, "/vspmanager/zips/vCDN.zip");
-
- List<ComponentEntity> componentEntitiesBeforeHeal =
- (List<ComponentEntity>) vendorSoftwareProductDao.listComponents(vspId, VERSION01);
- Collection<ComponentEntity> componentsToHeal = new ArrayList<>();
-
- for (ComponentEntity component : componentEntitiesBeforeHeal) {
- changeComponentDisplayNameToOldVersion(component);
- }
-
- vendorSoftwareProductManager.heal(vspId, VERSION01, USER);
-
- List<ComponentEntity> componentEntitiesAfterHeal =
- (List<ComponentEntity>) vendorSoftwareProductDao.listComponents(vspId, VERSION01);
-
- assertComponentdisplayNameAsExpected(componentEntitiesBeforeHeal, componentEntitiesAfterHeal);
- }
-
- private void assertComponentdisplayNameAsExpected(
- List<ComponentEntity> componentEntitiesBeforeHeal,
- List<ComponentEntity> componentEntitiesAfterHeal) {
- ComponentEntity componentBefore = componentEntitiesBeforeHeal.get(0);
- ComponentEntity componentAfter = componentEntitiesAfterHeal.get(0);
- Assert.assertNotEquals(componentBefore, componentAfter);
-
- ComponentData componsitionDataBefore = componentBefore.getComponentCompositionData();
- ComponentData compositionDataAfter = componentAfter.getComponentCompositionData();
- Assert.assertTrue(
- componsitionDataBefore.getDisplayName().contains(compositionDataAfter.getDisplayName()));
- Assert.assertEquals(
- compositionDataExtractor.getComponentDisplayName(componsitionDataBefore.getName()),
- compositionDataAfter.getDisplayName());
- }
-
- private void changeComponentDisplayNameToOldVersion(ComponentEntity component) {
- ComponentData componentData = component.getComponentCompositionData();
- componentData.setDisplayName(componentData.getName());
- componentData.setVfcCode(componentData.getDisplayName());
- component.setComponentCompositionData(componentData);
- vendorSoftwareProductDao.updateComponent(component);
- }
-
-
- private void uploadAndProcessOrchestrationTemplate(String vspId, String user,
- String filePath) {
-
- candidateManager.upload(vspId, VERSION01,
- vendorSoftwareProductManagerTest
- .getFileInputStream(filePath), user);
- candidateManager.process(vspId, VERSION01, user);
- }
-
- private void deleteCompositionData(String vspId, Version version) {
- componentDao.deleteAll(vspId, version);
- networkDao.deleteAll(vspId, version);
- nicDao.deleteByVspId(vspId, version);
- }
-
- private void checkCompositionDataIsHealed(Collection<ComponentEntity> componentEntitiesBeforeHeal,
- Collection<NetworkEntity> networkEntitiesBeforeHeal,
- Collection<ComponentEntity> componentEntitiesAfterHeal,
- Collection<NetworkEntity> networkEntitiesAfterHeal) {
- Assert.assertNotNull(componentEntitiesAfterHeal);
- Assert.assertNotNull(networkEntitiesAfterHeal);
-
- Assert.assertEquals(componentEntitiesBeforeHeal.size(), componentEntitiesAfterHeal.size());
- Assert.assertEquals(networkEntitiesBeforeHeal.size(), networkEntitiesAfterHeal.size());
- }
-
-
- private void checkFileDataStructureListsAreEmpty(FilesDataStructure filesDataStructure) {
- Assert.assertEquals(filesDataStructure.getArtifacts().size(), 0);
- Assert.assertEquals(filesDataStructure.getModules().size(), 0);
- Assert.assertEquals(filesDataStructure.getNested().size(), 0);
- Assert.assertEquals(filesDataStructure.getUnassigned().size(), 0);
- }
-
-*/
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.services;
-
-public class QuestionnaireValidatorTest {
-/*
- public static QuestionnaireValidator validator = new QuestionnaireValidator();
-
- @Test(expectedExceptions = CoreException.class)
- public void testAddSubEntityBeforeRoot_negative() {
- validator.addSubEntity(createComponent("componentId2"), CompositionEntityType.vsp);
- }
-
- @Test(dependsOnMethods = "testAddSubEntityBeforeRoot_negative")
- public void testAddRootEntity() {
- validator.addRootEntity(createVspQuestionnaireEntity());
- }
-
- @Test(dependsOnMethods = "testAddRootEntity", expectedExceptions = CoreException.class)
- public void testAddRootEntityWhenAlreadyExist_negative() {
- validator.addRootEntity(createVspQuestionnaireEntity());
- }
-
- @Test(dependsOnMethods = "testAddRootEntity")
- public void testAddSubEntity() {
- validator.addSubEntity(createComponent("componentId1"), CompositionEntityType.vsp);
- }
-
- @Test(dependsOnMethods = "testAddRootEntity", expectedExceptions = CoreException.class)
- public void testAddSubEntityWithNonExistingParentType() {
- validator.addSubEntity(new ComponentEntity("vspId1", new Version(0, 1), "componentId2"), CompositionEntityType.nic);
- }
-
- @Test(dependsOnMethods = "testAddSubEntity")
- public void testAddSubEntities() throws Exception {
- Collection<UnifiedCompositionEntity> nics = new ArrayList<>();
- nics.add(createNic("nicId1", "componentId1"));
- nics.add(createNic("nicId2", "componentId1"));
- nics.add(createNic("nicId3", "componentId1"));
-
- validator.addSubEntities(nics, CompositionEntityType.component);
- }
-
-
- @Test(dependsOnMethods = "testAddSubEntities")
- public void testValidate() throws Exception {
- QuestionnaireValidationResult validationResult = validator.validate();
- Assert.assertTrue(validationResult.isValid());
- }
-
- private static VspQuestionnaireEntity createVspQuestionnaireEntity() {
- VspQuestionnaireEntity vspQuestionnaireEntity = new VspQuestionnaireEntity();
- vspQuestionnaireEntity.setId("vspId1");
- vspQuestionnaireEntity.setVersion(new Version(0, 1));
- vspQuestionnaireEntity.setQuestionnaireData("{\n" +
- " \"name\": \"bla bla\"\n" +
- "}");
- return vspQuestionnaireEntity;
- }
-
- private static ComponentEntity createComponent(String componentId) {
- ComponentEntity component = new ComponentEntity("vspId1", new Version(0, 1), componentId);
- component.setQuestionnaireData("{\n" +
- " \"name\": \"bla bla\"\n" +
- "}");
- return component;
- }
-
- private static UnifiedCompositionEntity createNic(String nicId, String componentId) {
- NicEntity nic = new NicEntity("vspId1", new Version(0, 1), componentId, nicId);
- nic.setQuestionnaireData("{\n" +
- " \"name\": \"bla bla\"\n" +
- "}");
- return nic;
- }*/
-}
package org.openecomp.sdc.vendorsoftwareproduct.services.impl;
+import static org.mockito.Mockito.doReturn;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
import org.apache.commons.collections4.CollectionUtils;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import static org.mockito.Mockito.doReturn;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
/**
* @author Avrahamg
* @since November 09, 2016
package org.openecomp.sdc.vendorsoftwareproduct.services.impl.composition;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.NotDirectoryException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.mockito.InjectMocks;
import org.mockito.MockitoAnnotations;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.NotDirectoryException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author shiria
* @since July 17, 2016.
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.services.schemagenerator;
-
-public class SchemaGeneratorTest {
- /*
-
- private static int getMinOfVmMax(JSONObject schemaJson) {
- return schemaJson.getJSONObject("properties").getJSONObject("compute")
- .getJSONObject("properties").getJSONObject("numOfVMs").getJSONObject("properties")
- .getJSONObject("maximum").getInt("minimum");
- }
-
- private static JSONObject validateSchema(String schema) {
- System.out.println(schema);
- Assert.assertNotNull(schema);
- Assert.assertTrue(JsonUtil.isValidJson(schema));
- JSONObject schemaJson = new JSONObject(schema);
- Assert.assertFalse(SchemaLoader.load(schemaJson) instanceof EmptySchema);
- return schemaJson;
- }
-
- // TODO: 3/15/2017 fix and enable //@Test
- public void testGenerateVspQuestionnaire() {
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.vsp, null);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateNetworkCompositionUpload() {
- Network network = new Network();
- network.setName("upload network1 name");
- network.setDhcp(true);
-
- NetworkCompositionSchemaInput input = new NetworkCompositionSchemaInput();
- input.setManual(false);
- input.setNetwork(network);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.network, input);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateNetworkCompositionManual() {
- NetworkCompositionSchemaInput input = new NetworkCompositionSchemaInput();
- input.setManual(true);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.network, input);
-
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateComponentQuestionnaireWithoutInput() {
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.component, null);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateComponentQuestionnaireWithMissingInput() {
- ComponentQuestionnaireSchemaInput
- input = new ComponentQuestionnaireSchemaInput(Arrays.asList("nic1", "nic2"),
- JsonUtil.json2Object("{\n" +
- " \"compute\": {\n" +
- " \"numOfVMs\": {\n" +
- " \"blabla\": 70\n" + // no minimum
- " }\n" +
- " }\n" +
- "}", Map.class));
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.component, input);
- JSONObject schemaJson = validateSchema(schema);
- //Assert.assertEquals(getMinOfVmMax(schemaJson), 0);
- }
-
- @Test
- public void testGenerateComponentQuestionnaireWithInvalidTypeInput() {
- ComponentQuestionnaireSchemaInput input =
- new ComponentQuestionnaireSchemaInput(Arrays.asList("nic1", "nic2"),
- JsonUtil.json2Object("{\n" +
- " \"compute\": {\n" +
- " \"numOfVMs\": {\n" +
- " \"minimum\": \"some string instead of integer\"\n" +
- // invalid minimum - string
- " }\n" +
- " }\n" +
- "}", Map.class));
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.component, input);
- JSONObject schemaJson = validateSchema(schema);
- Assert.assertEquals(getMinOfVmMax(schemaJson), 0);
- }
-
- @Test
- public void testGenerateComponentQuestionnaireWithInvalidRangeInput() {
- ComponentQuestionnaireSchemaInput input =
- new ComponentQuestionnaireSchemaInput(Arrays.asList("nic1", "nic2"),
- JsonUtil.json2Object("{\n" +
- " \"compute\": {\n" +
- " \"numOfVMs\": {\n" +
- " \"minimum\": 150\n" + // invalid minimum - integer out of range (0-100)
- " }\n" +
- " }\n" +
- "}", Map.class));
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.component, input);
- JSONObject schemaJson = validateSchema(schema);
- Assert.assertEquals(getMinOfVmMax(schemaJson), 0);
- }
-
- @Test
- public void testGenerateComponentQuestionnaireWithValidInput() {
- ComponentQuestionnaireSchemaInput input =
- new ComponentQuestionnaireSchemaInput(Arrays.asList("nic1", "nic2"),
- JsonUtil.json2Object("{\n" +
- " \"compute\": {\n" +
- " \"numOfVMs\": {\n" +
- " \"minimum\": 30\n" + // valid minimum - integer at the correct range (0-100)
- " }\n" +
- " }\n" +
- "}", Map.class));
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.component, input);
- JSONObject schemaJson = validateSchema(schema);
- Assert.assertEquals(getMinOfVmMax(schemaJson), 30);
- }
-
- @Test
- public void testGenerateNicQuestionnaire() {
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.nic, null);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateComponentCompositionUpload() {
- ComponentData component = new ComponentData();
- component.setName("upload comp1 name");
- component.setDescription("upload comp1 desc");
-
- ComponentCompositionSchemaInput input = new ComponentCompositionSchemaInput();
- input.setManual(false);
- input.setComponent(component);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.component, input);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateComponentCompositionManual() {
- ComponentCompositionSchemaInput input = new ComponentCompositionSchemaInput();
- input.setManual(true);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.component, input);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateNicCompositionUpload() {
- Nic nic = new Nic();
- nic.setName("upload nic1 name");
- nic.setDescription("upload nic1 desc");
- nic.setNetworkId("upload nic1 networkId");
- //nic.setNetworkName("upload nic1 networkName");
- nic.setNetworkType(NetworkType.External);
-
- NicCompositionSchemaInput input = new NicCompositionSchemaInput();
- input.setManual(false);
- input.setNic(nic);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.nic, input);
- validateSchema(schema);
- }
-
-
-// @Test
-// public void testGenerateNicCompositionManualWithoutNetworkId() {
-// Nic nic = new Nic();
-// nic.setName("upload nic1 name");
-// nic.setDescription("upload nic1 desc");
-// //nic.setNetworkName("upload nic1 networkName");
-// nic.setNetworkType(NetworkType.External);
-//
-// NicCompositionSchemaInput input = new NicCompositionSchemaInput();
-// input.setManual(true);
-// input.setNic(nic);
-//
-// String schema = SchemaGenerator.generate(SchemaTemplateContext.composition, CompositionEntityType.nic, input);
-// validateSchema(schema);
-// }
-
- @Test
- public void testGenerateNicCompositionUploadWithoutNetworkId() {
- Nic nic = new Nic();
- nic.setName("upload nic1 name");
- nic.setDescription("upload nic1 desc");
- //nic.setNetworkName("upload nic1 networkName");
- nic.setNetworkType(NetworkType.External);
-
- NicCompositionSchemaInput input = new NicCompositionSchemaInput();
- input.setManual(false);
- input.setNic(nic);
-
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.nic, input);
- validateSchema(schema);
- }
-
- @Test
- public void testGenerateNicCompositionManual() {Nic nic = new Nic();
- nic.setName("upload nic1 name");
- nic.setDescription("upload nic1 desc");
- nic.setNetworkType(NetworkType.Internal);
- NicCompositionSchemaInput input = new NicCompositionSchemaInput();
-
- input.setManual(true);
- input.setNetworkIds(
- Arrays.asList("manual networkId1", "manual networkId2", "manual networkId3"));
- input.setNic(nic);
- String schema = SchemaGenerator
- .generate(SchemaTemplateContext.composition, CompositionEntityType.nic, input);
- validateSchema(schema);
- }
- */
-}
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
import org.openecomp.sdc.heat.services.tree.HeatTreeManager;
-import org.testng.Assert;
-import org.testng.annotations.Test;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.*;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class HeatTreeManagerTest extends TreeBaseTest {
package org.openecomp.sdc.vendorsoftwareproduct.tree;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.testng.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.zip.ZipOutputStream;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.*;
-import java.net.URL;
-import java.util.zip.ZipOutputStream;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.testng.Assert.assertEquals;
-
public class UploadFileTest {
private static final String USER1 = "vspTestUser1";
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.upload.HeatCleanup;
-
-public class HeatCleanupOnNewUploadTest {/*
- private static final String USER1 = "vspTestUser1";
-
- private static final VendorSoftwareProductManager
- vendorSoftwareProductManager = new VendorSoftwareProductManagerImpl();
- private static final VendorSoftwareProductDao vendorSoftwareProductDao =
- VendorSoftwareProductDaoFactory
- .getInstance().createInterface();
- private static final ServiceModelDao serviceModelDao =
- ServiceModelDaoFactory.getInstance().createInterface();
-
- private static String vspId = null;
- private static Version vspActiveVersion = null;
-
- private static void validateUploadContentExistence(boolean exist) {
- UploadDataEntity uploadDataEntity =
- vendorSoftwareProductDao.getUploadData(new UploadDataEntity(vspId, vspActiveVersion));
- Assert.assertTrue((uploadDataEntity.getContentData() != null) == exist);
- Assert.assertTrue((uploadDataEntity.getInfo() != null) == exist);
- Assert.assertTrue((uploadDataEntity.getPackageName() != null) == exist);
- Assert.assertTrue((uploadDataEntity.getPackageVersion() != null) == exist);
- //TODO: talio - delete enrich data on new upload
- //Assert.assertTrue((serviceModelDao.getServiceModel(vspId, vspActiveVersion) != null) == ex
- }
-
- private static void validateCompositionDataExistence(boolean exist) {
- Assert.assertTrue(CollectionUtils
- .isNotEmpty(vendorSoftwareProductDao.listNetworks(vspId, vspActiveVersion)) == exist);
- Assert.assertTrue(CollectionUtils
- .isNotEmpty(vendorSoftwareProductDao.listComponents(vspId, vspActiveVersion)) == exist);
- Assert.assertTrue(CollectionUtils
- .isNotEmpty(vendorSoftwareProductDao.listNicsByVsp(vspId, vspActiveVersion)) == exist);
- }
-
- private static InputStream getFileInputStream(String fileName) {
- URL url = HeatCleanupOnNewUploadTest.class.getResource(fileName);
- try {
- return url.openStream();
- } catch (IOException exception) {
- exception.printStackTrace();
- return null;
- }
- }
-
- @BeforeClass
- private void init() {
- UniqueValueUtil
- .deleteUniqueValue(VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME,
- "VSPTestEmpty");
-
- VspDetails vspDetails = vendorSoftwareProductManager.createVsp(VSPCommon
- .createVspDetails(null, null, "VSPTestEmpty", "Test-vsp-empty", "vendorName", "vlm1Id",
- "icon", "category", "subCategory", "123", null, VSPCommon.OnboardingMethod.HEAT.name()),
- USER1);
- vspId = vspDetails.getId();
- vspActiveVersion = vspDetails.getVersion();
- }
-
- @Test
- public void testUploadWithComposition() {
- InputStream zis = getFileInputStream("/vspmanager/zips/fullComposition.zip");
-
- vendorSoftwareProductManager.upload(vspId, zis, USER1);
- OrchestrationTemplateActionResponse orchestrationTemplateActionResponse =
- vendorSoftwareProductManager.process(vspId, USER1);
-
- Assert.assertEquals(orchestrationTemplateActionResponse.getStatus(), UploadFileStatus.Success);
- Assert.assertTrue(MapUtils.isEmpty(MessageContainerUtil
- .getMessageByLevel(ErrorLevel.ERROR, orchestrationTemplateActionResponse.getErrors())));
-
- validateUploadContentExistence(true);
- validateCompositionDataExistence(true);
- }
-
- @Test(dependsOnMethods = {"testUploadWithComposition"})
- public void testProccesesMIBsDeletionAfterNewUpload() {
- InputStream zis1 = getFileInputStream("/vspmanager/zips/fullComposition.zip");
- InputStream zis2 = getFileInputStream("/vspmanager/zips/fullComposition.zip");
- InputStream mib = getFileInputStream("/vspmanager/zips/vDNS.zip");
-
- vendorSoftwareProductManager.upload(vspId, zis1, USER1);
- vendorSoftwareProductManager.process(vspId, USER1);
- List<ComponentEntity> components =
- (List<ComponentEntity>) vendorSoftwareProductDao.listComponents(vspId, vspActiveVersion);
- String componentId = components.get(0).getId();
-
- vendorSoftwareProductManager
- .upload(mib, "vDNS.zip", vspId, componentId, MonitoringUploadType.SNMP_TRAP, USER1);
- vendorSoftwareProductManager
- .createProcess(new ProcessEntity(vspId, vspActiveVersion, componentId, null), USER1);
-
- vendorSoftwareProductManager.upload(vspId, zis2, USER1);
- vendorSoftwareProductManager.process(vspId, USER1);
- Assert.assertTrue(
- vendorSoftwareProductManager.listFilenames(vspId, componentId, USER1).getSnmpTrap() ==
- null);
- Assert.assertTrue(CollectionUtils
- .isEmpty(vendorSoftwareProductDao.listProcesses(vspId, vspActiveVersion, componentId)));
- }
-
- @Test(dependsOnMethods = {"testProccesesMIBsDeletionAfterNewUpload"})
- public void testInvalidUploadAfterFullComposition() {
- InputStream zis = getFileInputStream("/vspmanager/zips/missingYml.zip");
-
- vendorSoftwareProductManager.upload(vspId, zis, USER1);
- OrchestrationTemplateActionResponse uploadFileResponse =
- vendorSoftwareProductManager.process(vspId, USER1);
- Assert.assertEquals(uploadFileResponse.getStatus(), UploadFileStatus.Failure);
- Assert.assertTrue(MapUtils.isNotEmpty(
- MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, uploadFileResponse.getErrors())));
-
- validateUploadContentExistence(true);
- //TODO: talio - check upload cleanup
-// validateCompositionDataExistence(false);
- }
-
- @Test(dependsOnMethods = {"testInvalidUploadAfterFullComposition"})
- public void testEmptyCompositionUploadAfterFullComposition() throws IOException {
- testUploadWithComposition();
-
- InputStream zis = getFileInputStream("/vspmanager/zips/emptyComposition.zip");
- vendorSoftwareProductManager.upload(vspId, zis, USER1);
- OrchestrationTemplateActionResponse uploadFileResponse =
- vendorSoftwareProductManager.process(vspId, USER1);
- Assert.assertEquals(uploadFileResponse.getStatus(), UploadFileStatus.Success);
- Assert.assertTrue(MapUtils.isEmpty(
- MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, uploadFileResponse.getErrors())));
-
- validateUploadContentExistence(true);
- validateCompositionDataExistence(false);
- }
-*/}
+/*
+ * 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.upload.csar;
-import org.junit.Test;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.csar.OnboardingManifest;
import java.io.IOException;
import java.io.InputStream;
+import org.testng.annotations.Test;
-import static org.junit.Assert.*;
public class ManifestParsingTest {
package org.openecomp.sdc.vendorsoftwareproduct.upload.csar;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.function.Predicate;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.function.Predicate;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-
public class UploadCSARFileTest {
public static final Version VERSION01 = new Version("0.1");
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.upload.validation;
-
-public class UploadFileValidationTest {
-/*
-
- private static final String USER1 = "UploadFileValidationTest";
- private static final String EMPTY_ZIP_FILE = "/validation/zips/emptyZip.zip";
- private static final String MISSING_MANIFEST_IN_ZIP_FILE =
- "/validation/zips/missingManifestInZip.zip";
- private static final String ZIP_FILE_WITH_FOLDER = "/validation/zips/zipFileWithFolder.zip";
- private static VendorSoftwareProductManager vendorSoftwareProductManager =
- new VendorSoftwareProductManagerImpl();
- private static String vspId;
-
- public static VendorLicenseModelEntity createVendorLicenseModel(String name, String desc,
- String icon) {
- VendorLicenseModelEntity vendorLicenseModel = new VendorLicenseModelEntity();
- vendorLicenseModel.setVendorName(name);
- vendorLicenseModel.setDescription(desc);
- vendorLicenseModel.setIconRef(icon);
- return vendorLicenseModel;
- }
-
- @BeforeTest
- private void init() {
- VspDetails vspDetails = new VspDetails();
- vspDetails.setVendorName("vspName_" + CommonMethods.nextUuId());
- vspId = vendorSoftwareProductManager.createVsp(vspDetails, USER1).getId();
-
- UniqueValueUtil
- .deleteUniqueValue(VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME,
- "VSP_syb_upload_various");
- UniqueValueUtil
- .deleteUniqueValue(VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME,
- "vsp_syb_upload_no_error");
- UniqueValueUtil
- .deleteUniqueValue(VendorSoftwareProductConstants.UniqueValues.VENDOR_SOFTWARE_PRODUCT_NAME,
- "vsp_syb");
- }
-
- @Test
- public void testUploadZipNull() {
- try {
- vendorSoftwareProductManager.upload(vspId, null, USER1);
- OrchestrationTemplateActionResponse response =
- vendorSoftwareProductManager.process(vspId, USER1);
- } catch (Exception exception) {
- Assert.assertEquals(exception.getMessage(),
- "Failed to get orchestration template for VSP with id " + vspId);
- }
- }
-
- @Test(dependsOnMethods = "testUploadZipNull")
- public void testUploadEmptyFile() {
- UploadFileResponse uploadFileResponse = vendorSoftwareProductManager
- .upload(vspId, new ByteArrayInputStream("".getBytes()),
- USER1);
- Assert.assertEquals(uploadFileResponse.getErrors().get(SdcCommon.UPLOAD_FILE).get(0)
- .getMessage(),
- Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage());
- }
-
- @Test(dependsOnMethods = "testUploadEmptyFile")
- public void testUploadEmptyZip() {
- UploadFileResponse uploadFileResponse = vendorSoftwareProductManager
- .upload(vspId, getFileInputStream(EMPTY_ZIP_FILE), USER1);
- Assert.assertEquals(uploadFileResponse.getErrors().get(SdcCommon.UPLOAD_FILE).get(0)
- .getMessage(),
- Messages.CREATE_MANIFEST_FROM_ZIP.getErrorMessage());
- */
-/*Assert.assertEquals(exception.getMessage(),
- Messages.CREATE_MANIFEST_FROM_ZIP.getErrorMessage());*//*
-
- }
-
- @Test(dependsOnMethods = "testUploadEmptyZip")
- public void testUploadMissingManifestInZip() {
- vendorSoftwareProductManager.upload(vspId,
- getFileInputStream(MISSING_MANIFEST_IN_ZIP_FILE), USER1);
- OrchestrationTemplateActionResponse response =
- vendorSoftwareProductManager.process(vspId, USER1);
- Assert.assertEquals(response.getErrors().size(), 2);
- }
-
- @Test(dependsOnMethods = "testUploadMissingManifestInZip")
- public void testUploadZipWithFolder() {
- vendorSoftwareProductManager
- .upload(vspId, getFileInputStream(ZIP_FILE_WITH_FOLDER),
- USER1);
- OrchestrationTemplateActionResponse response =
- vendorSoftwareProductManager.process(vspId, USER1);
- Assert.assertEquals(response.getErrors().size(), 2);
- }
-
- @Test(dependsOnMethods = "testUploadZipWithFolder")
- public void testUploadVariousZips() {
-
- File[] files = getFileList("/validation/zips/various");
- InputStream is;
- for (File file : files) {
- if (file.isFile()) {
- OrchestrationTemplateActionResponse response;
- try {
-
- is = new FileInputStream(file);
- vendorSoftwareProductManager.upload(vspId, is, USER1);
- response =
- vendorSoftwareProductManager.process(vspId, USER1);
-
- } catch (FileNotFoundException exception) {
- throw new RuntimeException(exception);
- } catch (RuntimeException re) {
-
- throw new RuntimeException("failed upload:" + file.getName(), re);
- }
- System.out.println("zip:" + file.getName() + " Errors:" + calculateNumberOfMessages(
- MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, response.getErrors())) +
- " Warnings:" + calculateNumberOfMessages(
- MessageContainerUtil.getMessageByLevel(ErrorLevel.WARNING, response.getErrors())));
- }
- }
- }
-
- @Test(dependsOnMethods = "testUploadVariousZips")
- public void testUploadNoErrorVariousZips() {
-
-
- File[] files = getFileList("/validation/zips/various/noError");
- InputStream is;
- for (File file : files) {
- if (file.isFile()) {
- try {
- is = new FileInputStream(file);
- vendorSoftwareProductManager.upload(vspId, is, USER1);
- OrchestrationTemplateActionResponse response =
- vendorSoftwareProductManager.process(vspId, USER1);
- Map<String, List<ErrorMessage>> errors = response.getErrors();
- Assert.assertTrue(
- MapUtils.isEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, errors)));
-
-
- } catch (FileNotFoundException exception) {
- throw new RuntimeException(exception);
- } catch (RuntimeException re) {
- Assert.fail("failed upload:" + file.getName() + " exception:" + re.getMessage());
- }
- }
- }
- }
-
- private InputStream getFileInputStream(String fileName) {
- URL url = this.getClass().getResource(fileName);
- try {
- return url.openStream();
- } catch (IOException exception) {
- exception.printStackTrace();
- return null;
- }
- }
-
- private File[] getFileList(String dir) {
- URL url = UploadFileValidationTest.class.getResource(dir);
-
- String path = url.getPath();
- File pathFile = new File(path);
- return pathFile.listFiles();
-
-
- }
-
- private int calculateNumberOfMessages(Map<String, List<ErrorMessage>> messages) {
- int sum = 0;
- for (List<ErrorMessage> errors : messages.values()) {
- sum += errors.size();
- }
- return sum;
- }
-
-*/
-
-}
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- <version>${mockito.all.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.core.nosqldb;
-
-import org.openecomp.core.nosqldb.api.NoSqlDb;
-
-
-public class NoSqlDbTest {
-
- private NoSqlDb noSqlDb;
-/*
-
- @Test
- public void testNoSqlDbFactoryFactoryInit() {
- this.noSqlDb = NoSqlDbFactory.getInstance().createInterface();
- Assert.assertNotNull(this.noSqlDb);
- Assert.assertEquals(this.noSqlDb.getClass().getName(),
- "org.openecomp.core.nosqldb.impl.cassandra.CassandraNoSqlDbImpl");
- }
-
- @Test(dependsOnMethods = {"testNoSqlDbFactoryFactoryInit"})
- public void testCreateTable() {
- this.noSqlDb.execute("test.drop", null);
- this.noSqlDb.execute("test.create", null);
- }
-
- @Test(dependsOnMethods = {"testCreateTable"})
- public void testInsertTable() {
- this.noSqlDb
- .insert("test", new String[]{"name", "value"}, new String[]{"TestName", "testValue"});
- this.noSqlDb.execute("test.insert", new String[]{"TestName2", "testValue2"});
- }
-
- @Test(dependsOnMethods = {"testInsertTable"})
- public void gettestSelectTable() {
- ResultSet result = this.noSqlDb.execute("test.select.all", null);
- List<Row> rows = result.all();
- Assert.assertEquals(rows.size(), 2);
- for (Row row : rows) {
- System.out.format("%s %s\n", row.getString("name"), row.getString("value"));
- }
- }
-
- */
-}
+/*
+ * 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.core.nosqldb.util;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertNotNull;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.Field;
-
-import static org.testng.Assert.assertNotNull;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
/**
* @author EVITALIY
*/
public class ConfigurationManagerTest {
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
private static final String NON_EXISTENT = "unexistentfile";
- @BeforeMethod
+ @Before
public void resetInstance() throws NoSuchFieldException, IllegalAccessException {
Field field = ConfigurationManager.class.getDeclaredField("instance");
field.setAccessible(true);
field.set(null, null);
}
- @Test(expectedExceptions = IOException.class,
- expectedExceptionsMessageRegExp = ".*" + NON_EXISTENT + ".*")
+ @Test
public void testGetInstanceSystemProperty() throws Throwable {
+ expectedException.expect(IOException.class);
+ expectedException.expectMessage(containsString(NON_EXISTENT));
+
try (ConfigurationSystemPropertyUpdater updater = new ConfigurationSystemPropertyUpdater(NON_EXISTENT)) {
ConfigurationManager.getInstance();
} catch (RuntimeException e) {
}
@Test()
- public void testGetInstanceDefault() throws Exception {
+ public void testGetInstanceDefault() {
try (ConfigurationSystemPropertyUpdater property = new ConfigurationSystemPropertyUpdater()) {
ConfigurationManager manager = ConfigurationManager.getInstance();
}
@Override
- public void close() throws IOException {
+ public void close() {
if (oldValue == null) {
System.clearProperty(ConfigurationManager.CONFIGURATION_YAML_FILE);
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>org.everit.json.schema</artifactId>
<version>${org.everit.json.schema.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-api</artifactId>
package org.openecomp.core.utilities;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
import org.apache.commons.lang3.ArrayUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Test;
public class CommonMethodsTest {
assertEquals(CommonMethods.arrayToCommaSeparatedString(new String[] {"", ""}), ",");
}
- @Test(expectedExceptions = NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testArrayToCommaSeparatedStringNull() {
CommonMethods.arrayToCommaSeparatedString(null);
}
assertEquals(CommonMethods.arrayToSeparatedString(new String[] {"", ""}, '/'), "/");
}
- @Test(expectedExceptions = NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testArrayToSeparatedStringNull() {
CommonMethods.arrayToSeparatedString(null, '/');
}
assertEquals(CommonMethods.collectionToCommaSeparatedString(Collections.emptySet()), "");
}
- @Test(expectedExceptions = NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testCollectionToCommaSeparatedStringNull() {
assertNull(CommonMethods.collectionToCommaSeparatedString(null));
}
String []resultArray = CommonMethods.concat(firstArray, secondArray);
- Assert.assertEquals(resultArray.length, 4);
- Assert.assertTrue(ArrayUtils.contains(resultArray, secondArray[0])
+ assertEquals(resultArray.length, 4);
+ assertTrue(ArrayUtils.contains(resultArray, secondArray[0])
&& ArrayUtils.contains(resultArray, firstArray[0]));
}
String []resultArray = CommonMethods.concat(firstArray, null);
- Assert.assertEquals(resultArray.length, 2);
- Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray)));
+ assertEquals(resultArray.length, 2);
+ assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(firstArray)));
}
@Test
String []resultArray = CommonMethods.concat(null, secondArray);
- Assert.assertEquals(resultArray.length, 2);
- Assert.assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray)));
+ assertEquals(resultArray.length, 2);
+ assertTrue(Arrays.asList(resultArray).containsAll(Arrays.asList(secondArray)));
}
@Test
public void testConcatBothValueNull() {
- Assert.assertNull(CommonMethods.concat(null, null));
+ assertNull(CommonMethods.concat(null, null));
}
@Test
public void testNewInstance() {
Object obj = CommonMethods.newInstance(JAVA_LANG_STRING);
- Assert.assertNotNull(obj);
- Assert.assertTrue(obj instanceof String);
+ assertNotNull(obj);
+ assertTrue(obj instanceof String);
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testNewInstanceIncorrectClassProvided() {
- Assert.assertNull(CommonMethods.newInstance("java.lang.Stringss"));
+ assertNull(CommonMethods.newInstance("java.lang.Stringss"));
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testNewInstanceClassNotProvided() {
- Assert.assertNull(CommonMethods.newInstance(null, Object.class));
+ assertNull(CommonMethods.newInstance(null, Object.class));
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testNewInstanceObjectNotProvided() {
- Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null));
+ assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, null));
}
- @Test(expectedExceptions = ClassCastException.class)
+ @Test(expected = ClassCastException.class)
public void testNewInstanceClassCastException() {
- Assert.assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class));
+ assertNull(CommonMethods.newInstance(JAVA_LANG_STRING, ArrayList.class));
}
- @Test(expectedExceptions = RuntimeException.class)
+ @Test(expected = RuntimeException.class)
public void testNewInstanceInvalidClassProvided() {
- Assert.assertNull(CommonMethods.newInstance(List.class));
+ assertNull(CommonMethods.newInstance(List.class));
}
@Test
String result = CommonMethods.listToSeparatedString(
Stream.of("Concat", "String").collect(Collectors.toList()), ',');
- Assert.assertNotNull(result);
- Assert.assertEquals(str, result);
+ assertNotNull(result);
+ assertEquals(str, result);
}
@Test
public void testDuplicateStringWithDelimiter() {
String duplicateStr = CommonMethods.duplicateStringWithDelimiter("Duplicate", '#', 4);
- Assert.assertNotNull(duplicateStr);
+ assertNotNull(duplicateStr);
String[] duplicateStrArray = duplicateStr.split("#");
- Assert.assertTrue(duplicateStr.contains("Duplicate"));
- Assert.assertEquals(duplicateStrArray.length, 4);
+ assertTrue(duplicateStr.contains("Duplicate"));
+ assertEquals(duplicateStrArray.length, 4);
}
@Test
public void testRoSingleElement() {
Set<String> stringSet = CommonMethods.toSingleElementSet("Set Element");
- Assert.assertNotNull(stringSet);
- Assert.assertTrue(stringSet.contains("Set Element"));
+ assertNotNull(stringSet);
+ assertTrue(stringSet.contains("Set Element"));
}
@Test
List<Map<String, String>> resultList = CommonMethods.mergeListsOfMap(list1, list2);
- Assert.assertEquals(resultList.size(), 6);
+ assertEquals(resultList.size(), 6);
//Verify for duplicate key
int count = 0;
count++;
}
- Assert.assertEquals(1, count);
+ assertEquals(1, count);
}
@Test
List<String> resultList = CommonMethods.mergeLists(list1, list2);
- Assert.assertEquals(resultList.size(), 4);
- Assert.assertTrue(resultList.containsAll(list1));
- Assert.assertTrue(resultList.containsAll(list2));
+ assertEquals(resultList.size(), 4);
+ assertTrue(resultList.containsAll(list1));
+ assertTrue(resultList.containsAll(list2));
}
@Test
Map<String, String> resultMap = CommonMethods.mergeMaps(map1, map2);
- Assert.assertEquals(resultMap.size(), 4);
- Assert.assertEquals(resultMap.get("Port"), "VMI");
+ assertEquals(resultMap.size(), 4);
+ assertEquals(resultMap.get("Port"), "VMI");
}
}
+/*
+ * 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.core.utilities.file;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author EVITALIY
Assert.assertEquals(contentHandler.getFiles().size(), 2);
Assert.assertEquals(contentHandler.getFileList().size(), 2);
- Assert.assertFalse(contentHandler.isEmpty());
+ assertFalse(contentHandler.isEmpty());
contentHandler.remove("file1");
- Assert.assertFalse(contentHandler.containsFile("file1"));
+ assertFalse(contentHandler.containsFile("file1"));
}
@Test
package org.openecomp.core.utilities.file;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.io.File;
import java.io.IOException;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @author EVITALIY
assertTrue(FileUtils.readViaInputStream(TEST_RESOURCE, TEST_FUNCTION) > 0);
}
- @Test(expectedExceptions = NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testReadViaInputStreamNull() {
FileUtils.readViaInputStream((String) null, TEST_FUNCTION);
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testReadViaInputStreamNotFound() {
FileUtils.readViaInputStream("notfound.txt", TEST_FUNCTION);
}
Assert.assertNotNull(inputStream);
}
- @Test(expectedExceptions = RuntimeException.class)
+ @Test(expected = RuntimeException.class)
public void testLoadFileToInputStreamIncorrectFilePath() {
FileUtils.loadFileToInputStream("invalidfilepath");
}
import org.json.JSONException;
import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.utilities.file.FileUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
public class JsonSchemaDataGeneratorTest {
+ "\"phoneNumber\":[{\"code\":1,\"location\":\"Home\"},{\"code\":2,\"location\":\"Office\"}]}"));
}
- @Test(expectedExceptions = JSONException.class)
+ @Test(expected = JSONException.class)
public void testSchemaWithInvalidDefault() {
testGenerate(SCHEMA_WITH_INVALID_DEFAULT, null);
}
new JSONObject("{\"ipConfiguration\":{\"ipv4Required\":true,\"ipv6Required\":false}}"));
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testConstructorException() {
Assert.assertNull(new JsonSchemaDataGenerator(null));
}
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.utilities.file.FileUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
public class JsonUtilTest {
+ "It does not match pattern (0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/((19|20)\\d\\d)");
}
- @Test(expectedExceptions = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testInValidJsonValidateNullJson() {
JsonUtil.validate(null, null);
}
Assert.assertEquals(list.size(), 3);
}
- @Test(expectedExceptions = RuntimeException.class)
+ @Test(expected = RuntimeException.class)
public void testJson2ObjectIncorrectJson() {
String inputStr = "{[Json, Util, Test]}";
List list = JsonUtil.json2Object(inputStr, ArrayList.class);
Assert.assertEquals(list.size(), 3);
}
- @Test(expectedExceptions = RuntimeException.class)
+ @Test(expected = RuntimeException.class)
public void testJson2ObjectIncorrectJsonInputStream() {
String inputStr = "{[Json, Util, Test]}";
List list = JsonUtil.json2Object(new ByteArrayInputStream(inputStr.getBytes()), ArrayList.class);
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.sdc.common</groupId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- <version>${testng.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent>
<dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<artifactId>openecomp-facade-core</artifactId>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>onap-tosca-datatype</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-enrichment-impl</artifactId>
<version>${project.version}</version>
- <!--scope>runtime</scope-->
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
package org.openecomp.sdc.enrichment.impl;
-import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
-import org.openecomp.core.enrichment.factory.EnrichmentManagerFactory;
-import org.openecomp.core.utilities.file.FileUtils;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
-import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.nio.file.NotDirectoryException;
import java.util.HashMap;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
+import org.openecomp.core.enrichment.factory.EnrichmentManagerFactory;
+import org.openecomp.core.utilities.file.FileUtils;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
+import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
+import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl;
public class EnrichmentManagerImplTest {
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>onap-tosca-datatype</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
- <scope>runtime</scope>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-vendor-software-product-core</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <scope>test</scope>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-model-impl</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
package org.openecomp.sdc.enrichment.impl.external.artifact;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.collections4.CollectionUtils;
-import org.mockito.*;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
import org.onap.sdc.tosca.services.YamlUtil;
import org.openecomp.core.enrichment.types.ArtifactCategory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentMonitoringUploadEntity;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.times;
public class MonitoringMibEnricherTest {
private MonitoringMibEnricher monitoringMibEnricher;
- @BeforeMethod(alwaysRun = true)
+ @Before
public void injectDoubles() {
MockitoAnnotations.initMocks(this);
}
+/*
+ * 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.enrichment.impl.external.artifact;
-import org.mockito.*;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
import org.openecomp.core.enrichment.types.ArtifactCategory;
import org.openecomp.core.model.dao.EnrichedServiceModelDao;
import org.openecomp.core.model.types.ServiceArtifact;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessEntity;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessType;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.*;
public class ProcessArtifactEnricherTest {
@Mock
@InjectMocks
ProcessArtifactEnricher processArtifactEnricher;
- @BeforeMethod(alwaysRun = true)
+ @Before
public void injectDoubles() {
MockitoAnnotations.initMocks(this);
}
+/*
+ * 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.enrichment.impl.tosca;
import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MANDATORY;
import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MAX_INSTANCES;
import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.MIN_INSTANCES;
-import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.VFC_CODE;
import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.NFC_FUNCTION;
import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.NFC_NAMING_CODE;
+import static org.openecomp.sdc.enrichment.impl.util.EnrichmentConstants.VFC_CODE;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.collections.map.HashedMap;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
public class AbstractSubstituteToscaEnricherTest extends BaseToscaEnrichmentTest {
String vspId = null;
Version version = new Version();
- @BeforeMethod(alwaysRun = true)
+ @Before
public void injectDoubles() {
MockitoAnnotations.initMocks(this);
vspId = "123";
-package org.openecomp.sdc.enrichment.impl.tosca;
+/*
+ * 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.
+ */
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+package org.openecomp.sdc.enrichment.impl.tosca;
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
public class PortMirroringEnricherTest extends BaseToscaEnrichmentTest {
private PortMirroringEnricher portMirroringEnricher;
- @BeforeMethod(alwaysRun = true)
- public void init() throws IOException {
+ @Before
+ public void init() {
portMirroringEnricher = new PortMirroringEnricher();
}
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>openecomp-sdc-datatypes-lib</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- <version>${mockito.all.version}</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-lib</artifactId>
<version>1.3.2-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>onap-configuration-management-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${mvn.surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${mvn.surefire.version}</version>
- </dependency>
- </dependencies>
<configuration>
<parallel>classes</parallel>
<threadCount>1</threadCount>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.onap.sdc.common</groupId>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-logging-core</artifactId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
package org.openecomp.sdc.validation.impl.validators;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.validation.Validator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import java.util.Map;
/**
* @author Avrahamg
package org.openecomp.sdc.validation.impl.validators;
+import org.junit.Assert;
import org.junit.Test;
import org.openecomp.core.validation.ErrorMessageCode;
import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
import org.openecomp.sdc.common.errors.Messages;
-import org.testng.Assert;
public class ErrorMessagesTest {
-package org.openecomp.sdc.validation.impl.validators;
+/*
+ * 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.
+ */
-import org.openecomp.core.validation.types.MessageContainer;
-import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+package org.openecomp.sdc.validation.impl.validators;
import java.io.IOException;
import java.util.Map;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openecomp.core.validation.types.MessageContainer;
+import org.openecomp.sdc.validation.util.ValidationTestUtil;
/**
* Created by TALIO on 2/16/2017.
private static String mockConfigFileName =
"/org/openecomp/validation/configuration/mock_resource_validator_configuration.json";
- ForbiddenResourceGuideLineValidator forbiddenResourceGuideLineValidator = new
+ private static ForbiddenResourceGuideLineValidator forbiddenResourceGuideLineValidator = new
ForbiddenResourceGuideLineValidator();
@BeforeClass
- public void init() throws IOException {
+ public static void init() throws IOException {
Map<String, Object> resourcesMap = ValidationTestUtil.getResourceMap(mockConfigFileName);
Map<String, Object> resourceBaseValidatorMap =
(Map<String, Object>) resourcesMap.get("forbiddenResourceGuideLineValidator");
- String implementationClass =
- (String) resourceBaseValidatorMap.get("implementationClass");
Map<String, Object> properties =
(Map<String, Object>) resourceBaseValidatorMap.get("properties");
+/*
+ * 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.validation.impl.validators;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.validation.Validator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
public class HeatResourceValidatorTest {
package org.openecomp.sdc.validation.impl.validators;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.validation.Validator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
public class HeatValidatorTest {
package org.openecomp.sdc.validation.impl.validators;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.common.utils.SdcCommon;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
public class ManifestValidatorTest {
+/*
+ * 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.validation.impl.validators;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.validation.Validator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* Created by TALIO on 2/15/2017.
package org.openecomp.sdc.validation.impl.validators;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.common.errors.Messages;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
public class YamlValidatorTest {
+/*
+ * 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.validation.impl.validators.heatresource;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
package org.openecomp.sdc.validation.impl.validators.heatresource;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.GlobalValidationContext;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.Resource;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-import java.util.Optional;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.heatresource;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.heatresource;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.heatresource;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.heatresource;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
package org.openecomp.sdc.validation.impl.validators.heatresource;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
package org.openecomp.sdc.validation.impl.validators.heatresource;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* @author KATYR
+/*
+ * 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.validation.impl.validators.namingconvention;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.namingconvention;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.namingconvention;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.NamingConventionGuideLineValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.namingconvention;
+import java.io.IOException;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.NamingConventionGuideLineValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Map;
/**
* Created by TALIO on 2/28/2017.
+/*
+ * 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.validation.impl.validators.namingconvention;
import java.util.Map;
-
+import org.junit.Assert;
+import org.junit.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
import org.openecomp.sdc.validation.impl.validators.NamingConventionGuideLineValidator;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
public class VirtualMachineInterfaceGuidelineValidatorTest {
private static final String PATH =
package org.openecomp.sdc.validation.util;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.core.utilities.json.JsonUtil;
import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
import org.openecomp.sdc.validation.ValidationContext;
import org.openecomp.sdc.validation.Validator;
import org.openecomp.sdc.validation.base.ResourceBaseValidator;
-import org.testng.Assert;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
/**
* @author TALIO
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>openecomp-nosqldb-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.openecomp.sdc.core</groupId>
<artifactId>openecomp-config-lib</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.all.version}</version>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
package org.openecomp.sdc.vendorsoftwareproduct.dao;
-import com.amdocs.zusammen.adaptor.inbound.api.types.item.*;
+import com.amdocs.zusammen.adaptor.inbound.api.types.item.Element;
+import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementConflict;
+import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo;
+import com.amdocs.zusammen.adaptor.inbound.api.types.item.ItemVersionConflict;
+import com.amdocs.zusammen.adaptor.inbound.api.types.item.ZusammenElement;
import com.amdocs.zusammen.commons.health.data.HealthInfo;
import com.amdocs.zusammen.datatypes.Id;
import com.amdocs.zusammen.datatypes.SessionContext;
-import com.amdocs.zusammen.datatypes.item.*;
+import com.amdocs.zusammen.datatypes.item.ElementContext;
+import com.amdocs.zusammen.datatypes.item.Info;
+import com.amdocs.zusammen.datatypes.item.Item;
+import com.amdocs.zusammen.datatypes.item.ItemVersion;
+import com.amdocs.zusammen.datatypes.item.ItemVersionData;
+import com.amdocs.zusammen.datatypes.item.ItemVersionStatus;
+import com.amdocs.zusammen.datatypes.item.Resolution;
import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions;
import com.amdocs.zusammen.datatypes.itemversion.Tag;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
import org.onap.sdc.tosca.services.YamlUtil;
import org.openecomp.core.utilities.CommonMethods;
import org.openecomp.sdc.model.impl.zusammen.ServiceModelDaoZusammenImpl;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.io.ByteArrayInputStream;
-import java.util.*;
public class ServiceModelDaoFactoryTest {
private static String artifact001;
private static final String tenant = "dox";
- @BeforeMethod
+ @Before
public void setUp(){
SessionContextProviderFactory.getInstance().createInterface().create("test", tenant);
}
- @AfterMethod
- public void tearDaown(){
+ @After
+ public void tearDown(){
SessionContextProviderFactory.getInstance().createInterface().close();
}
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- <version>${mockito.all.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <version>${testng.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>snakeyaml</artifactId>
- <groupId>org.yaml</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
+/*
+ * 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.versioning.dao.impl.zusammen;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
+
import com.amdocs.zusammen.datatypes.Id;
import com.amdocs.zusammen.datatypes.item.Info;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openecomp.core.zusammen.api.ZusammenAdaptor;
-import org.openecomp.sdc.common.session.SessionContextProviderFactory;
-import org.openecomp.sdc.versioning.dao.types.VersionStatus;
-import org.openecomp.sdc.versioning.types.Item;
-import org.openecomp.sdc.versioning.types.ItemStatus;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
-import static org.testng.Assert.assertEquals;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.openecomp.core.zusammen.api.ZusammenAdaptor;
+import org.openecomp.sdc.common.session.SessionContextProviderFactory;
+import org.openecomp.sdc.versioning.dao.types.VersionStatus;
+import org.openecomp.sdc.versioning.types.Item;
+import org.openecomp.sdc.versioning.types.ItemStatus;
public class ItemZusammenDaoImplTest {
@InjectMocks
private ItemZusammenDaoImpl itemDao;
- @BeforeMethod
+ @Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
SessionContextProviderFactory.getInstance().createInterface().create(USER, tenant);
doReturn(returnedItems).when(zusammenAdaptorMock).listItems(eq(createZusammenContext(USER)));
Collection<Item> items = itemDao.list();
- Assert.assertEquals(items.size(), 3);
+ assertEquals(items.size(), 3);
Iterator<Item> itemIterator = items.iterator();
assertItemEquals(itemIterator.next(), returnedItems.get(0));
Item item = itemDao.create(inputItem);
Info capturedInfo = capturedZusammenInfo.getValue();
- Assert.assertEquals(capturedInfo.getName(), inputItem.getName());
- Assert.assertEquals(capturedInfo.getDescription(), inputItem.getDescription());
- Assert.assertEquals(capturedInfo.getProperty(ITEM_TYPE), inputItem.getType());
- Assert.assertEquals(capturedInfo.getProperty(ITEM_VERSIONS_STATUSES),
+ assertEquals(capturedInfo.getName(), inputItem.getName());
+ assertEquals(capturedInfo.getDescription(), inputItem.getDescription());
+ assertEquals(capturedInfo.getProperty(ITEM_TYPE), inputItem.getType());
+ assertEquals(capturedInfo.getProperty(ITEM_VERSIONS_STATUSES),
inputItem.getVersionStatusCounters());
- Assert.assertEquals(item.getId(), itemId);
- Assert.assertEquals(item.getName(), inputItem.getName());
- Assert.assertEquals(item.getDescription(), inputItem.getDescription());
- Assert.assertEquals(item.getType(), inputItem.getType());
- Assert.assertEquals(item.getVersionStatusCounters(), inputItem.getVersionStatusCounters());
+ assertEquals(item.getId(), itemId);
+ assertEquals(item.getName(), inputItem.getName());
+ assertEquals(item.getDescription(), inputItem.getDescription());
+ assertEquals(item.getType(), inputItem.getType());
+ assertEquals(item.getVersionStatusCounters(), inputItem.getVersionStatusCounters());
}
@Test
capturedZusammenInfo.capture());
Info capturedInfo = capturedZusammenInfo.getValue();
- Assert.assertEquals(capturedInfo.getName(), item.getName());
- Assert.assertEquals(capturedInfo.getDescription(), item.getDescription());
- Assert.assertEquals(capturedInfo.getProperty(ITEM_TYPE), item.getType());
- Assert.assertEquals(capturedInfo.getProperty(ITEM_VERSIONS_STATUSES),
+ assertEquals(capturedInfo.getName(), item.getName());
+ assertEquals(capturedInfo.getDescription(), item.getDescription());
+ assertEquals(capturedInfo.getProperty(ITEM_TYPE), item.getType());
+ assertEquals(capturedInfo.getProperty(ITEM_VERSIONS_STATUSES),
item.getVersionStatusCounters());
}
}
private void assertItemEquals(Item item, com.amdocs.zusammen.datatypes.item.Item zusammenItem) {
- Assert.assertEquals(item.getId(), zusammenItem.getId().getValue());
- Assert.assertEquals(item.getName(), zusammenItem.getInfo().getName());
- Assert.assertEquals(item.getDescription(), zusammenItem.getInfo().getDescription());
- Assert.assertEquals(item.getType(), zusammenItem.getInfo().getProperty(ITEM_TYPE));
- Assert.assertEquals(item.getProperties().get(APP_PROP_1),
+ assertEquals(item.getId(), zusammenItem.getId().getValue());
+ assertEquals(item.getName(), zusammenItem.getInfo().getName());
+ assertEquals(item.getDescription(), zusammenItem.getInfo().getDescription());
+ assertEquals(item.getType(), zusammenItem.getInfo().getProperty(ITEM_TYPE));
+ assertEquals(item.getProperties().get(APP_PROP_1),
zusammenItem.getInfo().getProperty(APP_PROP_1));
- Assert.assertEquals(item.getProperties().get(APP_PROP_2),
+ assertEquals(item.getProperties().get(APP_PROP_2),
zusammenItem.getInfo().getProperty(APP_PROP_2));
Map<String, Number> zusammenStatusesMap =
zusammenItem.getInfo().getProperty(ITEM_VERSIONS_STATUSES);
Map<VersionStatus, Integer> statusesMap = item.getVersionStatusCounters();
- zusammenStatusesMap.entrySet().forEach(entry -> Assert
- .assertEquals(statusesMap.get(VersionStatus.valueOf(entry.getKey())), entry.getValue()));
+ zusammenStatusesMap.entrySet()
+ .forEach(entry -> assertEquals(statusesMap.get(VersionStatus.valueOf(entry.getKey())), entry.getValue()));
- Assert.assertEquals(item.getCreationTime(), zusammenItem.getCreationTime());
- Assert.assertEquals(item.getModificationTime(), zusammenItem.getModificationTime());
+ assertEquals(item.getCreationTime(), zusammenItem.getCreationTime());
+ assertEquals(item.getModificationTime(), zusammenItem.getModificationTime());
}
}
\ No newline at end of file
+/*
+ * 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.versioning.dao.impl.zusammen;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
+
import com.amdocs.zusammen.datatypes.Id;
import com.amdocs.zusammen.datatypes.SessionContext;
-import com.amdocs.zusammen.datatypes.item.*;
+import com.amdocs.zusammen.datatypes.item.Info;
+import com.amdocs.zusammen.datatypes.item.ItemVersion;
+import com.amdocs.zusammen.datatypes.item.ItemVersionData;
+import com.amdocs.zusammen.datatypes.item.ItemVersionStatus;
+import com.amdocs.zusammen.datatypes.item.SynchronizationStatus;
import com.amdocs.zusammen.datatypes.itemversion.ItemVersionRevisions;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.openecomp.sdc.versioning.dao.types.Revision;
import org.openecomp.sdc.versioning.dao.types.Version;
import org.openecomp.sdc.versioning.dao.types.VersionStatus;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
public class VersionZusammenDaoImplTest {
@InjectMocks
private VersionZusammenDaoImpl versionDao;
- @BeforeMethod
+ @Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
SessionContextProviderFactory.getInstance().createInterface().create(USER, tenant);
+/*
+ * 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.versioning.impl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.openecomp.sdc.versioning.dao.ItemDao;
import org.openecomp.sdc.versioning.dao.types.VersionStatus;
import org.openecomp.sdc.versioning.types.Item;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-import static org.testng.Assert.*;
public class AsdcItemManagerImplTest {
@InjectMocks
private AsdcItemManagerImpl itemManager;
- @BeforeMethod
+ @Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
}
+/*
+ * 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.versioning.impl;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.openecomp.sdc.versioning.dao.ItemDao;
import org.openecomp.sdc.versioning.types.Item;
import org.openecomp.sdc.versioning.types.ItemStatus;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.mockito.Mockito.verify;
-import static org.testng.Assert.assertEquals;
public class ItemManagerImplTest {
- private static final String USER = "user1";
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
private static final String ITEM_ID = "item1";
private static final String ITEM_NAME = "item 1 name";
private static final String ITEM_TYPE_A = "A";
private static final String ITEM_TYPE_B = "B";
- private static final String tenant = "dox";
@Mock
private ItemDao itemDao;
@Mock
@InjectMocks
private ItemManagerImpl itemManager;
- @BeforeMethod
+ @Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
}
- @AfterMethod
+ @After
public void tearDown(){
itemManager = null;
}
@Test
- public void ArchiveTest(){
+ public void archiveTest(){
Item item = createItem(ITEM_ID,ITEM_NAME,ITEM_TYPE_A);
itemManager.archive(item);
assertEquals(item.getStatus(), ItemStatus.ARCHIVED);
}
- @Test(expectedExceptions = CoreException.class,expectedExceptionsMessageRegExp =
- "Archive item failed, item .* is already Archived")
- public void ArchiveTestNegative(){
+ @Test
+ public void archiveTestNegative(){
+
+ expectedException.expect(CoreException.class);
+ expectedException.expectMessage(new RegexMatcher("Archive item failed, item .* is already Archived"));
Item item = createItem(ITEM_ID,ITEM_NAME,ITEM_TYPE_B);
item.setStatus(ItemStatus.ARCHIVED);
}
@Test
- public void RestoreTest(){
+ public void restoreTest(){
Item item = createItem(ITEM_ID,ITEM_NAME,ITEM_TYPE_A);
item.setStatus(ItemStatus.ARCHIVED);
assertEquals(item.getStatus(), ItemStatus.ACTIVE);
}
- @Test(expectedExceptions = CoreException.class,expectedExceptionsMessageRegExp =
- "Restore item failed, item .* is already Active")
- public void RestoreTestNegative(){
+ @Test
+ public void restoreTestNegative(){
+
+ expectedException.expect(CoreException.class);
+ expectedException.expectMessage(new RegexMatcher("Restore item failed, item .* is already Active"));
Item item = createItem(ITEM_ID,ITEM_NAME,ITEM_TYPE_B);
item.setStatus(ItemStatus.ACTIVE);
itemManager.restore(item);
-
}
-
private Item createItem(String id, String name, String type) {
Item item = new Item();
item.setId(id);
item.setType(type);
return item;
}
+
+ private static class RegexMatcher extends TypeSafeMatcher<String> {
+
+ private final String regex;
+
+ private RegexMatcher(String regex) {
+ this.regex = regex;
+ }
+
+ @Override
+ protected boolean matchesSafely(String s) {
+ return s.matches(regex);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Regular expression: " + regex);
+ }
+ }
}
package org.openecomp.sdc.versioning.impl;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.openecomp.sdc.versioning.dao.types.SynchronizationState.OutOfSync;
+import static org.openecomp.sdc.versioning.dao.types.SynchronizationState.UpToDate;
+import static org.openecomp.sdc.versioning.dao.types.VersionStatus.Certified;
+import static org.openecomp.sdc.versioning.dao.types.VersionStatus.Draft;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.openecomp.sdc.versioning.ItemManager;
import org.openecomp.sdc.versioning.VersionCalculator;
import org.openecomp.sdc.versioning.dao.VersionDao;
-import org.openecomp.sdc.versioning.dao.types.*;
+import org.openecomp.sdc.versioning.dao.types.Revision;
+import org.openecomp.sdc.versioning.dao.types.SynchronizationState;
+import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.dao.types.VersionState;
+import org.openecomp.sdc.versioning.dao.types.VersionStatus;
import org.openecomp.sdc.versioning.types.VersionCreationMethod;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
-import static org.openecomp.sdc.versioning.dao.types.SynchronizationState.OutOfSync;
-import static org.openecomp.sdc.versioning.dao.types.SynchronizationState.UpToDate;
-import static org.openecomp.sdc.versioning.dao.types.VersionStatus.Certified;
-import static org.openecomp.sdc.versioning.dao.types.VersionStatus.Draft;
public class VersioningManagerImplTest {
private static final String ITEM_ID = "itemId";
private static final String VERSION_ID = "versionId";
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@Mock
private VersionDao versionDaoMock;
@Mock
@InjectMocks
private VersioningManagerImpl versioningManager;
- @BeforeMethod
+ @Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
}
@Test
- public void testListWhenNone() throws Exception {
+ public void testListWhenNone() {
doReturn(new ArrayList<>()).when(versionDaoMock).list(ITEM_ID);
List<Version> versions = versioningManager.list(ITEM_ID);
}
@Test
- public void testList() throws Exception {
+ public void testList() {
List<Version> returnedVersions = Stream.of(createVersion("1", null, null, false),
createVersion("2", null, null, false),
createVersion("3", null, null, false)).collect(Collectors.toList());
Assert.assertEquals(versions, returnedVersions);
}
- @Test(expectedExceptions = Exception.class)
+ @Test(expected = Exception.class)
public void testGetNonExisting() throws Exception {
Version version = new Version(VERSION_ID);
}
@Test
- public void testGetNonExistingForUser() throws Exception {
+ public void testGetNonExistingForUser() {
Version requestedVersion = new Version(VERSION_ID);
Version returnedVersion = createVersion(VERSION_ID, Draft, UpToDate, false);
}
@Test
- public void testGetOutOfSyncCertified() throws Exception {
+ public void testGetOutOfSyncCertified() {
Version requestedVersion = new Version(VERSION_ID);
Version returnedVersion = createVersion(VERSION_ID, Certified, UpToDate, false);
}
@Test
- public void testGet() throws Exception {
+ public void testGet() {
Version requestedVersion = new Version(VERSION_ID);
Version returnedVersion = createVersion(VERSION_ID, Draft, OutOfSync, true);
}
@Test
- public void testCreate() throws Exception {
+ public void testCreate() {
Version requestedVersion = new Version();
String versionName = "versionName";
}
@Test
- public void testCreateBasedOn() throws Exception {
+ public void testCreateBasedOn() {
Version requestedVersion = new Version();
requestedVersion.setBaseId("baseVersionId");
verify(versionDaoMock).publish(eq(ITEM_ID), eq(requestedVersion), eq("Create version: 4.0"));
}
- @Test(expectedExceptions = CoreException.class, expectedExceptionsMessageRegExp =
- "Item itemId: create version failed, a version with the name 2.0 already exist")
- public void testCreateWithExistingName() throws Exception {
+ @Test
+ public void testCreateWithExistingName() {
+
+ expectedException.expect(CoreException.class);
+ expectedException.expectMessage("Item itemId: create version failed, a version with the name 2.0 already exist");
+
Version version = new Version();
version.setBaseId("baseVersionId");
versioningManager.create(ITEM_ID, version, VersionCreationMethod.major);
}
- @Test(expectedExceptions = CoreException.class, expectedExceptionsMessageRegExp =
- "Item itemId: submit version failed, version versionId is already Certified")
- public void testSubmitCertified() throws Exception {
+ @Test
+ public void testSubmitCertified() {
+
+ expectedException.expect(CoreException.class);
+ expectedException.expectMessage("Item itemId: submit version failed, version versionId is already Certified");
+
Version version = new Version(VERSION_ID);
Version returnedVersion = createVersion(VERSION_ID, Certified, UpToDate, false);
}
@Test
- public void testSubmit() throws Exception {
+ public void testSubmit() {
Version version = new Version(VERSION_ID);
ArgumentCaptor<Version> versionArgumentCaptor = ArgumentCaptor.forClass(Version.class);
}
@Test
- public void testPublish() throws Exception {
+ public void testPublish() {
Version version = new Version(VERSION_ID);
String publishDescription = "Publish message";
}
@Test
- public void testSync() throws Exception {
+ public void testSync() {
Version version = new Version(VERSION_ID);
versioningManager.sync(ITEM_ID, version);
}
@Test
- public void testForceSync() throws Exception {
+ public void testForceSync() {
Version version = new Version(VERSION_ID);
versioningManager.forceSync(ITEM_ID, version);
}
@Test
- public void testRevert() throws Exception {
+ public void testRevert() {
Version version = new Version(VERSION_ID);
String revisionId = "revisionId";
}
@Test
- public void testListRevisions() throws Exception {
+ public void testListRevisions() {
Version version = new Version(VERSION_ID);
List<Revision> returnedRevisions =
version.setState(state);
return version;
}
-
-/*
- private static final String USR1 = "usr1";
- private static final String USR2 = "usr2";
- private static final String TYPE1 = "Type1";
-*/
-/* private static final String TYPE2 = "Type2";*//*
-
- private static final String ID1 = "Id1";
-*/
-/* private static final String ID2 = "Id2";
- private static final String ID3 = "Id3";
- private static final String TYPE1_TABLE_NAME = "vendor_license_model";
- private static final String TYPE1_ID_NAME = "vlm_id";
- private static final String TYPE1_VERSION_NAME = "version";
- private static final String TYPE2_TABLE_NAME = "feature_group";
- private static final String TYPE2_ID_NAME = "vlm_id";
- private static final String TYPE2_VERSION_NAME = "version";*//*
-
- private static final Version VERSION0 = new Version(0, 0);
- private static final Version VERSION01 = new Version(0, 1);
- private static final Version VERSION02 = new Version(0, 2);
- private static final Version VERSION10 = new Version(1, 0);
- private static final Version VERSION11 = new Version(1, 1);
-
- */
-/* private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
-
- private static UDTMapper<Version> versionMapper =
- noSqlDb.getMappingManager().udtMapper(Version.class);*//*
-
- @Mock
- private VersionInfoDao versionInfoDaoMock;
- @Mock
- private VersionInfoDeletedDao versionInfoDeletedDaoMock;
- @InjectMocks
- private VersioningManagerImpl versioningManager;
-
- @Captor
- private ArgumentCaptor<VersionInfoEntity> versionInfoEntityArg;
-
- @BeforeMethod
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- }
-
- */
-/* @BeforeClass
- private void init() {
- versionInfoDaoMock.delete(new VersionInfoEntity(TYPE1, ID1));
- versionInfoDaoMock.delete(new VersionInfoEntity(TYPE1, ID2));
- versionInfoDaoMock.delete(new VersionInfoEntity(TYPE2, ID3));
- String deleteFromType1 = String
- .format("delete from %s where %s=? and %s=?", TYPE1_TABLE_NAME, TYPE1_ID_NAME,
- TYPE1_VERSION_NAME);
- noSqlDb.execute(deleteFromType1, ID1, versionMapper.toUDT(VERSION01));
- noSqlDb.execute(deleteFromType1, ID1, versionMapper.toUDT(VERSION02));
- noSqlDb.execute(deleteFromType1, ID1, versionMapper.toUDT(VERSION11));
-
- versioningManager.register(TYPE1,
- new VersionableEntityMetadata(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME));
- versioningManager.register(TYPE2,
- new VersionableEntityMetadata(TYPE2_TABLE_NAME, TYPE2_ID_NAME, TYPE2_VERSION_NAME));
- }*//*
-
-
-*/
-/* @Test
- public void testRegister() throws Exception {
- VersionableEntityMetadata entityMetadata =
- new VersionableEntityMetadata(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME);
- versioningManager.register(TYPE1, entityMetadata);
-
- Map<String, Set<VersionableEntityMetadata>> versionableEntities =
- versionableEntitiesCapture.capture();
- Set<VersionableEntityMetadata> type1Entities = versionableEntities.get(TYPE1);
- Assert.assertNotNull(type1Entities);
- Assert.assertTrue(type1Entities.contains(entityMetadata));
- }*//*
-
-
- @Test(expectedExceptions = CoreException.class)
- public void testCreateAlreadyExisting() {
- doReturn(new VersionInfoEntity()).when(versionInfoDaoMock).get(anyObject());
- versioningManager.create(TYPE1, ID1, USR1);
- }
-
- @Test
- public void testCreate() {
- Version version = versioningManager.create(TYPE1, ID1, USR1);
- Assert.assertEquals(version, VERSION01);
-
-*/
-/* createVersionableEntityRecord(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME, ID1,
- version);*//*
-
- verify(versionInfoDaoMock).create(versionInfoEntityArg.capture());
- VersionInfoEntity versionInfoEntity = versionInfoEntityArg.getValue();
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, new Version(0, 0), VERSION01, USR1,
- VersionStatus.Locked, new HashSet<>(), null);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testDeleteNonExisting() {
- versioningManager.delete(TYPE1, ID1, USR1);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testDeleteLocked() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR1, VERSION01), Collections.emptySet(), null);
- versioningManager.delete(TYPE1, ID1, USR1);
- }
-
- @Test
- public void testDelete() {
- VersionInfoEntity versionInfoEntity = new VersionInfoEntity();
- versionInfoEntity.setStatus(VersionStatus.Draft);
- doReturn(versionInfoEntity).when(versionInfoDaoMock).get(anyObject());
-
- versioningManager.delete(TYPE1, ID1, USR1);
-
- verify(versionInfoDaoMock).delete(versionInfoEntity);
- ArgumentCaptor<VersionInfoDeletedEntity> versionInfoDeletedEntityArg =
- ArgumentCaptor.forClass(VersionInfoDeletedEntity.class);
- verify(versionInfoDeletedDaoMock).create(versionInfoDeletedEntityArg.capture());
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testUndoDeleteNonExisting() {
- versioningManager.undoDelete(TYPE1, ID1, USR1);
- }
-
- @Test
- public void testUndoDelete() {
- VersionInfoDeletedEntity versionInfoDeletedEntity = new VersionInfoDeletedEntity();
- versionInfoDeletedEntity.setStatus(VersionStatus.Draft);
- doReturn(versionInfoDeletedEntity).when(versionInfoDeletedDaoMock).get(anyObject());
-
- versioningManager.undoDelete(TYPE1, ID1, USR1);
-
- verify(versionInfoDeletedDaoMock).delete(versionInfoDeletedEntity);
- verify(versionInfoDaoMock).create(versionInfoEntityArg.capture());
-*/
-/*
- VersionInfoDeletedEntity versionInfoDeletedEntity =
- versionInfoDeletedDaoMock.get(new VersionInfoDeletedEntity(TYPE1, ID1));
- Assert.assertNotNull(versionInfoDeletedEntity);
-
- Map<String, VersionInfo> entitiesInfoMap =
- versioningManager.listDeletedEntitiesVersionInfo(TYPE1, USR2, null);
- Assert.assertEquals(entitiesInfoMap.size(), 1);
- VersionInfoEntity versionInfoEntity = versionInfoDaoMock.get(new VersionInfoEntity(TYPE1, ID1));
- Assert.assertNull(versionInfoEntity);
- versioningManager.undoDelete(TYPE1, ID1, USR1);
- versionInfoEntity = versionInfoDaoMock.get(new VersionInfoEntity(TYPE1, ID1));
- Assert.assertNotNull(versionInfoEntity);*//*
-
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckoutNonExisting() {
- versioningManager.checkout(TYPE1, ID1, USR2);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckoutOnLockedSameUser() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR1, VERSION01), Collections.emptySet(), null);
- versioningManager.checkout(TYPE1, ID1, USR1);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckoutOnLockedOtherUser() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR2, VERSION01), Collections.emptySet(), null);
- versioningManager.checkout(TYPE1, ID1, USR1);
- }
-
- @Test
- public void testCheckoutOnFinalized() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION10);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Certified, VERSION10, null, viewableVersions,
- VERSION10);
-
- Version version = versioningManager.checkout(TYPE1, ID1, USR1);
- Assert.assertEquals(version, VERSION11);
-
- VersionInfoEntity versionInfoEntity = versionInfoDaoMock.get(new VersionInfoEntity(TYPE1, ID1));
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, VERSION10, VERSION11, USR1,
- VersionStatus.Locked, viewableVersions, VERSION10);
-*/
-/*
- ResultSet results =
- loadVersionableEntityRecord(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME, ID1,
- VERSION11);
- Assert.assertTrue(results.iterator().hasNext());*//*
-
- }
-
- @Test
- public void testCheckout() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, VERSION01, null, viewableVersions,
- null);
-
- Version version = versioningManager.checkout(TYPE1, ID1, USR1);
- Assert.assertEquals(version, VERSION02);
-
- verify(versionInfoDaoMock).update(versionInfoEntityArg.capture());
- VersionInfoEntity versionInfoEntity = versionInfoEntityArg.getValue();
-
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, VERSION01, VERSION02, USR1,
- VersionStatus.Locked, viewableVersions, null);
-
-*/
-/* ResultSet results =
- loadVersionableEntityRecord(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME, ID1,
- VERSION02);
- Assert.assertTrue(results.iterator().hasNext());*//*
-
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testUndoCheckoutNonExisting() {
- versioningManager.undoCheckout(TYPE1, ID1, USR1);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testUndoCheckoutOnAvailable() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, VERSION01, null, viewableVersions,
- null);
-
- versioningManager.undoCheckout(TYPE1, ID1, USR1);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testUndoCheckouOnFinalized() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION10);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Certified, VERSION10, null, viewableVersions,
- VERSION10);
- versioningManager.undoCheckout(TYPE1, ID1, USR2);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testUndoCheckoutOnLockedOtherUser() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR2, VERSION01), Collections.emptySet(), null);
-
- versioningManager.undoCheckout(TYPE1, ID1, USR1);
- }
-
- @Test
- public void testUndoCheckout() {
- HashSet<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION01,
- new UserCandidateVersion(USR1, VERSION02), viewableVersions, null);
-
- Version version = versioningManager.undoCheckout(TYPE1, ID1, USR1);
- Assert.assertEquals(version, VERSION01);
-
- VersionInfoEntity versionInfoEntity = versionInfoDaoMock.get(new VersionInfoEntity(TYPE1, ID1));
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, VERSION01, null, null,
- VersionStatus.Draft, viewableVersions, null);
-
-*/
-/* ResultSet results =
- loadVersionableEntityRecord(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME, ID1,
- VERSION02);
- Assert.assertFalse(results.iterator().hasNext());*//*
-
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckinNonExisting() {
- versioningManager.checkin(TYPE1, ID1, USR1, "");
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckinOnAvailable() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, VERSION01, null, viewableVersions,
- null);
-
- versioningManager.checkin(TYPE1, ID1, USR1, "fail checkin");
- }
-
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckinOnFinalized() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION10);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Certified, VERSION10, null, viewableVersions,
- VERSION10);
-
- versioningManager.checkin(TYPE1, ID1, USR1, "failed checkin");
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testCheckinOnLockedOtherUser() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR2, VERSION01), Collections.emptySet(), null);
-
- versioningManager.checkin(TYPE1, ID1, USR1, "");
- }
-
- @Test
- public void testCheckin() {
- HashSet<Version> viewableVersions = new HashSet<>();
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR1, VERSION01), viewableVersions, null);
-
- Version version = versioningManager.checkin(TYPE1, ID1, USR1, "checkin 0.1");
- Assert.assertEquals(version, VERSION01);
-
- verify(versionInfoDaoMock).update(versionInfoEntityArg.capture());
- VersionInfoEntity versionInfoEntity = versionInfoEntityArg.getValue();
-
- viewableVersions.add(VERSION01);
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, VERSION01, null, null,
- VersionStatus.Draft, viewableVersions, null);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testSubmitNonExisting() {
- versioningManager.submit(TYPE1, ID1, USR2, "failed submit");
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testSubmitOnLocked() {
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION0,
- new UserCandidateVersion(USR1, VERSION01), Collections.emptySet(), null);
- versioningManager.submit(TYPE1, ID1, USR2, "failed submit");
- }
-
-
- @Test(expectedExceptions = CoreException.class)
- public void testSubmitOnFinalized() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION10);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Certified, VERSION10, null, viewableVersions,
- VERSION10);
- versioningManager.submit(TYPE1, ID1, USR2, "failed submit");
- }
-
- @Test
- public void testSubmit() {
- Version version32 = new Version(3, 2);
- Version version40 = new Version(4, 0);
-
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION10);
- viewableVersions.add(new Version(2, 0));
- viewableVersions.add(new Version(3, 0));
- viewableVersions.add(new Version(3, 1));
- viewableVersions.add(version32);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, version32, null, viewableVersions,
- new Version(3, 0));
-
- Version version = versioningManager.submit(TYPE1, ID1, USR1, "submit msg");
- Assert.assertEquals(version, version40);
- viewableVersions.remove(new Version(3, 1));
- viewableVersions.remove(version32);
- viewableVersions.add(version40);
-
- verify(versionInfoDaoMock).update(versionInfoEntityArg.capture());
- VersionInfoEntity versionInfoEntity = versionInfoEntityArg.getValue();
-
- assretVersionInfoEntity(versionInfoEntity, TYPE1, ID1, version40, null, null,
- VersionStatus.Certified, viewableVersions, version40);
-
-*/
-/* ResultSet results =
- loadVersionableEntityRecord(TYPE1_TABLE_NAME, TYPE1_ID_NAME, TYPE1_VERSION_NAME, ID1,
- VERSION10);
- Assert.assertTrue(results.iterator().hasNext());*//*
-
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testGetVersionInfoOnNonExistingEntity() {
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Read);
- }
-
- @Test
- public void testGetVersionInfoForReadOnAvailable() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, VERSION01, null, viewableVersions,
- null);
-
- VersionInfo versionInfo =
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Read);
- assertVersionInfo(versionInfo, VERSION01, VersionStatus.Draft, null,
- viewableVersions, null);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testGetVersionInfoForWriteOnAvailable() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Draft, VERSION01, null, viewableVersions,
- null);
-
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Write);
- }
-
- @Test
- public void testGetVersionInfoForReadOnLockedSameUser() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION01,
- new UserCandidateVersion(USR1, VERSION02), viewableVersions, null);
-
- VersionInfo versionInfo =
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Read);
- viewableVersions.add(VERSION02);
- assertVersionInfo(versionInfo, VERSION02, VersionStatus.Locked, USR1, viewableVersions, null);
- }
-
- @Test
- public void testGetVersionInfoForReadOnLockedOtherUser() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION01,
- new UserCandidateVersion(USR2, VERSION02), viewableVersions, null);
-
- VersionInfo versionInfo =
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Read);
- Assert.assertEquals(versionInfo.getActiveVersion(), VERSION01);
- assertVersionInfo(versionInfo, VERSION01, VersionStatus.Locked, USR2, viewableVersions, null);
- }
-
- @Test(expectedExceptions = CoreException.class)
- public void testGetVersionInfoForWriteOnLockedOtherUser() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION01,
- new UserCandidateVersion(USR2, VERSION02), viewableVersions, null);
-
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Write);
- }
-
- @Test
- public void testGetVersionInfoForWriteOnLockedSameUser() {
- Set<Version> viewableVersions = new HashSet<>();
- viewableVersions.add(VERSION01);
- mockVersionInfoEntity(TYPE1, ID1, VersionStatus.Locked, VERSION01,
- new UserCandidateVersion(USR1, VERSION02), viewableVersions, null);
-
- VersionInfo versionInfo =
- versioningManager.getEntityVersionInfo(TYPE1, ID1, USR1, VersionableEntityAction.Write);
- viewableVersions.add(VERSION02);
- assertVersionInfo(versionInfo, VERSION02, VersionStatus.Locked, USR1, viewableVersions, null);
- }
-
-*/
-/* private void createVersionableEntityRecord(String tableName, String idName, String versionName,
- String id, Version version) {
- noSqlDb.execute(
- String.format("insert into %s (%s,%s) values (?,?)", tableName, idName, versionName), id,
- versionMapper.toUDT(version));
- }
-
- private ResultSet loadVersionableEntityRecord(String tableName, String idName, String versionName,
- String id, Version version) {
- return noSqlDb.execute(
- String.format("select * from %s where %s=? and %s=?", tableName, idName, versionName), id,
- versionMapper.toUDT(version));
- }*//*
-
-
-
- private static void assretVersionInfoEntity(VersionInfoEntity actual, String entityType,
- String entityId, Version activeVersion,
- Version candidateVersion, String candidateUser,
- VersionStatus status, Set<Version> viewbleVersions,
- Version latestFinalVersion) {
- Assert.assertNotNull(actual);
- Assert.assertEquals(actual.getEntityType(), entityType);
- Assert.assertEquals(actual.getEntityId(), entityId);
- Assert.assertEquals(actual.getActiveVersion(), activeVersion);
- if (candidateVersion != null && candidateUser != null) {
- Assert.assertEquals(actual.getCandidate().getVersion(), candidateVersion);
- Assert.assertEquals(actual.getCandidate().getUser(), candidateUser);
- } else {
- Assert.assertNull(actual.getCandidate());
- }
- Assert.assertEquals(actual.getStatus(), status);
- Assert.assertEquals(actual.getViewableVersions().size(), viewbleVersions.size());
- Assert.assertEquals(actual.getViewableVersions(), viewbleVersions);
- Assert.assertEquals(actual.getLatestFinalVersion(), latestFinalVersion);
- }
-
- private static void assertVersionInfo(VersionInfo actual, Version activeVersion,
- VersionStatus status, String lockingUser,
- Set<Version> viewableVersions, Version latestFinalVersion) {
- Assert.assertNotNull(actual);
- Assert.assertEquals(actual.getActiveVersion(), activeVersion);
- Assert.assertEquals(actual.getStatus(), status);
- Assert.assertEquals(actual.getLockingUser(), lockingUser);
- Assert.assertEquals(actual.getViewableVersions().size(), viewableVersions.size());
- Assert.assertEquals(actual.getViewableVersions(), viewableVersions);
- Assert.assertEquals(actual.getLatestFinalVersion(), latestFinalVersion);
- }
-
- private VersionInfoEntity mockVersionInfoEntity(String entityType, String entityId,
- VersionStatus status, Version activeVersion,
- UserCandidateVersion candidate,
- Set<Version> viewableVersions,
- Version latestFinalVersion) {
- VersionInfoEntity mock = new VersionInfoEntity();
- mock.setEntityType(entityType);
- mock.setEntityId(entityId);
- mock.setStatus(status);
- mock.setActiveVersion(activeVersion);
- mock.setCandidate(candidate);
- mock.setViewableVersions(viewableVersions);
- mock.setLatestFinalVersion(latestFinalVersion);
-
- doReturn(mock).when(versionInfoDaoMock).get(anyObject());
- return mock;
- }
-*/
}
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+<!--
+ ~ 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.
+ -->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito.all.version}</version>
</dependency>
<dependency>
<groupId>org.openecomp.sdc</groupId>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
<properties>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Code Review / sdc.git / commitdiff