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/07/31 21:31:50 UTC
svn commit: rev 31051 - in incubator/depot/trunk/version/src: java templates test/java/org/apache/depot/version/ant/stamp
Author: nickchalko
Date: Sat Jul 31 14:31:49 2004
New Revision: 31051
Removed:
incubator/depot/trunk/version/src/templates/Version.java.jet
Modified:
incubator/depot/trunk/version/src/java/depot-version-antlib.xml
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
Log:
No need to test the old version generator anymore.
Modified: incubator/depot/trunk/version/src/java/depot-version-antlib.xml
==============================================================================
--- incubator/depot/trunk/version/src/java/depot-version-antlib.xml (original)
+++ incubator/depot/trunk/version/src/java/depot-version-antlib.xml Sat Jul 31 14:31:49 2004
@@ -11,11 +11,11 @@
-->
<antlib>
<!-- Generate a version class in a *.java (does NOT compile it) -->
- <taskdef name="version-stamp"
+ <taskdef name="version-stamp-marker"
classname="org.apache.depot.version.ant.stamp.VersionMarkerGeneratorTask"/>
<!-- Generate a version class in a *.java (does NOT compile it) -->
- <taskdef name="version-stamp2"
+ <taskdef name="version-stamp"
classname="org.apache.depot.version.ant.stamp.VersionGeneratorTask"/>
<!-- Document an environment -->
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java Sat Jul 31 14:31:49 2004
@@ -51,17 +51,6 @@
executeTarget("testVersionString");
}
- public void testVersion2String() {
- executeTarget("testVersion2String");
-
- //TODO ok now lets make sure we got what we wanted.
- Version stamp = Version.INSTANCE;
- VersionManager manager = VersionManager.getManager();
- VersionMarker marker = manager.createVersionMarker(stamp);
- assertEquals("Long version of " + stamp + " genreated vs marker", stamp
- .getLongVersion(), marker.getLongVersion());
-// TODO a bunch more tests.
- }
public void testVersionString2() {
executeTarget("testVersionString2");
@@ -75,7 +64,5 @@
executeTarget("testDefaultedAttributes");
}
- public void testDependent() {
- executeTarget("testDependent");
- }
+
}
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml Sat Jul 31 14:31:49 2004
@@ -24,14 +24,7 @@
</version-stamp>
<antcall target="compile"/>
</target>
- <target name="testDependent" depends="init">
- <version-stamp dest="transient/test" overWrite="true" dependent="true">
- <versionMarker versionId="org.apache.acorn.dependent" version="1.2">
- <attribute name="foo" value="bar"/>
- </versionMarker>
- </version-stamp>
- <antcall target="compile"/>
- </target>
+
<target name="testVersionString" depends="init">
<version-stamp dest="transient/test" overWrite="true">
<versionMarker versionId="org.apache.acorn.version" version="1.2">
@@ -64,14 +57,6 @@
<antcall target="compile"/>
</target>
- <target name="testVersion2String" depends="init">
- <version-stamp2 dest="transient/test" overWrite="true">
- <versionMarker versionId="org.apache.acorn.version" version="1.2">
- <attribute name="foo" value="bar"/>
- </versionMarker>
- </version-stamp2>
- <antcall target="compile"/>
- </target>
<target name="compile">