<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.github.testng-team</groupId>
<artifactId>testng-junit5</artifactId>
package org.openecomp.sdc.asdctool.migration.core;
import java.math.BigInteger;
+import lombok.Getter;
+@Getter
public class DBVersion implements Comparable<DBVersion>{
private static final String VERSION_PARTS_SEPARATOR = "\\.";
private static final int MAJOR_PART_IDX = 0;
private static final int MINOR_PART_IDX = 1;
- private BigInteger major;
- private BigInteger minor;
+ private final BigInteger major;
+ private final BigInteger minor;
/**
* The current db version. should be tested against real db to verify it is compatible to the db version
this.minor = BigInteger.valueOf(minor);
}
- public BigInteger getMajor() {
- return major;
- }
-
- public BigInteger getMinor() {
- return minor;
- }
-
public static DBVersion from(BigInteger major, BigInteger minor) {
return new DBVersion(major, minor);
}
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.openecomp.sdc.asdctool.impl.GraphMLDataAnalyzer.EXCEL_EXTENSION;
import static org.openecomp.sdc.asdctool.impl.GraphMLDataAnalyzer.GRAPH_ML_EXTENSION;
-import static org.testng.AssertJUnit.assertNotNull;
public class GraphMLDataAnalyzerTest {
package org.openecomp.sdc.asdctool.impl.validator.executor;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.Mockito.mock;
import java.util.HashMap;
import org.openecomp.sdc.be.model.Component;
import org.openecomp.sdc.be.model.Resource;
import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
-import org.testng.Assert;
public interface ArtifactValidatorExecutorContract {
// Initially no outputFilePath was passed to this function (hence it is set to null)
// TODO: Fix this null and see if the argument is used by this function
- Assert.assertFalse(testSubject.validate(vertices, null));
+ assertFalse(testSubject.validate(vertices, null));
}
}
* 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.
package org.openecomp.sdc.asdctool.migration.core;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-public class DBVersionTest {
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+public class DBVersionTest {
- @DataProvider(name = "invalidVersionStringsProvider")
- private Object[][] invalidVersionStringsProvider() {
- return new Object[][] {
- {"1.1.1"},
- {"1.a"},
- {"a.1"},
- {"1"}
+ public static Object[][] invalidVersionStringsProvider() {
+ return new Object[][]{
+ {"1.1.1"},
+ {"1.a"},
+ {"a.1"},
+ {"1"}
};
}
- @Test(dataProvider = "invalidVersionStringsProvider", expectedExceptions = MigrationException.class)
+ @ParameterizedTest
+ @MethodSource("invalidVersionStringsProvider")
public void testFromString_invalidVersionString(String invalidVersion) {
- DBVersion.fromString(invalidVersion);
+ assertThrows(MigrationException.class, () -> {
+ DBVersion.fromString(invalidVersion);
+ });
}
- @DataProvider(name = "validVersionStringsProvider")
- private Object[][] validVersionStringsProvider() {
- return new Object[][] {
- {"1.1", "1.1"},
- {"10100.0001", "10100.1"},
- {"000.1", "0.1"},
- {"01.00001000", "1.1000"},
+ public static Object[][] validVersionStringsProvider() {
+ return new Object[][]{
+ {"1.1", "1.1"},
+ {"10100.0001", "10100.1"},
+ {"000.1", "0.1"},
+ {"01.00001000", "1.1000"},
};
}
- @Test(dataProvider = "validVersionStringsProvider")
+ @ParameterizedTest
+ @MethodSource("validVersionStringsProvider")
public void testFromString(String validString, String expectedVersionString) {
assertEquals(expectedVersionString, DBVersion.fromString(validString).toString());
}
- @DataProvider(name = "versionComparisionProvider")
public static Object[][] versionComparisionProvider() {
- return new Object[][] {
- {"1.1", "001.00001", 0},
- {"10.1", "0010.00001", 0},
- {"1.1", "001.000010", -1},
- {"1.1", "0010.00001", -1},
- {"10.10", "0010.00001", 1},
- {"1.1", "001.00", 1},
+ return new Object[][]{
+ {"1.1", "001.00001", 0},
+ {"10.1", "0010.00001", 0},
+ {"1.1", "001.000010", -1},
+ {"1.1", "0010.00001", -1},
+ {"10.10", "0010.00001", 1},
+ {"1.1", "001.00", 1},
};
}
- @Test(dataProvider = "versionComparisionProvider")
+ @ParameterizedTest
+ @MethodSource("versionComparisionProvider")
public void testVersionCompareTo2(String firstVersion, String otherVersion, int expectedComparisionResult) {
assertEquals(DBVersion.fromString(firstVersion).compareTo(DBVersion.fromString(otherVersion)), expectedComparisionResult);
}
package org.openecomp.sdc.asdctool.migration.core.execution;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.asdctool.migration.DummyMigrationFactory;
import org.openecomp.sdc.asdctool.migration.core.task.Migration;
import org.openecomp.sdc.asdctool.migration.core.task.MigrationResult;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
public class MigrationExecutorImplTest {
package org.openecomp.sdc.asdctool.migration.resolver;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
import java.util.Arrays;
import java.util.Collections;
package org.openecomp.sdc.asdctool.migration.service;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
import java.math.BigInteger;
import org.junit.jupiter.api.Test;
package org.openecomp.sdc.asdctool.migration.task;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.commons.lang.StringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openecomp.sdc.asdctool.migration.core.DBVersion;
import org.openecomp.sdc.asdctool.migration.core.task.Migration;
import org.openecomp.sdc.asdctool.migration.scanner.ClassScanner;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
import java.util.Collection;
import java.util.List;
public static final String MIGRATIONS_BASE_PACKAGE = "org.openecomp.sdc.asdctool.migration.tasks";
private List<Migration> migrations;
- @BeforeMethod
+ @BeforeEach
public void setUp() throws Exception {
ClassScanner classScanner = new ClassScanner();
migrations = classScanner.getAllClassesOfType(MIGRATIONS_BASE_PACKAGE, Migration.class);
migrationsByVersion.forEach((version, migrations) -> {
if (migrations.size() > 1) {
System.out.println(String.format("the following migration tasks have the same version %s. versions must be unique", version.toString()));
- Assert.fail(String.format("migration tasks %s has same version %s. migration tasks versions must be unique.", getMigrationsNameAsString(migrations), version.toString()));
+ fail(String.format("migration tasks %s has same version %s. migration tasks versions must be unique.", getMigrationsNameAsString(migrations), version.toString()));
}
});
}
.collect(Collectors.toSet());
if (!migrationsWithVersionsGreaterThanCurrent.isEmpty()) {
- Assert.fail(String.format("migrations tasks %s have version which is greater than DBVersion.DEFAULT_VERSION %s. did you forget to update current version?",
+ fail(String.format("migrations tasks %s have version which is greater than DBVersion.DEFAULT_VERSION %s. did you forget to update current version?",
getMigrationsNameAsString(migrationsWithVersionsGreaterThanCurrent),
DBVersion.DEFAULT_VERSION.toString()));
}
<artifactId>openecomp-sdc-item-permissions-manager</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- CXF -->
<dependency>
package org.openecomp.sdc.itempermissions.dao.impl;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_ID_PROP;
import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_CHANGED;
import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_GRANTED;
import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_ITEM;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
import java.util.Collections;
import java.util.HashSet;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.onap.sdc.tosca.services.CommonUtil.DEFAULT;
import static org.onap.sdc.tosca.services.CommonUtil.UNDERSCORE_DEFAULT;
-import static org.testng.Assert.assertTrue;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
import org.openecomp.core.utilities.file.FileContentHandler;
import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.common.zip.exception.ZipException;
-import org.testng.annotations.Test;
public class CommonUtilTest {
private static final String VALID_ZIP_FILE_PATH = "src/test/resources/valid.zip";
assertThat(fch.containsFile("file.two.yaml"), is(true));
}
- @Test(expectedExceptions={CoreException.class})
+ @Test(expected=CoreException.class)
public void testValidateNoFolders() throws IOException {
byte[] file = getFileAsBytes(VALID_ZIP_WITH_DIR_FILE_PATH);
package org.openecomp.core.util;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openecomp.core.dao.UniqueValueDao;
import org.openecomp.core.dao.types.UniqueValueEntity;
import org.openecomp.sdc.common.errors.CoreException;
-import org.testng.Assert;
@ExtendWith(MockitoExtension.class)
class UniqueValueUtilTest {
@Test
void testIsUniqueValueOccupied() {
Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(new UniqueValueEntity());
- Assert.assertTrue(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME));
+ assertTrue(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME));
}
@Test
void testIsUniqueValueOccupiedFalse() {
Mockito.when(uniqueValueDao.get(Mockito.any())).thenReturn(null);
- Assert.assertFalse(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME));
+ assertFalse(uniqueValueUtil.isUniqueValueOccupied(ENTITLEMENT_POOL_NAME, ORIGINAL_ENTITY_NAME));
}
}
package org.openecomp.sdc.notification.dao.types;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.util.UUID;
+import org.junit.jupiter.api.Test;
-import static org.testng.Assert.*;
/**
* @author EVITALIY
package org.openecomp.sdc.notification.dao.types;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.util.UUID;
+import org.junit.jupiter.api.Test;
-import org.testng.annotations.Test;
/**
* @author EVITALIY
package org.openecomp.sdc.notification.dao.types;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
+import org.junit.jupiter.api.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
/**
* @author EVITALIY
package org.openecomp.sdc.heat.services.tree;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
import org.openecomp.core.utilities.file.FileContentHandler;
import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
-import org.testng.Assert;
-import org.testng.annotations.Test;
import java.io.File;
import java.io.FileInputStream;
HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap);
heatTreeManager.createTree();
HeatStructureTree tree = heatTreeManager.getTree();
- Assert.assertNotNull(tree);
- Assert.assertEquals(tree.getHeat().size(), 2);
+ assertNotNull(tree);
+ assertEquals(tree.getHeat().size(), 2);
}
@Test
HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(fileContentMap);
heatTreeManager.createTree();
HeatStructureTree tree = heatTreeManager.getTree();
- Assert.assertNotNull(tree);
- Assert.assertEquals(tree.getHeat().size(), 3);
+ assertNotNull(tree);
+ assertEquals(tree.getHeat().size(), 3);
verifyHeatArtifacts(tree, "ocgmgr.yaml", 1);
verifyHeatArtifacts(tree, "ocgapp.yaml", 0);
verifyHeatArtifacts(tree, "base_ocg.yaml", 0);
private void verifyHeatArtifacts(HeatStructureTree tree, String heatName, int expectedArtifactNum ) {
HeatStructureTree heat = HeatStructureTree.getHeatStructureTreeByName(tree.getHeat(), heatName);
- Assert.assertNotNull(heat);
+ assertNotNull(heat);
if (expectedArtifactNum > 0) {
- Assert.assertNotNull(heat.getArtifacts());
- Assert.assertEquals(heat.getArtifacts().size(), expectedArtifactNum);
+ assertNotNull(heat.getArtifacts());
+ assertEquals(heat.getArtifacts().size(), expectedArtifactNum);
} else {
- Assert.assertNull(heat.getArtifacts());
+ assertNull(heat.getArtifacts());
}
}
*/
package org.openecomp.sdc.validation.base;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.commons.collections4.MapUtils;
+import org.junit.jupiter.api.Test;
import org.openecomp.core.validation.types.MessageContainer;
import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration;
import org.openecomp.sdc.validation.type.ConfigConstants;
import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-@Test
public class ResourceBaseValidatorTest {
private String testValidator = "testValidator";
ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator();
Map<String, MessageContainer> messages = ValidationTestUtil.testValidator(
resourceBaseValidator, "/InvalidResourceType");
- Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+ assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
"WARNING: [RBV1]: A resource has an invalid or unsupported type - null, " +
"Resource ID [FSB2]");
}
ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator();
Map<String, MessageContainer> messages = ValidationTestUtil.testValidator(resourceBaseValidator,
"/InvalidHeatStructure");
- Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+ assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
"ERROR: [RBV2]: Invalid HEAT format problem - [while scanning for the next " +
"token\n" + "found character '\\t(TAB)' that cannot start any token. " +
"(Do not use \\t(TAB) for indentation)\n" +
Map<String, Object> properties = new HashMap<>();
resourceBaseValidator.init(properties);
- Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
+ assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
}
@Test
Map<String, ImplementationConfiguration> resourceTypeToImpl =
resourceBaseValidator.getResourceTypeToImpl();
- Assert.assertTrue(MapUtils.isNotEmpty(resourceTypeToImpl));
- Assert.assertTrue(resourceTypeToImpl.containsKey(testValidator));
+ assertTrue(MapUtils.isNotEmpty(resourceTypeToImpl));
+ assertTrue(resourceTypeToImpl.containsKey(testValidator));
}
@Test
resourceBaseValidator.init(properties);
- Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
+ assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
}
@Test
ResourceBaseValidator resourceBaseValidator = new ResourceBaseValidator();
initProperties(resourceBaseValidator, new HashMap<>());
- Assert.assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
+ assertTrue(MapUtils.isEmpty(resourceBaseValidator.getResourceTypeToImpl()));
}
public Map<String, Object> getValidImplementationConfiguration() {
package org.openecomp.sdc.validation.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.io.IOUtils;
import org.openecomp.core.utilities.file.FileUtils;
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;
public static void validateErrorMessage(String actualMessage, String expected, String... params) {
- Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""),
+ assertEquals(actualMessage.replace("\n", "").replace("\r", ""),
ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "")
.replace("\r", ""));
}
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.github.testng-team</groupId>
<artifactId>testng-junit5</artifactId>
package org.openecomp.core.tools.commands.exportinfo.serialize;
-import org.openecomp.core.tools.exportinfo.ExportSerializer;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.testng.Assert.*;
+import org.junit.Test;
+import org.openecomp.core.tools.exportinfo.ExportSerializer;
public class VLMExtractTest {
-
-
@Test
public void extractVLM(){
String vlmId = "979a56c7b2fa41e6a5742137f53a5c1b";
}
- @Test(expectedExceptions = IllegalStateException.class)
+ @Test(expected = IllegalStateException.class)
public void failToExtractVLMBecauseJsonIsCorrupted(){
String elemenet_info_string = "gfhhhghgh";
assertNull(new CustomExportSerializer().extractVlm(elemenet_info_string));
*/
package org.openecomp.core.tools.model;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import com.datastax.driver.core.DataType;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
public class ColumnDefinitionTest {
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
public class ElementEntityTest {
@Test
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
public class HealingEntityTest {
@Test
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
public class VersionElementsEntityTest {
@Test
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
public class VersionEntityTest {
@Test
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <version>3.2.0</version>
<relativePath/>
</parent>
Code Review / sdc.git / commitdiff