krysalis-version/src/test/java/org/krysalis/version/ant/stamp VersionGeneratorTaskTest.java,1.3,1.4 version.xml,1.2,1.3
Nick Chalko <[email protected]> Thu, 23 Dec 2004 23:03:52 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/ant/stamp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv394/src/test/java/org/krysalis/version/ant/stamp
Modified Files:
VersionGeneratorTaskTest.java version.xml
Log Message:
More genearal fixes.
Index: version.xml
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/ant/stamp/version.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** version.xml 10 Nov 2004 07:56:58 -0000 1.2
--- version.xml 23 Dec 2004 23:03:50 -0000 1.3
***************
*** 1,78 ****
<?xml version="1.0"?>
<project name="version-test" basedir="../../../../../../../.." default="test">
! <taskdef resource="org/krysalis/version/ant/antlib.xml"/>
! <target name="init">
! <delete dir="transient/test"/>
! <mkdir dir="transient/test"/>
! <delete dir="transient/classes"/>
! <mkdir dir="transient/classes"/>
! </target>
! <target name="testComplex" depends="init">
! <version-stamp dest="transient/test" >
! <versionMarker versionId="org.apache.acorn">
! <version major="1" minor="2"/>
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
! <target name="testComplexAttributed" depends="init">
! <version-stamp dest="transient/test" >
! <versionMarker versionId="org.apache.acorn.attr">
! <version major="1" minor="2"/>
! <attribute name="foo" value="bar"/>
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
! <target name="testVersionString" depends="init">
! <version-stamp dest="transient/test" >
! <versionMarker versionId="org.apache.acorn.version" version="1.2">
! <attribute name="foo" value="bar"/>
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
! <target name="testVersionString2" depends="init">
! <version-stamp dest="transient/test"
! versionId="org.apache.acorn.version" version="1.2" />
! <antcall target="compile"/>
! </target>
! <target name="testVersionString3" depends="init">
! <version-stamp dest="transient/test"
! versionId="org.apache.acorn.version" version="1.2" >
! <versionMarker>
! <attribute name="foo" value="bar"/>
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
! <target name="testDefaultedAttributes" depends="init">
! <version-stamp dest="transient/test" >
! <versionMarker versionId="org.apache.acorn.defaulted" version="1.2">
! <defaultAttributes/>
! <attribute name="foo" value="bar"/>
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
!
!
! <target name="testDevVersion" depends="init">
! <version-stamp dest="transient/test" >
! <versionMarker versionId="org.apache.acorn.dev" version="1.2.1-dev">
! </versionMarker>
! </version-stamp>
! <antcall target="compile"/>
! </target>
!
!
!
!
! <target name="compile">
! <javac srcdir="transient/test" destdir="transient/classes">
! <classpath path="transient/classes"/>
! </javac>
! </target>
! <target name="test" depends="testComplex, testComplexAttributed, testVersionString, testVersionString2, testVersionString3, testDefaultedAttributes"/>
</project>
--- 1,88 ----
<?xml version="1.0"?>
<project name="version-test" basedir="../../../../../../../.." default="test">
! <taskdef resource="org/krysalis/version/ant/antlib.xml" />
! <target name="init">
! <delete dir="transient/test" />
! <mkdir dir="transient/test" />
! <delete dir="transient/classes" />
! <mkdir dir="transient/classes" />
! </target>
! <target name="testComplex" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn">
! <version major="1" minor="2" />
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
! <target name="testComplexAttributed" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn.attr">
! <version major="1" minor="2" />
! <attribute name="foo" value="bar" />
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
! <target name="testVersionString" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn.version" version="1.2">
! <attribute name="foo" value="bar" />
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
! <target name="testVersionString2" depends="init">
! <version-stamp dest="transient/test"
! versionId="org.apache.acorn.version"
! version="1.2" />
! <antcall target="compile" />
! </target>
! <target name="testVersionString3" depends="init">
! <version-stamp dest="transient/test"
! versionId="org.apache.acorn.version"
! version="1.2">
! <versionMarker>
! <attribute name="foo" value="bar" />
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
! <target name="testDefaultedAttributes" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn.defaulted" version="1.2">
! <defaultAttributes />
! <attribute name="foo" value="bar" />
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
!
!
! <target name="testDevVersion" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn.dev" version="1.2.1-dev">
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
!
! <target name="testDevLongVersion" depends="init">
! <version-stamp dest="transient/test">
! <versionMarker versionId="org.apache.acorn.dev"
! version="1.2.1-dev7-123">
! </versionMarker>
! </version-stamp>
! <antcall target="compile" />
! </target>
!
!
! <target name="compile">
! <javac srcdir="transient/test" destdir="transient/classes">
! <classpath path="transient/classes" />
! </javac>
! </target>
! <target name="test"
! depends="testComplex, testComplexAttributed, testVersionString, testVersionString2, testVersionString3, testDefaultedAttributes" />
</project>
Index: VersionGeneratorTaskTest.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/test/java/org/krysalis/version/ant/stamp/VersionGeneratorTaskTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionGeneratorTaskTest.java 10 Nov 2004 07:56:58 -0000 1.3
--- VersionGeneratorTaskTest.java 23 Dec 2004 23:03:49 -0000 1.4
***************
*** 17,21 ****
import org.apache.tools.ant.Project;
! public class VersionGeneratorTaskTest extends BuildFileTest {
/**
--- 17,21 ----
import org.apache.tools.ant.Project;
! public class VersionGeneratorTaskTest extends BuildFileTest {
/**
***************
*** 58,61 ****
--- 58,64 ----
executeTarget("testDevVersion");
}
+ public void testDevLongVersion() {
+ executeTarget("testDevLongVersion");
+ }
}
\ No newline at end of file
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/