krysalis-version/src/test/java/org/krysalis/version/impl CompatibilityTests.java,1.1,1.2 VersionImporterTests.java,1.1,1.2 VersionIdentifierTest.java,1.1,1.2 VersionTest.java,1.1,1.2 TestApacheVersion.java,1.1,NONE ResolverTests.java,1.1,NONE TestApacheVersionMarker.java,1.1,NONE ImporterTests.java,1.1,NONE
Nick Chalko <[email protected]> Wed, 10 Nov 2004 06:57:35 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30811/src/test/java/org/krysalis/version/impl
Modified Files:
CompatibilityTests.java VersionImporterTests.java
VersionIdentifierTest.java VersionTest.java
Removed Files:
TestApacheVersion.java ResolverTests.java
TestApacheVersionMarker.java ImporterTests.java
Log Message:
More tests pass now.
--- TestApacheVersionMarker.java DELETED ---
Index: CompatibilityTests.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/CompatibilityTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompatibilityTests.java 9 Nov 2004 07:54:51 -0000 1.1
--- CompatibilityTests.java 10 Nov 2004 06:57:33 -0000 1.2
***************
*** 20,26 ****
import org.krysalis.version.VersionException;
/**
! *
* @author $Author$
* @version $Revision$
--- 20,27 ----
import org.krysalis.version.VersionException;
+ import org.krysalis.version.impl.apache.ApacheVersion;
/**
! *
* @author $Author$
* @version $Revision$
***************
*** 31,34 ****
--- 32,36 ----
/**
* Constructor for CompatibilityTests.
+ *
* @param arg0
*/
***************
*** 57,72 ****
}
! public void testSameMajorMinorButDifferentRelease()
! throws VersionException {
testCompatible("1.0-alpha", "1.0-dev");
}
public void testSameMajorMinorButDifferentReleaseFirstRelease()
! throws VersionException {
testCompatible(false, "1.0", "1.0-dev");
}
public void testSameMajorMinorButDifferentReleaseSecondRelease()
! throws VersionException {
testCompatible("1.0-dev", "1.0");
}
--- 59,73 ----
}
! public void testSameMajorMinorButDifferentRelease() throws VersionException {
testCompatible("1.0-alpha", "1.0-dev");
}
public void testSameMajorMinorButDifferentReleaseFirstRelease()
! throws VersionException {
testCompatible(false, "1.0", "1.0-dev");
}
public void testSameMajorMinorButDifferentReleaseSecondRelease()
! throws VersionException {
testCompatible("1.0-dev", "1.0");
}
***************
*** 81,109 ****
public void testCompatible(String controlStr, String str2)
! throws VersionException {
testCompatible(true, controlStr, str2);
}
! public void testCompatible(
! boolean compatible,
! String controlStr,
! String testStr)
! throws VersionException {
! ApacheVersion controlVersion =
! VersionImporter.importApacheVersion(controlStr);
! ApacheVersion testVersion =
! VersionImporter.importApacheVersion(testStr);
testCompatible(compatible, controlVersion, testVersion);
}
! public void testCompatible(
! boolean compatible,
! ApacheVersion controlVersion,
! ApacheVersion testVersion) {
! assertEquals(
! "Compatible v1 [" + controlVersion + " ] ~ [" + testVersion + " ]",
! compatible,
! controlVersion.isCompatible(testVersion));
}
}
--- 82,102 ----
public void testCompatible(String controlStr, String str2)
! throws VersionException {
testCompatible(true, controlStr, str2);
}
! public void testCompatible(boolean compatible, String controlStr,
! String testStr) throws VersionException {
! ApacheVersion controlVersion = new ApacheVersion(controlStr);
! ApacheVersion testVersion = new ApacheVersion(testStr);
testCompatible(compatible, controlVersion, testVersion);
}
! public void testCompatible(boolean compatible,
! ApacheVersion controlVersion, ApacheVersion testVersion) {
! assertEquals("Compatible v1 [" + controlVersion + " ] ~ ["
! + testVersion + " ]", compatible, controlVersion
! .isCompatible(testVersion));
}
}
Index: VersionTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/VersionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionTest.java 9 Nov 2004 07:54:51 -0000 1.1
--- VersionTest.java 10 Nov 2004 06:57:33 -0000 1.2
***************
*** 22,25 ****
--- 22,26 ----
import junit.framework.TestCase;
+ import org.krysalis.version.impl.apache.ApacheVersion;
import org.krysalis.version.impl.data.ReleaseLevel;
***************
*** 29,126 ****
public class VersionTest extends TestCase {
! private ApacheVersion m_version11A1 = null;
! private ApacheVersion m_version11A2 = null;
! private ApacheVersion m_version11B1 = null;
! private ApacheVersion m_version12A1 = null;
! private ApacheVersion m_version21A1 = null;
! //private VersionReference m_version11A1Ref = null;
! //private VersionReference m_version11A2Ref = null;
! //private VersionReference m_version11B1Ref = null;
! //private VersionReference m_version12A1Ref = null;
! //private VersionReference m_version21A1Ref = null;
! /**
! * Constructor for VersionTest.
! * @param arg0
! */
! public VersionTest(String arg0) {
! super(arg0);
! }
! public static void main(String[] args) {
! junit.textui.TestRunner.run(VersionTest.class);
! }
! /**
! * @see TestCase#setUp()
! */
! protected void setUp() throws Exception {
! m_version11A1 =
! TestApacheVersion.getTestVersion(1, 1, ReleaseLevel.ALPHA, 1);
! m_version11A2 =
! TestApacheVersion.getTestVersion(1, 1, ReleaseLevel.ALPHA, 2);
! m_version11B1 =
! TestApacheVersion.getTestVersion(1, 1, ReleaseLevel.BETA, 1);
! m_version12A1 =
! TestApacheVersion.getTestVersion(1, 2, ReleaseLevel.ALPHA, 1);
! m_version21A1 =
! TestApacheVersion.getTestVersion(2, 1, ReleaseLevel.ALPHA, 1);
! }
! /**
! * @see TestCase#tearDown()
! */
! protected void tearDown() throws Exception {
! m_version11A1 = null;
! m_version11A2 = null;
! m_version11B1 = null;
! m_version12A1 = null;
! m_version21A1 = null;
! }
! /*
! * Test for boolean equals(Object)
! */
! public void testEqualsObject() {
! assertTrue("self equal to self", m_version11A1.equals(m_version11A1));
! assertTrue(
! "Alpha not equal to beta",
! !m_version11A1.equals(m_version11B1));
! assertTrue("minor changes", !m_version11A1.equals(m_version12A1));
! }
! public void testCompareTo() {
! assertTrue(
! "compares to self",
! m_version11A1.compareTo(m_version11A1) == 0);
! assertTrue(
! "alpha less than beta",
! m_version11A1.compareTo(m_version11B1) < 0);
! assertTrue(
! "11 beta with 12 alpha",
! m_version11B1.compareTo(m_version12A1) < 0);
! assertTrue(
! "11 alpha with 12 alpha",
! m_version11A1.compareTo(m_version12A1) < 0);
! }
! public void testCompareTo2() {
! TreeSet set = new TreeSet();
! set.add(m_version11A1);
! set.add(m_version11A2);
! set.add(m_version11B1);
! set.add(m_version12A1);
! set.add(m_version21A1);
! //for ( Iterator ii = set.iterator(); ii.hasNext(); )
! //{
! // ((VersionContainer)ii.next()).dump(System.out);
! //}
! Iterator i = set.iterator();
! assertTrue("11A1 comes first", m_version11A1.equals(i.next()));
! }
}
--- 30,123 ----
public class VersionTest extends TestCase {
! private ApacheVersion m_version11A1 = null;
! private ApacheVersion m_version11A2 = null;
! private ApacheVersion m_version11B1 = null;
! private ApacheVersion m_version12A1 = null;
! private ApacheVersion m_version21A1 = null;
! // private VersionReference m_version11A1Ref = null;
! // private VersionReference m_version11A2Ref = null;
! // private VersionReference m_version11B1Ref = null;
! // private VersionReference m_version12A1Ref = null;
! // private VersionReference m_version21A1Ref = null;
! /**
! * Constructor for VersionTest.
! *
! * @param arg0
! */
! public VersionTest(String arg0) {
! super(arg0);
! }
! public static void main(String[] args) {
! junit.textui.TestRunner.run(VersionTest.class);
! }
! /**
! * @see TestCase#setUp()
! */
! protected void setUp() throws Exception {
! m_version11A1 = new ApacheVersion("1.1-a1");
! m_version11A2 = new ApacheVersion("1.1-a2");
! m_version11B1 = new ApacheVersion("1.1-b1");
! m_version12A1 = new ApacheVersion("1.2-a1");
! m_version21A1 = new ApacheVersion("2.1-a1");
! }
! /**
! * @see TestCase#tearDown()
! */
! protected void tearDown() throws Exception {
! m_version11A1 = null;
! m_version11A2 = null;
! m_version11B1 = null;
! m_version12A1 = null;
! m_version21A1 = null;
! }
! /*
! * Test for boolean equals(Object)
! */
! public void testEqualsObject() {
! assertTrue("self equal to self", m_version11A1.equals(m_version11A1));
! assertTrue("Alpha not equal to beta", !m_version11A1
! .equals(m_version11B1));
! assertTrue("minor changes", !m_version11A1.equals(m_version12A1));
! }
! public void testCompareTo() {
! assertTrue("compares to self",
! m_version11A1.compareTo(m_version11A1) == 0);
! assertTrue("alpha less than beta", m_version11A1
! .compareTo(m_version11B1) < 0);
! assertTrue("11 beta with 12 alpha", m_version11B1
! .compareTo(m_version12A1) < 0);
! assertTrue("11 alpha with 12 alpha", m_version11A1
! .compareTo(m_version12A1) < 0);
! }
!
! public void testCompareTo2() {
! TreeSet set = new TreeSet();
!
! set.add(m_version11A1);
! set.add(m_version11A2);
! set.add(m_version11B1);
! set.add(m_version12A1);
! set.add(m_version21A1);
!
! // for ( Iterator ii = set.iterator(); ii.hasNext(); )
! // {
! // ((VersionContainer)ii.next()).dump(System.out);
! // }
!
! Iterator i = set.iterator();
!
! assertTrue("11A1 comes first", m_version11A1.equals(i.next()));
! }
}
--- ResolverTests.java DELETED ---
--- TestApacheVersion.java DELETED ---
--- ImporterTests.java DELETED ---
Index: VersionImporterTests.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/VersionImporterTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionImporterTests.java 9 Nov 2004 07:54:51 -0000 1.1
--- VersionImporterTests.java 10 Nov 2004 06:57:33 -0000 1.2
***************
*** 17,27 ****
package org.krysalis.version.impl;
import junit.framework.TestCase;
- import org.krysalis.common.log.Logger;
import org.krysalis.version.VersionException;
import org.krysalis.version.impl.data.ReleaseLevel;
- import org.krysalis.version.specification.ApacheVersionSpecification;
- import org.krysalis.version.specification.VersionSpecification;
/**
--- 17,29 ----
package org.krysalis.version.impl;
+ import java.util.logging.Logger;
+
import junit.framework.TestCase;
import org.krysalis.version.VersionException;
+ import org.krysalis.version.VersionSpecification;
+ import org.krysalis.version.impl.apache.ApacheVersion;
+ import org.krysalis.version.impl.apache.ApacheVersionSpecification;
import org.krysalis.version.impl.data.ReleaseLevel;
/**
***************
*** 32,36 ****
super(arg0);
! Logger.testInit();
}
--- 34,38 ----
super(arg0);
!
}
***************
*** 74,78 ****
private ApacheVersion importApacheVersion(String data) throws VersionException {
! ApacheVersion version = VersionImporter.importApacheVersion(data);
return version;
--- 76,80 ----
private ApacheVersion importApacheVersion(String data) throws VersionException {
! ApacheVersion version = new ApacheVersion(data);
return version;
Index: VersionIdentifierTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/VersionIdentifierTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionIdentifierTest.java 9 Nov 2004 07:54:51 -0000 1.1
--- VersionIdentifierTest.java 10 Nov 2004 06:57:33 -0000 1.2
***************
*** 19,24 ****
import junit.framework.TestCase;
! import org.apache.depot.version.impl.sample.Version1;
! import org.krysalis.version.version.Version;
/**
--- 19,24 ----
import junit.framework.TestCase;
! import org.krysalis.version.Version;
! import org.krysalis.version.VersionIdentifier;
/**
***************
*** 47,51 ****
VersionIdentifier id =
! VersionIdentifier.extractVersionIdentifier(Version1.class);
assertEquals("Correctly trim ", idKey, id.getKey());
--- 47,51 ----
VersionIdentifier id =
! VersionIdentifier.extractVersionIdentifier(Version.class);
assertEquals("Correctly trim ", idKey, id.getKey());
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click