summaryrefslogtreecommitdiffstats
path: root/asdctool
diff options
context:
space:
mode:
Diffstat (limited to 'asdctool')
-rw-r--r--asdctool/pom.xml6
-rw-r--r--asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/DBVersion.java14
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzerTest.java2
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java4
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java67
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java8
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java4
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java2
-rw-r--r--asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java13
9 files changed, 56 insertions, 64 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 2c419bce99..ef9ff17766 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -512,12 +512,6 @@
</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>
<version>0.0.1</version>
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/DBVersion.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/DBVersion.java
index 17c3aea42c..a18ea69c4e 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/DBVersion.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/DBVersion.java
@@ -21,14 +21,16 @@
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
@@ -45,14 +47,6 @@ public class DBVersion implements Comparable<DBVersion>{
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);
}
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzerTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzerTest.java
index bffc0daee1..c2a8a561d8 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzerTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzerTest.java
@@ -22,11 +22,11 @@ package org.openecomp.sdc.asdctool.impl;
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 {
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java
index 3a325fcb09..21a931cc86 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executor/ArtifactValidatorExecutorContract.java
@@ -20,6 +20,7 @@
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;
@@ -34,7 +35,6 @@ import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
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 {
@@ -70,6 +70,6 @@ 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));
}
}
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java
index 54c5829e8d..c69cb45fc3 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/DBVersionTest.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,57 +20,60 @@
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);
}
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
index b9469afc16..b547aef2f9 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/core/execution/MigrationExecutorImplTest.java
@@ -20,13 +20,13 @@
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 {
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java
index a169e6f752..0c22bfbc15 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/resolver/SpringBeansMigrationResolverTest.java
@@ -20,10 +20,10 @@
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;
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
index e260464669..e09538dd8c 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/service/SdcRepoServiceTest.java
@@ -20,9 +20,9 @@
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;
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java
index 138abf3c83..198d36e62b 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/migration/task/MigrationTasksTest.java
@@ -20,13 +20,14 @@
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;
@@ -40,7 +41,7 @@ public class MigrationTasksTest {
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);
@@ -52,7 +53,7 @@ public class MigrationTasksTest {
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()));
}
});
}
@@ -63,7 +64,7 @@ public class MigrationTasksTest {
.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()));
}