diff --git a/src/test/org/apache/lucene/search/TestDateFilter.java b/src/test/org/apache/lucene/search/TestDateFilter.java
new file mode 100644
index 00000000000..4cb65f44109
--- /dev/null
+++ b/src/test/org/apache/lucene/search/TestDateFilter.java
@@ -0,0 +1,143 @@
+package org.apache.lucene.search;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache Lucene" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache Lucene", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Hits;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.analysis.SimpleAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.DateField;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+ /**
+  * DateFilter JUnit tests.
+  *
+  * @author Otis Gospodnetic
+  * @version $Revision$
+  */
+public class TestDateFilter
+    extends TestCase
+{
+    public TestDateFilter(String name)
+    {
+	super(name);
+    }
+
+    /**
+     *
+     */
+    public static void testBefore()
+	throws IOException
+    {
+	// create an index
+        RAMDirectory indexStore = new RAMDirectory();
+        IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true);
+
+ 	long now = System.currentTimeMillis();
+
+ 	Document doc = new Document();
+ 	// add time that is in the past
+ 	doc.add(Field.Text("datefield", DateField.timeToString(now - 1000)));
+ 	doc.add(Field.Text("body", "Today is a very sunny day in New York City"));
+  	writer.addDocument(doc);
+ 	writer.optimize();
+	writer.close();
+
+	IndexSearcher searcher = new IndexSearcher(indexStore);
+
+	// filter that should preserve matches
+	DateFilter df1 = DateFilter.Before("datefield", now);
+
+	// filter that should discard matches
+	DateFilter df2 = DateFilter.Before("datefield", now - 999999);
+
+	// search something that doesn't exist with DateFilter
+	Query query1 = new TermQuery(new Term("body", "NoMatchForThis"));
+
+	// search for something that does exists
+	Query query2 = new TermQuery(new Term("body", "sunny"));
+
+	Hits result;
+
+	// ensure that queries return expected results without DateFilter first
+	result = searcher.search(query1);
+	assertEquals(0, result.length());
+
+	result = searcher.search(query2);
+	assertEquals(1, result.length());
+
+
+	// run queries with DateFilter
+	result = searcher.search(query1, df1);
+	assertEquals(0, result.length());
+
+	result = searcher.search(query1, df2);
+	assertEquals(0, result.length());
+
+ 	result = searcher.search(query2, df1);
+ 	assertEquals(1, result.length());
+
+	result = searcher.search(query2, df2);
+	assertEquals(0, result.length());
+    }
+}