diff --git a/src/etc/testcases/taskdefs/recorder.xml b/src/etc/testcases/taskdefs/recorder.xml
new file mode 100644
index 000000000..6bbec57b7
--- /dev/null
+++ b/src/etc/testcases/taskdefs/recorder.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<project name="recorder-test" default="all" basedir=".">
+
+    <property name="recdir" location="recorder"/>
+
+    <target name="all" depends="noappend,append,restart,deleterestart"/>
+
+    <target name="prepare">
+        <fixcrlf srcdir="${recdir}" includes="*.result"/>
+    </target>
+
+
+    <target name="noappend">
+        <copy file="${recdir}/rectest2.result" tofile="${recdir}/rectest1.log"/>
+        <record name="${recdir}/rectest1.log" action="start" />
+        <echo message="some message1"/>
+        <record name="${recdir}/rectest1.log" action="stop" />
+    </target>
+
+    <target name="append">
+        <copy file="${recdir}/rectest1.result" tofile="${recdir}/rectest2.log"/>
+        <record name="${recdir}/rectest2.log" append="true" action="start"/>
+        <echo message="some message2"/>
+        <record name="${recdir}/rectest2.log" action="stop"/>
+    </target>
+
+    <target name="restart">
+        <record name="${recdir}/rectest3.log" action="start"/>
+        <echo message="some message1"/>
+        <record name="${recdir}/rectest3.log" action="stop"/>
+        <echo message="some message2"/>
+        <record name="${recdir}/rectest3.log" action="start"/>
+        <echo message="some message3"/>
+        <record name="${recdir}/rectest3.log" action="stop"/>
+    </target>
+
+    <target name="deleterestart">
+        <record name="${recdir}/rectest4.log" action="start"/>
+        <echo message="some message1"/>
+        <record name="${recdir}/rectest4.log" action="stop"/>
+        <delete file="${recdir}/rectest4.log"/>
+        <echo message="some message2"/>
+        <record name="${recdir}/rectest4.log" action="start"/>
+        <echo message="some message3"/>
+        <record name="${recdir}/rectest4.log" action="stop"/>
+    </target>
+
+
+    <target name="cleanup">
+        <delete file="${recdir}/rectest1.log"/>
+        <delete file="${recdir}/rectest2.log"/>
+        <delete file="${recdir}/rectest3.log"/>
+        <delete file="${recdir}/rectest4.log"/>
+    </target>
+
+</project>
diff --git a/src/etc/testcases/taskdefs/recorder/rectest1.result b/src/etc/testcases/taskdefs/recorder/rectest1.result
new file mode 100644
index 000000000..0f8013f3f
--- /dev/null
+++ b/src/etc/testcases/taskdefs/recorder/rectest1.result
@@ -0,0 +1 @@
+     [echo] some message1
diff --git a/src/etc/testcases/taskdefs/recorder/rectest2.result b/src/etc/testcases/taskdefs/recorder/rectest2.result
new file mode 100644
index 000000000..80550fddc
--- /dev/null
+++ b/src/etc/testcases/taskdefs/recorder/rectest2.result
@@ -0,0 +1,2 @@
+     [echo] some message1
+     [echo] some message2
diff --git a/src/etc/testcases/taskdefs/recorder/rectest3.result b/src/etc/testcases/taskdefs/recorder/rectest3.result
new file mode 100644
index 000000000..e4961774c
--- /dev/null
+++ b/src/etc/testcases/taskdefs/recorder/rectest3.result
@@ -0,0 +1,2 @@
+     [echo] some message1
+     [echo] some message3
diff --git a/src/etc/testcases/taskdefs/recorder/rectest4.result b/src/etc/testcases/taskdefs/recorder/rectest4.result
new file mode 100644
index 000000000..db6239e03
--- /dev/null
+++ b/src/etc/testcases/taskdefs/recorder/rectest4.result
@@ -0,0 +1 @@
+     [echo] some message3
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/RecorderTest.java b/src/testcases/org/apache/tools/ant/taskdefs/RecorderTest.java
new file mode 100644
index 000000000..760317f96
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/RecorderTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright  2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+import java.io.IOException;
+
+/**
+ * @version $Revision$
+ */
+public class RecorderTest extends BuildFileTest {
+
+    public RecorderTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/recorder.xml");
+        executeTarget("prepare");
+    }
+
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+
+    public void testNoAppend() throws IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("noappend");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("recorder/rectest1.result"),
+                                           project.resolveFile("recorder/rectest1.log")));
+    }
+
+    public void testAppend() throws IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("append");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("recorder/rectest2.result"),
+                                           project.resolveFile("recorder/rectest2.log")));
+    }
+
+    public void testRestart() throws IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("restart");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("recorder/rectest3.result"),
+                                           project.resolveFile("recorder/rectest3.log")));
+    }
+
+    public void testDeleteRestart() throws IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("deleterestart");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("recorder/rectest4.result"),
+                                           project.resolveFile("recorder/rectest4.log")));
+    }
+
+}