krysalis-version/src/test/java/org/krysalis/version/impl/data VersionIdentifierTest.java,1.1,1.2 ApacheVersionTest.java,1.1,1.2 VersionImporterTests.java,1.1,1.2 CompatibilityTests.java,1.1,1.2 ApacheVersionSpecTest.java,1.1,1.2 ImporterTests.java,1.1,NONE TestApacheVersion.java,1.1,NONE ResolverTests.java,1.1,NONE TestApacheVersionMarker.java,1.1,NONE

Nick Chalko <[email protected]> Tue, 09 Nov 2004 08:01:21 +0000
Newsgroups gmane.comp.krysalis.cvs
Message-ID <[email protected]>
Update of /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3460/src/test/java/org/krysalis/version/impl/data

Modified Files:
	VersionIdentifierTest.java ApacheVersionTest.java 
	VersionImporterTests.java CompatibilityTests.java 
	ApacheVersionSpecTest.java 
Removed Files:
	ImporterTests.java TestApacheVersion.java ResolverTests.java 
	TestApacheVersionMarker.java 
Log Message:
Working on the tests.

--- TestApacheVersionMarker.java DELETED ---

Index: CompatibilityTests.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/data/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:48 -0000	1.1
--- CompatibilityTests.java	9 Nov 2004 08:01:19 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  
  import org.krysalis.version.VersionException;
+ import org.krysalis.version.impl.apache.ApacheVersion;
  
  /**
***************
*** 91,97 ****
  		throws VersionException {
  		ApacheVersion controlVersion =
! 			VersionImporter.importApacheVersion(controlStr);
  		ApacheVersion testVersion =
! 			VersionImporter.importApacheVersion(testStr);
  		testCompatible(compatible, controlVersion, testVersion);
  	}
--- 92,98 ----
  		throws VersionException {
  		ApacheVersion controlVersion =
! 			new ApacheVersion(controlStr);
  		ApacheVersion testVersion =
! 			new ApacheVersion(testStr);
  		testCompatible(compatible, controlVersion, testVersion);
  	}

Index: ApacheVersionTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/data/ApacheVersionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ApacheVersionTest.java	9 Nov 2004 07:54:48 -0000	1.1
--- ApacheVersionTest.java	9 Nov 2004 08:01:19 -0000	1.2
***************
*** 17,23 ****
  
  import org.krysalis.version.VersionException;
  import org.krysalis.version.VersionTestCase;
! import org.krysalis.version.impl.data.ReleaseLevel;
! import org.krysalis.version.specification.formatting.VersionFormatException;
  
  /**
--- 17,24 ----
  
  import org.krysalis.version.VersionException;
+ import org.krysalis.version.VersionFormatException;
  import org.krysalis.version.VersionTestCase;
! import org.krysalis.version.impl.CompoundVersion;
! import org.krysalis.version.impl.apache.ApacheVersion;
  
  /**

--- 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/data/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:48 -0000	1.1
--- VersionImporterTests.java	9 Nov 2004 08:01:19 -0000	1.2
***************
*** 28,32 ****
   * @author ajack
   */
! public class VersionImporterTests extends TestCase {
  	public VersionImporterTests(String arg0) {
  		super(arg0);
--- 28,32 ----
   * @author ajack
   */
! public class  extends TestCase {
  	public VersionImporterTests(String arg0) {
  		super(arg0);

Index: ApacheVersionSpecTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/data/ApacheVersionSpecTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ApacheVersionSpecTest.java	9 Nov 2004 07:54:48 -0000	1.1
--- ApacheVersionSpecTest.java	9 Nov 2004 08:01:19 -0000	1.2
***************
*** 17,32 ****
  
  import java.util.Iterator;
  
  import junit.framework.TestCase;
  
- import org.krysalis.common.log.Logger;
  import org.krysalis.version.VersionException;
! import org.krysalis.version.specification.ApacheVersionSpecification;
! import org.krysalis.version.specification.DatetimestampedVersionSpecification;
! import org.krysalis.version.specification.EclipseVersionSpecification;
! import org.krysalis.version.specification.JavasoftVersionSpecification;
! import org.krysalis.version.specification.VersionSpecification;
! import org.krysalis.version.specification.VersionSpecificationFactory;
! import org.krysalis.version.specification.experimental.JakartaCommonsVersionSpecification;
  
  /**
--- 17,29 ----
  
  import java.util.Iterator;
+ import java.util.logging.Logger;
  
  import junit.framework.TestCase;
  
  import org.krysalis.version.VersionException;
! import org.krysalis.version.VersionSpecification;
! import org.krysalis.version.VersionSpecificationFactory;
! import org.krysalis.version.impl.VersionImplementationConstants;
! import org.krysalis.version.impl.apache.ApacheVersionSpecification;
  
  /**
***************
*** 41,59 ****
          //Logger.testInit();
          
! 		checkVersionSpecification(
! 				VersionImplementationConstants.DATETIMESTAMPED_VERSION_ID,
! 				DatetimestampedVersionSpecification.class);
  		checkVersionSpecification(
  				VersionImplementationConstants.APACHE_VERSION_ID,
  				ApacheVersionSpecification.class);
! 		checkVersionSpecification(
! 				VersionImplementationConstants.ECLIPSE_VERSION_ID,
! 				EclipseVersionSpecification.class);
! 		checkVersionSpecification(
! 				VersionImplementationConstants.JAVASOFT_VERSION_ID,
! 				JavasoftVersionSpecification.class);
! 		checkVersionSpecification(
! 				VersionImplementationConstants.JAKARTA_COMMONS_VERSION_ID,
! 				JakartaCommonsVersionSpecification.class);
      }
      
--- 38,46 ----
          //Logger.testInit();
          
! 		
  		checkVersionSpecification(
  				VersionImplementationConstants.APACHE_VERSION_ID,
  				ApacheVersionSpecification.class);
! 
      }
      
***************
*** 67,71 ****
      		VersionSpecification spec = VersionSpecificationFactory.createVersionSpecificationFromId((String)i.next());
      		count ++;
!     		Logger.getLogger().debug("Spec: " + spec);
      	}
      	
--- 54,58 ----
      		VersionSpecification spec = VersionSpecificationFactory.createVersionSpecificationFromId((String)i.next());
      		count ++;
!     		//Logger.getLogger().debug("Spec: " + spec);
      	}
      	

Index: VersionIdentifierTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/impl/data/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:48 -0000	1.1
--- VersionIdentifierTest.java	9 Nov 2004 08:01:19 -0000	1.2
***************
*** 19,24 ****
  import junit.framework.TestCase;
  
! import org.apache.depot.version.impl.sample.Version1;
! import org.krysalis.version.version.Version;
  
  /**
--- 19,25 ----
  import junit.framework.TestCase;
  
! import org.krysalis.version.Version;
! import org.krysalis.version.VersionIdentifier;
! import org.krysalis.version.impl.VersionImplementationConstants;
  
  /**
***************
*** 47,51 ****
  
  		VersionIdentifier id =
! 			VersionIdentifier.extractVersionIdentifier(Version1.class);
  
  		assertEquals("Correctly trim ", idKey, id.getKey());
--- 48,52 ----
  
  		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