Cleanup tests.

This commit is contained in:
Erik C. Thauvin 2019-05-25 13:46:59 -07:00
parent 8238517b0d
commit 4e029507be
3 changed files with 65 additions and 71 deletions

View file

@ -38,6 +38,8 @@ import org.testng.annotations.Test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.testng.Assert.assertEquals;
/** /**
* The <code>ConstantsTest</code> class. * The <code>ConstantsTest</code> class.
* *
@ -48,12 +50,12 @@ import java.util.List;
public class ConstantsTest { public class ConstantsTest {
@Test @Test
public void testDefaults() { public void testDefaults() {
Assert.assertEquals(Constants.DEFAULT_MAJOR, 1, "major"); assertEquals(Constants.DEFAULT_MAJOR, 1, "major");
Assert.assertEquals(Constants.DEFAULT_MINOR, 0, "minor"); assertEquals(Constants.DEFAULT_MINOR, 0, "minor");
Assert.assertEquals(Constants.DEFAULT_PATCH, 0, "patch"); assertEquals(Constants.DEFAULT_PATCH, 0, "patch");
Assert.assertEquals(Constants.DEFAULT_PRERELEASE_PREFIX, "-", "preRelease"); assertEquals(Constants.DEFAULT_PRERELEASE_PREFIX, "-", "preRelease");
Assert.assertEquals(Constants.DEFAULT_BUILDMETA_PREFIX, "+", "buildMeta"); assertEquals(Constants.DEFAULT_BUILDMETA_PREFIX, "+", "buildMeta");
Assert.assertEquals(Constants.DEFAULT_SEPARATOR, ".", "separator"); assertEquals(Constants.DEFAULT_SEPARATOR, ".", "separator");
} }
@Test @Test

View file

@ -38,6 +38,8 @@ import org.testng.annotations.Test;
import java.util.Calendar; import java.util.Calendar;
import static org.testng.Assert.assertEquals;
/** /**
* The <code>VersionInfoTest</code> class. * The <code>VersionInfoTest</code> class.
* *
@ -53,49 +55,49 @@ public class VersionInfoTest {
@SuppressWarnings("PMD.AvoidUsingHardCodedIP") @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
@Test @Test
public void testGetVersion() { public void testGetVersion() {
Assert.assertEquals(versionInfo.getVersion(), "1.0.0", "getVersion(1.0.0)"); assertEquals(versionInfo.getVersion(), "1.0.0", "getVersion(1.0.0)");
versionInfo.setMajor(3); versionInfo.setMajor(3);
Assert.assertEquals(versionInfo.getVersion(), "3.0.0", "getVersion(3.0.0)"); assertEquals(versionInfo.getVersion(), "3.0.0", "getVersion(3.0.0)");
versionInfo.setMinor(2); versionInfo.setMinor(2);
Assert.assertEquals(versionInfo.getVersion(), "3.2.0", "getVersion(3.2.0)"); assertEquals(versionInfo.getVersion(), "3.2.0", "getVersion(3.2.0)");
versionInfo.setPatch(1); versionInfo.setPatch(1);
Assert.assertEquals(versionInfo.getVersion(), "3.2.1", "getVersion(3.2.1)"); assertEquals(versionInfo.getVersion(), "3.2.1", "getVersion(3.2.1)");
versionInfo.setPreRelease("beta"); versionInfo.setPreRelease("beta");
Assert.assertEquals(versionInfo.getVersion(), "3.2.1-beta", "getVersion(3.2.1-beta)"); assertEquals(versionInfo.getVersion(), "3.2.1-beta", "getVersion(3.2.1-beta)");
versionInfo.setBuildMeta("001"); versionInfo.setBuildMeta("001");
Assert.assertEquals(versionInfo.getVersion(), "3.2.1-beta+001", "getVersion(3.2.1-beta+001)"); assertEquals(versionInfo.getVersion(), "3.2.1-beta+001", "getVersion(3.2.1-beta+001)");
versionInfo.setPreReleasePrefix("+"); versionInfo.setPreReleasePrefix("+");
Assert.assertEquals(versionInfo.getVersion(), "3.2.1+beta+001", "getVersion(3.2.1+beta+001)"); assertEquals(versionInfo.getVersion(), "3.2.1+beta+001", "getVersion(3.2.1+beta+001)");
versionInfo.setPreReleasePrefix("-"); versionInfo.setPreReleasePrefix("-");
versionInfo.setPreRelease(""); versionInfo.setPreRelease("");
Assert.assertEquals(versionInfo.getVersion(), "3.2.1+001", "getVersion(3.2.1+001)"); assertEquals(versionInfo.getVersion(), "3.2.1+001", "getVersion(3.2.1+001)");
versionInfo.setBuildMetaPrefix("."); versionInfo.setBuildMetaPrefix(".");
Assert.assertEquals(versionInfo.getVersion(), "3.2.1.001", "getVersion(3.2.1.001)"); assertEquals(versionInfo.getVersion(), "3.2.1.001", "getVersion(3.2.1.001)");
versionInfo.setBuildMetaPrefix("+"); versionInfo.setBuildMetaPrefix("+");
versionInfo.setSeparator("-"); versionInfo.setSeparator("-");
Assert.assertEquals(versionInfo.getVersion(), "3-2-1+001", "getVersion(3-2-1+001)"); assertEquals(versionInfo.getVersion(), "3-2-1+001", "getVersion(3-2-1+001)");
Assert.assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), assertEquals(versionInfo.getVersion(), versionInfo.getSemver(),
"getVersion(3-2-1+001) = getSemver(3-2-1+001) "); "getVersion(3-2-1+001) = getSemver(3-2-1+001) ");
} }
@ -105,60 +107,59 @@ public class VersionInfoTest {
versionInfo.setMajor(1); versionInfo.setMajor(1);
Assert.assertEquals(versionInfo.getMajor(), 1, "getMajor(1)"); assertEquals(versionInfo.getMajor(), 1, "getMajor(1)");
versionInfo.setMinor(2); versionInfo.setMinor(2);
Assert.assertEquals(versionInfo.getMinor(), 2, "getMinor(2)"); assertEquals(versionInfo.getMinor(), 2, "getMinor(2)");
versionInfo.setPatch(3); versionInfo.setPatch(3);
Assert.assertEquals(versionInfo.getPatch(), 3, "getPatch(3)"); assertEquals(versionInfo.getPatch(), 3, "getPatch(3)");
versionInfo.setPreRelease("alpha"); versionInfo.setPreRelease("alpha");
Assert.assertEquals(versionInfo.getPreRelease(), "alpha", "getPreRelease(alpha)"); assertEquals(versionInfo.getPreRelease(), "alpha", "getPreRelease(alpha)");
versionInfo.setBuildMeta("001"); versionInfo.setBuildMeta("001");
Assert.assertEquals(versionInfo.getBuildMeta(), "001", "getBuildMeta(001)"); assertEquals(versionInfo.getBuildMeta(), "001", "getBuildMeta(001)");
versionInfo.setPackageName("com.example"); versionInfo.setPackageName("com.example");
Assert.assertEquals(versionInfo.getPackageName(), "com.example", "getPackageName(com.example)"); assertEquals(versionInfo.getPackageName(), "com.example", "getPackageName(com.example)");
Assert.assertEquals(versionInfo.getVersion(), "1.2.3-alpha+001", "getVersion(1.2.3-alpha+001)"); assertEquals(versionInfo.getVersion(), "1.2.3-alpha+001", "getVersion(1.2.3-alpha+001)");
Assert.assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion() = getSemver()"); assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion() = getSemver()");
versionInfo.setBuildMetaPrefix(""); versionInfo.setBuildMetaPrefix("");
Assert.assertEquals(versionInfo.getBuildMetaPrefix(), "", "getBuildMetaPrefix( )"); assertEquals(versionInfo.getBuildMetaPrefix(), "", "getBuildMetaPrefix( )");
Assert.assertEquals(versionInfo.getVersion(), "1.2.3-alpha001", "getVersion(1.2.3+alpha001)"); assertEquals(versionInfo.getVersion(), "1.2.3-alpha001", "getVersion(1.2.3+alpha001)");
versionInfo.setPreReleasePrefix("."); versionInfo.setPreReleasePrefix(".");
Assert.assertEquals(versionInfo.getPreReleasePrefix(), ".", "getPreReleasePrefix(.)"); assertEquals(versionInfo.getPreReleasePrefix(), ".", "getPreReleasePrefix(.)");
Assert.assertEquals(versionInfo.getVersion(), "1.2.3.alpha001", "getVersion(1.2.3.alpha001"); assertEquals(versionInfo.getVersion(), "1.2.3.alpha001", "getVersion(1.2.3.alpha001");
versionInfo.setSeparator("-"); versionInfo.setSeparator("-");
Assert.assertEquals(versionInfo.getSeparator(), "-", "getSeparator(-)"); assertEquals(versionInfo.getSeparator(), "-", "getSeparator(-)");
Assert.assertEquals(versionInfo.getVersion(), "1-2-3.alpha001", "getVersion(1-2-3.alpha001)"); assertEquals(versionInfo.getVersion(), "1-2-3.alpha001", "getVersion(1-2-3.alpha001)");
versionInfo.setProject("My Example"); versionInfo.setProject("My Example");
Assert.assertEquals(versionInfo.getProject(), "My Example", "getProject(My Example)"); assertEquals(versionInfo.getProject(), "My Example", "getProject(My Example)");
versionInfo.setClassName("Example"); versionInfo.setClassName("Example");
Assert.assertEquals(versionInfo.getClassName(), "Example", "getClassName(Example"); assertEquals(versionInfo.getClassName(), "Example", "getClassName(Example");
Assert.assertTrue((versionInfo.getEpoch() - now.getTimeInMillis()) < 1000, Assert.assertTrue((versionInfo.getEpoch() - now.getTimeInMillis()) < 1000, "buildDate - now < 1s");
"buildDate - now < 1s");
} }
@Test @Test
@ -166,42 +167,32 @@ public class VersionInfoTest {
final Version version = new VersionTest(); final Version version = new VersionTest();
versionInfo = new VersionInfo(version); versionInfo = new VersionInfo(version);
Assert.assertEquals(versionInfo.getMajor(), version.major(), "getMajor(major)"); assertEquals(versionInfo.getMajor(), version.major(), "getMajor(major)");
Assert.assertEquals(versionInfo.getMinor(), version.minor(), "getMinor(minor)"); assertEquals(versionInfo.getMinor(), version.minor(), "getMinor(minor)");
Assert.assertEquals(versionInfo.getPatch(), version.patch(), "getPatch(patch)"); assertEquals(versionInfo.getPatch(), version.patch(), "getPatch(patch)");
Assert.assertEquals(versionInfo.getPreRelease(), version.preRelease(), "getPreRelease(preRelease)"); assertEquals(versionInfo.getPreRelease(), version.preRelease(), "getPreRelease(preRelease)");
Assert.assertEquals(versionInfo.getPreReleasePrefix(), version.preReleasePrefix(), assertEquals(versionInfo.getPreReleasePrefix(), version.preReleasePrefix(),
"getPreReleasePrefix(preReleasePrefix)"); "getPreReleasePrefix(preReleasePrefix)");
Assert.assertEquals(versionInfo.getBuildMeta(), version.buildMeta(), "getBuildMeta(buildMeta)"); assertEquals(versionInfo.getBuildMeta(), version.buildMeta(), "getBuildMeta(buildMeta)");
Assert.assertEquals(versionInfo.getBuildMetaPrefix(), version.buildMetaPrefix(), assertEquals(versionInfo.getBuildMetaPrefix(), version.buildMetaPrefix(),
"getBuildMetaPrefix(buildMetaPrefix)"); "getBuildMetaPrefix(buildMetaPrefix)");
Assert.assertEquals(versionInfo.getPackageName(), version.packageName(), assertEquals(versionInfo.getPackageName(), version.packageName(), "getPackageName(packageName)");
"getPackageName(packageName)");
Assert.assertEquals(versionInfo.getVersion(), assertEquals(versionInfo.getVersion(),
version.major() version.major() + "." + version.minor() + '.' + version.patch() + '-' + version.preRelease() + '+'
+ "." + version.buildMeta(), "getVersion(version)");
+ version.minor()
+ '.'
+ version.patch()
+ '-'
+ version.preRelease()
+ '+'
+ version.buildMeta(),
"getVersion(version)");
Assert.assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), assertEquals(versionInfo.getVersion(), versionInfo.getSemver(), "getVersion(version) = getSemver(version)");
"getVersion(version) = getSemver(version)");
Assert.assertEquals(versionInfo.getProject(), version.project(), "getProject(project)"); assertEquals(versionInfo.getProject(), version.project(), "getProject(project)");
Assert.assertEquals(versionInfo.getClassName(), version.className(), "getClassName(className)"); assertEquals(versionInfo.getClassName(), version.className(), "getClassName(className)");
} }
} }

View file

@ -33,13 +33,14 @@
package net.thauvin.erik.semver; package net.thauvin.erik.semver;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Properties; import java.util.Properties;
import static org.testng.Assert.assertEquals;
/** /**
* The <code>VersionProcessorTest</code> class. * The <code>VersionProcessorTest</code> class.
* *
@ -58,8 +59,8 @@ public class VersionProcessorTest {
method.setAccessible(true); method.setAccessible(true);
final VersionInfo versionInfo = (VersionInfo) method.invoke(processor, version); final VersionInfo versionInfo = (VersionInfo) method.invoke(processor, version);
Assert.assertEquals(versionInfo.getVersion(), "0-0-7:vodka++martini", "getVersion(0-0-7:vodka++martin)"); assertEquals(versionInfo.getVersion(), "0-0-7:vodka++martini", "getVersion(0-0-7:vodka++martin)");
Assert.assertEquals(versionInfo.getProject(), "James Bond", "getProject(James Bond)"); assertEquals(versionInfo.getProject(), "James Bond", "getProject(James Bond)");
} }
@SuppressFBWarnings("RFI_SET_ACCESSIBLE") @SuppressFBWarnings("RFI_SET_ACCESSIBLE")
@ -71,13 +72,13 @@ public class VersionProcessorTest {
p.setProperty("3", "zero"); p.setProperty("3", "zero");
p.setProperty("4", " 4 "); p.setProperty("4", " 4 ");
final Method method = processor.getClass().getDeclaredMethod( final Method method = processor.getClass().getDeclaredMethod("parseIntProperty", Properties.class, String.class,
"parseIntProperty", Properties.class, String.class, int.class); int.class);
method.setAccessible(true); method.setAccessible(true);
Assert.assertEquals(method.invoke(processor, p, "1", -1), 1, "parseIntProperty(1)"); assertEquals(method.invoke(processor, p, "1", -1), 1, "parseIntProperty(1)");
Assert.assertEquals(method.invoke(processor, p, "2", -1), -1, "parseIntProperty(2.1)"); assertEquals(method.invoke(processor, p, "2", -1), -1, "parseIntProperty(2.1)");
Assert.assertEquals(method.invoke(processor, p, "3", -1), -1, "parseIntProperty(zero)"); assertEquals(method.invoke(processor, p, "3", -1), -1, "parseIntProperty(zero)");
Assert.assertEquals(method.invoke(processor, p, "4", -1), 4, "parseIntProperty( 4 )"); assertEquals(method.invoke(processor, p, "4", -1), 4, "parseIntProperty( 4 )");
} }
} }