Move tests to JUnit
This commit is contained in:
parent
4858c58978
commit
d8093f7253
4 changed files with 65 additions and 69 deletions
|
|
@ -67,7 +67,10 @@ public class SemverBuild extends Project {
|
|||
.include(dependency("com.github.spullara.mustache.java", "compiler",
|
||||
version(0, 9, 10)));
|
||||
scope(test)
|
||||
.include(dependency("org.testng", "testng", version(7, 8, 0)));
|
||||
.include(dependency("org.assertj", "assertj-joda-time", version(2, 2, 0)))
|
||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
|
||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)));
|
||||
|
||||
|
||||
javadocOperation().javadocOptions()
|
||||
.tag("created.on", "a", "Created on:")
|
||||
|
|
@ -125,14 +128,6 @@ public class SemverBuild extends Project {
|
|||
Path.of(workDirectory.getPath(), "pom.xml").toFile());
|
||||
}
|
||||
|
||||
@BuildCommand(summary = "Run tests with TestNG")
|
||||
public void test() throws Exception {
|
||||
new TestNgOperation()
|
||||
.fromProject(this)
|
||||
.packages("net.thauvin.erik.semver")
|
||||
.execute();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void publish() throws Exception {
|
||||
super.publish();
|
||||
|
|
|
|||
|
|
@ -32,13 +32,14 @@
|
|||
|
||||
package net.thauvin.erik.semver;
|
||||
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.testng.Assert.assertEquals; // NOPMD
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* The <code>ConstantsTest</code> class.
|
||||
|
|
@ -50,12 +51,12 @@ import static org.testng.Assert.assertEquals; // NOPMD
|
|||
public class ConstantsTest {
|
||||
@Test
|
||||
public void testDefaults() {
|
||||
assertEquals(Constants.DEFAULT_MAJOR, 1, "major");
|
||||
assertEquals(Constants.DEFAULT_MINOR, 0, "minor");
|
||||
assertEquals(Constants.DEFAULT_PATCH, 0, "patch");
|
||||
assertEquals(Constants.DEFAULT_PRERELEASE_PREFIX, "-", "preRelease");
|
||||
assertEquals(Constants.DEFAULT_BUILDMETA_PREFIX, "+", "buildMeta");
|
||||
assertEquals(Constants.DEFAULT_SEPARATOR, ".", "separator");
|
||||
assertEquals(1, Constants.DEFAULT_MAJOR, "major");
|
||||
assertEquals(0, Constants.DEFAULT_MINOR, "minor");
|
||||
assertEquals(0, Constants.DEFAULT_PATCH, "patch");
|
||||
assertEquals("-", Constants.DEFAULT_PRERELEASE_PREFIX, "preRelease");
|
||||
assertEquals("+", Constants.DEFAULT_BUILDMETA_PREFIX, "buildMeta");
|
||||
assertEquals(".", Constants.DEFAULT_SEPARATOR, "separator");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -66,7 +67,7 @@ public class ConstantsTest {
|
|||
templates.add(Constants.DEFAULT_TEMPLATE_NAME);
|
||||
|
||||
for (final String tp : templates) {
|
||||
Assert.assertTrue(tp.endsWith(".mustache"), tp);
|
||||
assertTrue(tp.endsWith(".mustache"), tp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@
|
|||
|
||||
package net.thauvin.erik.semver;
|
||||
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.Test;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import static org.testng.Assert.assertEquals; // NOPMD
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* The <code>VersionInfoTest</code> class.
|
||||
|
|
@ -52,49 +52,49 @@ public class VersionInfoTest {
|
|||
@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
|
||||
@Test
|
||||
public void testGetVersion() {
|
||||
assertEquals(versionInfo.getVersion(), "1.0.0", "getVersion(1.0.0)");
|
||||
assertEquals("1.0.0", versionInfo.getVersion(), "getVersion(1.0.0)");
|
||||
|
||||
versionInfo.setMajor(3);
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.0.0", "getVersion(3.0.0)");
|
||||
assertEquals("3.0.0", versionInfo.getVersion(), "getVersion(3.0.0)");
|
||||
|
||||
versionInfo.setMinor(2);
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.0", "getVersion(3.2.0)");
|
||||
assertEquals("3.2.0", versionInfo.getVersion(), "getVersion(3.2.0)");
|
||||
|
||||
versionInfo.setPatch(1);
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1", "getVersion(3.2.1)");
|
||||
assertEquals("3.2.1", versionInfo.getVersion(), "getVersion(3.2.1)");
|
||||
|
||||
versionInfo.setPreRelease("beta");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1-beta", "getVersion(3.2.1-beta)");
|
||||
assertEquals("3.2.1-beta", versionInfo.getVersion(), "getVersion(3.2.1-beta)");
|
||||
|
||||
versionInfo.setBuildMeta("001");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1-beta+001", "getVersion(3.2.1-beta+001)");
|
||||
assertEquals("3.2.1-beta+001", versionInfo.getVersion(), "getVersion(3.2.1-beta+001)");
|
||||
|
||||
versionInfo.setPreReleasePrefix("+");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1+beta+001", "getVersion(3.2.1+beta+001)");
|
||||
assertEquals("3.2.1+beta+001", versionInfo.getVersion(), "getVersion(3.2.1+beta+001)");
|
||||
|
||||
versionInfo.setPreReleasePrefix("-");
|
||||
|
||||
versionInfo.setPreRelease("");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1+001", "getVersion(3.2.1+001)");
|
||||
assertEquals("3.2.1+001", versionInfo.getVersion(), "getVersion(3.2.1+001)");
|
||||
|
||||
versionInfo.setBuildMetaPrefix(".");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3.2.1.001", "getVersion(3.2.1.001)");
|
||||
assertEquals("3.2.1.001", versionInfo.getVersion(), "getVersion(3.2.1.001)");
|
||||
|
||||
versionInfo.setBuildMetaPrefix("+");
|
||||
|
||||
versionInfo.setSeparator("-");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "3-2-1+001", "getVersion(3-2-1+001)");
|
||||
assertEquals("3-2-1+001", versionInfo.getVersion(), "getVersion(3-2-1+001)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), versionInfo.getSemver(),
|
||||
assertEquals(versionInfo.getSemver(), versionInfo.getVersion(),
|
||||
"getVersion(3-2-1+001) = getSemver(3-2-1+001) ");
|
||||
}
|
||||
|
||||
|
|
@ -104,59 +104,59 @@ public class VersionInfoTest {
|
|||
|
||||
versionInfo.setMajor(1);
|
||||
|
||||
assertEquals(versionInfo.getMajor(), 1, "getMajor(1)");
|
||||
assertEquals(1, versionInfo.getMajor(), "getMajor(1)");
|
||||
|
||||
versionInfo.setMinor(2);
|
||||
|
||||
assertEquals(versionInfo.getMinor(), 2, "getMinor(2)");
|
||||
assertEquals(2, versionInfo.getMinor(), "getMinor(2)");
|
||||
|
||||
versionInfo.setPatch(3);
|
||||
|
||||
assertEquals(versionInfo.getPatch(), 3, "getPatch(3)");
|
||||
assertEquals(3, versionInfo.getPatch(), "getPatch(3)");
|
||||
|
||||
versionInfo.setPreRelease("alpha");
|
||||
|
||||
assertEquals(versionInfo.getPreRelease(), "alpha", "getPreRelease(alpha)");
|
||||
assertEquals("alpha", versionInfo.getPreRelease(), "getPreRelease(alpha)");
|
||||
|
||||
versionInfo.setBuildMeta("001");
|
||||
|
||||
assertEquals(versionInfo.getBuildMeta(), "001", "getBuildMeta(001)");
|
||||
assertEquals("001", versionInfo.getBuildMeta(), "getBuildMeta(001)");
|
||||
|
||||
versionInfo.setPackageName("com.example");
|
||||
|
||||
assertEquals(versionInfo.getPackageName(), "com.example", "getPackageName(com.example)");
|
||||
assertEquals("com.example", versionInfo.getPackageName(), "getPackageName(com.example)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "1.2.3-alpha+001", "getVersion(1.2.3-alpha+001)");
|
||||
assertEquals("1.2.3-alpha+001", versionInfo.getVersion(), "getVersion(1.2.3-alpha+001)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion() = getSemver()");
|
||||
assertEquals(versionInfo.getSemver(), versionInfo.getVersion(), "getVersion() = getSemver()");
|
||||
|
||||
versionInfo.setBuildMetaPrefix("");
|
||||
|
||||
assertEquals(versionInfo.getBuildMetaPrefix(), "", "getBuildMetaPrefix( )");
|
||||
assertEquals("", versionInfo.getBuildMetaPrefix(), "getBuildMetaPrefix( )");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "1.2.3-alpha001", "getVersion(1.2.3+alpha001)");
|
||||
assertEquals("1.2.3-alpha001", versionInfo.getVersion(), "getVersion(1.2.3+alpha001)");
|
||||
|
||||
versionInfo.setPreReleasePrefix(".");
|
||||
|
||||
assertEquals(versionInfo.getPreReleasePrefix(), ".", "getPreReleasePrefix(.)");
|
||||
assertEquals(".", versionInfo.getPreReleasePrefix(), "getPreReleasePrefix(.)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "1.2.3.alpha001", "getVersion(1.2.3.alpha001");
|
||||
assertEquals("1.2.3.alpha001", versionInfo.getVersion(), "getVersion(1.2.3.alpha001");
|
||||
|
||||
versionInfo.setSeparator("-");
|
||||
|
||||
assertEquals(versionInfo.getSeparator(), "-", "getSeparator(-)");
|
||||
assertEquals("-", versionInfo.getSeparator(), "getSeparator(-)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "1-2-3.alpha001", "getVersion(1-2-3.alpha001)");
|
||||
assertEquals("1-2-3.alpha001", versionInfo.getVersion(), "getVersion(1-2-3.alpha001)");
|
||||
|
||||
versionInfo.setProject("My Example");
|
||||
|
||||
assertEquals(versionInfo.getProject(), "My Example", "getProject(My Example)");
|
||||
assertEquals("My Example", versionInfo.getProject(), "getProject(My Example)");
|
||||
|
||||
versionInfo.setClassName("Example");
|
||||
|
||||
assertEquals(versionInfo.getClassName(), "Example", "getClassName(Example");
|
||||
assertEquals("Example", versionInfo.getClassName(), "getClassName(Example");
|
||||
|
||||
Assert.assertTrue((versionInfo.getEpoch() - new Date().getTime()) < 1000, "buildDate - now < 1s");
|
||||
assertTrue((versionInfo.getEpoch() - new Date().getTime()) < 1000, "buildDate - now < 1s");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -164,32 +164,32 @@ public class VersionInfoTest {
|
|||
final Version version = new VersionTest();
|
||||
versionInfo = new VersionInfo(version);
|
||||
|
||||
assertEquals(versionInfo.getMajor(), version.major(), "getMajor(major)");
|
||||
assertEquals(version.major(), versionInfo.getMajor(), "getMajor(major)");
|
||||
|
||||
assertEquals(versionInfo.getMinor(), version.minor(), "getMinor(minor)");
|
||||
assertEquals(version.minor(), versionInfo.getMinor(), "getMinor(minor)");
|
||||
|
||||
assertEquals(versionInfo.getPatch(), version.patch(), "getPatch(patch)");
|
||||
assertEquals(version.patch(), versionInfo.getPatch(), "getPatch(patch)");
|
||||
|
||||
assertEquals(versionInfo.getPreRelease(), version.preRelease(), "getPreRelease(preRelease)");
|
||||
assertEquals(version.preRelease(), versionInfo.getPreRelease(), "getPreRelease(preRelease)");
|
||||
|
||||
assertEquals(versionInfo.getPreReleasePrefix(), version.preReleasePrefix(),
|
||||
assertEquals(version.preReleasePrefix(), versionInfo.getPreReleasePrefix(),
|
||||
"getPreReleasePrefix(preReleasePrefix)");
|
||||
|
||||
assertEquals(versionInfo.getBuildMeta(), version.buildMeta(), "getBuildMeta(buildMeta)");
|
||||
assertEquals(version.buildMeta(), versionInfo.getBuildMeta(), "getBuildMeta(buildMeta)");
|
||||
|
||||
assertEquals(versionInfo.getBuildMetaPrefix(), version.buildMetaPrefix(),
|
||||
assertEquals(version.buildMetaPrefix(), versionInfo.getBuildMetaPrefix(),
|
||||
"getBuildMetaPrefix(buildMetaPrefix)");
|
||||
|
||||
assertEquals(versionInfo.getPackageName(), version.packageName(), "getPackageName(packageName)");
|
||||
assertEquals(version.packageName(), versionInfo.getPackageName(), "getPackageName(packageName)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(),
|
||||
version.major() + "." + version.minor() + '.' + version.patch() + '-' + version.preRelease() + '+'
|
||||
+ version.buildMeta(), "getVersion(version)");
|
||||
|
||||
assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion(version) = getSemver(version)");
|
||||
assertEquals(versionInfo.getSemver(), versionInfo.getVersion(), "getVersion(version) = getSemver(version)");
|
||||
|
||||
assertEquals(versionInfo.getProject(), version.project(), "getProject(project)");
|
||||
assertEquals(version.project(), versionInfo.getProject(), "getProject(project)");
|
||||
|
||||
assertEquals(versionInfo.getClassName(), version.className(), "getClassName(className)");
|
||||
assertEquals(version.className(), versionInfo.getClassName(), "getClassName(className)");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
|
||||
package net.thauvin.erik.semver;
|
||||
|
||||
import org.testng.annotations.Test;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Properties;
|
||||
|
||||
import static org.testng.Assert.assertEquals; // NOPMD
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* The <code>VersionProcessorTest</code> class.
|
||||
|
|
@ -58,8 +58,8 @@ public class VersionProcessorTest {
|
|||
method.setAccessible(true);
|
||||
final VersionInfo versionInfo = (VersionInfo) method.invoke(processor, version);
|
||||
|
||||
assertEquals(versionInfo.getVersion(), "0-0-7:vodka++martini", "getVersion(0-0-7:vodka++martin)");
|
||||
assertEquals(versionInfo.getProject(), "James Bond", "getProject(James Bond)");
|
||||
assertEquals("0-0-7:vodka++martini", versionInfo.getVersion(), "getVersion(0-0-7:vodka++martin)");
|
||||
assertEquals("James Bond", versionInfo.getProject(), "getProject(James Bond)");
|
||||
}
|
||||
|
||||
@SuppressWarnings("PMD.AvoidAccessibilityAlteration")
|
||||
|
|
@ -75,9 +75,9 @@ public class VersionProcessorTest {
|
|||
int.class);
|
||||
method.setAccessible(true);
|
||||
|
||||
assertEquals(method.invoke(processor, p, "1", -1), 1, "parseIntProperty(1)");
|
||||
assertEquals(method.invoke(processor, p, "2", -1), -1, "parseIntProperty(2.1)");
|
||||
assertEquals(method.invoke(processor, p, "3", -1), -1, "parseIntProperty(zero)");
|
||||
assertEquals(method.invoke(processor, p, "4", -1), 4, "parseIntProperty( 4 )");
|
||||
assertEquals(1, method.invoke(processor, p, "1", -1), "parseIntProperty(1)");
|
||||
assertEquals(-1, method.invoke(processor, p, "2", -1), "parseIntProperty(2.1)");
|
||||
assertEquals(-1, method.invoke(processor, p, "3", -1), "parseIntProperty(zero)");
|
||||
assertEquals(4, method.invoke(processor, p, "4", -1), "parseIntProperty( 4 )");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue