You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by ni...@apache.org on 2004/08/18 13:57:28 UTC
svn commit: rev 36564 - in incubator/depot/trunk/version/src: java/org/apache/depot/version test/java/org/apache/depot/version/impl
Author: nickchalko
Date: Wed Aug 18 06:57:27 2004
New Revision: 36564
Modified:
incubator/depot/trunk/version/src/java/org/apache/depot/version/VersionManager.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/ApacheVersionTest.java
Log:
Working on TestCase for the Version Interface contract
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/VersionManager.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/VersionManager.java (original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/VersionManager.java Wed Aug 18 06:57:27 2004
@@ -127,6 +127,16 @@
throws VersionFormatException {
VersionSpecification spec = VersionSpecificationFactory
.createDefaultVersionSpecification();
+ return createVersion(spec, versionString);
+ }
+
+ /**
+ * @param spec
+ * @param versionString
+ * @return Version
+ * @throws VersionFormatException
+ */
+ public Version createVersion(VersionSpecification spec, String versionString) throws VersionFormatException {
VersionData data = spec.getVersionFormat().parseVersion(versionString);
return new ApacheVersion(spec, data);
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/ApacheVersionTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/ApacheVersionTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/impl/ApacheVersionTest.java Wed Aug 18 06:57:27 2004
@@ -7,66 +7,83 @@
import org.apache.depot.version.CompoundVersion;
import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionTestCase;
import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.specification.VersionSpecification;
/**
* @author <a href="http://nick.chalko.com">Nick Chalko </a>
* @author $Author: $
* @version $Revision: $
*/
-public class ApacheVersionTest extends TestCase {
+public class ApacheVersionTest extends VersionTestCase {
- /*
- * Class under test for void ApacheVersion(String)
- */
- public void testApacheVersionString() throws VersionException {
- //Logger.testInit();
-
- assertApacheVersion("1.2.1", 1, 2, 1, ReleaseLevel.DEFAULT);
- assertApacheVersion("1.2.1-dev", 1, 2, 1, ReleaseLevel.DEVELOPMENT);
- assertApacheVersion("1.2", 1, 2, -1, ReleaseLevel.DEFAULT);
- assertApacheVersion("1.2.99-b", 1, 2, 99, ReleaseLevel.BETA);
- }
-
- /**
- * @param versionString
- * @param expectedMajor
- * @param expectedMinor
- * @param expectedPoint
- * @param expectedReleaseLevel
- * @throws VersionException
- */
- private void assertApacheVersion(final String versionString, int expectedMajor, int expectedMinor,
- int expectedPoint, ReleaseLevel expectedReleaseLevel) throws VersionException {
- ApacheVersion av = new ApacheVersion(versionString);
- assertVersion(versionString, av, expectedMajor, expectedMinor, expectedPoint, expectedReleaseLevel);
- }
-
- /**
- * @param versionString
- * @param av
- * @param expectedMajor
- * @param expectedMinor
- * @param expectedPoint
- * @param expectedReleaseLevel
- */
- private void assertVersion(final String versionString, ApacheVersion av, int expectedMajor, int expectedMinor,
- int expectedPoint, ReleaseLevel expectedReleaseLevel) {
- assertCompondVersion(versionString, av, expectedMajor, expectedMinor, expectedPoint);
- assertEquals(versionString + ".releaseLevel", expectedReleaseLevel, av.getReleaseLevelObject());
- }
-
- /**
- * @param versionString
- * @param av
- * @param expectedMajor
- * @param expectedMinor
- * @param expectedPoint
- */
- private void assertCompondVersion(final String versionString, CompoundVersion av, int expectedMajor, int expectedMinor, int expectedPoint) {
- assertEquals(versionString + ".major", expectedMajor, av.getMajor());
- assertEquals(versionString + ".minor", expectedMinor, av.getMinor());
- assertEquals(versionString + ".point", expectedPoint, av.getPoint());
- }
+ /**
+ * @param specification
+ */
+ public ApacheVersionTest() {
+ super(ApacheVersion.UNKNOWN.getSpecification());
+
+ }
+
+ /*
+ * Class under test for void ApacheVersion(String)
+ */
+ public void testApacheVersionString() throws VersionException {
+ //Logger.testInit();
+
+ assertApacheVersion("1.2.1", 1, 2, 1, ReleaseLevel.DEFAULT);
+ assertApacheVersion("1.2.1-dev", 1, 2, 1, ReleaseLevel.DEVELOPMENT);
+ assertApacheVersion("1.2", 1, 2, -1, ReleaseLevel.DEFAULT);
+ assertApacheVersion("1.2.99-b", 1, 2, 99, ReleaseLevel.BETA);
+ }
+
+ /**
+ * @param versionString
+ * @param expectedMajor
+ * @param expectedMinor
+ * @param expectedPoint
+ * @param expectedReleaseLevel
+ * @throws VersionException
+ */
+ private void assertApacheVersion(final String versionString,
+ int expectedMajor, int expectedMinor, int expectedPoint,
+ ReleaseLevel expectedReleaseLevel) throws VersionException {
+ ApacheVersion av = new ApacheVersion(versionString);
+ assertVersion(versionString, av, expectedMajor, expectedMinor,
+ expectedPoint, expectedReleaseLevel);
+ }
+
+ /**
+ * @param versionString
+ * @param av
+ * @param expectedMajor
+ * @param expectedMinor
+ * @param expectedPoint
+ * @param expectedReleaseLevel
+ */
+ private void assertVersion(final String versionString, ApacheVersion av,
+ int expectedMajor, int expectedMinor, int expectedPoint,
+ ReleaseLevel expectedReleaseLevel) {
+ assertCompondVersion(versionString, av, expectedMajor, expectedMinor,
+ expectedPoint);
+ assertEquals(versionString + ".releaseLevel", expectedReleaseLevel, av
+ .getReleaseLevelObject());
+ }
+
+ /**
+ * @param versionString
+ * @param av
+ * @param expectedMajor
+ * @param expectedMinor
+ * @param expectedPoint
+ */
+ private void assertCompondVersion(final String versionString,
+ CompoundVersion av, int expectedMajor, int expectedMinor,
+ int expectedPoint) {
+ assertEquals(versionString + ".major", expectedMajor, av.getMajor());
+ assertEquals(versionString + ".minor", expectedMinor, av.getMinor());
+ assertEquals(versionString + ".point", expectedPoint, av.getPoint());
+ }
}