Return-Path: 
 <svn-return-9001-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
X-Original-To: apmail-forrest-svn-archive@www.apache.org
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DAAF3238C
	for <apmail-forrest-svn-archive@www.apache.org>;
 Sat,  7 May 2011 04:14:32 +0000 (UTC)
Received: (qmail 76228 invoked by uid 500); 7 May 2011 04:14:31 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 76098 invoked by uid 500); 7 May 2011 04:14:30 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 76083 invoked by uid 99); 7 May 2011 04:14:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 04:14:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 04:14:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 30AF923889EA; Sat,  7 May 2011 04:14:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1100442 - in /forrest/trunk/whiteboard/forrest-osgi:
 master.xml
 org.apache.forrest.util/build.xml
 org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java
Date: Sat, 07 May 2011 04:14:05 -0000
To: svn@forrest.apache.org
From: bdube@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110507041405.30AF923889EA@eris.apache.org>

Author: bdube
Date: Sat May  7 04:14:04 2011
New Revision: 1100442

URL: http://svn.apache.org/viewvc?rev=1100442&view=rev
Log:
Add generic test harness to build process using JUnit and break on failed tests

Modified:
    forrest/trunk/whiteboard/forrest-osgi/master.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java

Modified: forrest/trunk/whiteboard/forrest-osgi/master.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/master.xml?rev=1100442&r1=1100441&r2=1100442&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/master.xml (original)
+++ forrest/trunk/whiteboard/forrest-osgi/master.xml Sat May  7 04:14:04 2011
@@ -43,13 +43,16 @@
   <property name="bundle.bnd.file" location="" />
   <property name="src.dir" location="src" />
   <property name="java.src.dir" location="${src.dir}/java" />
+  <property name="java.test.src.dir" location="${src.dir}/test" />
   <property name="bundle.resource.dir" location="${src.dir}/bundle" />
   <property name="build.dir" location="build" />
   <property name="build.classes" location="${build.dir}/classes" />
+  <property name="build.test.classes" location="${build.dir}/test" />
   <property name="jar.file" value="${bundle.symbolic.name}.jar" />
 
   <target name="init">
     <mkdir dir="${build.classes}" />
+    <mkdir dir="${build.test.classes}" />
 
     <path id="classpath">
       <fileset dir="${forrest.lib.dir}" includes="*.jar" />
@@ -68,7 +71,36 @@
     </javac>
   </target>
 
-  <target name="jar" depends="compile">
+  <target name="compile-tests" depends="compile">
+    <echo>Compiling tests for ${ant.project.name}</echo>
+    <javac srcdir="${java.test.src.dir}"
+           destdir="${build.test.classes}"
+           debug="true"
+           includeantruntime="false">
+      <classpath>
+        <pathelement location="${forrest.lib.dir}/junit-4.8.1.jar" />
+        <pathelement location="${build.classes}" />
+        <pathelement location="${java.test.src.dir}" />
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="test" depends="compile,compile-tests">
+    <junit printsummary="true"
+           failureproperty="junit.failure">
+      <classpath>
+        <pathelement location="${forrest.lib.dir}/junit-4.8.1.jar" />
+        <pathelement location="${build.classes}" />
+        <pathelement location="${build.test.classes}" />
+      </classpath>
+      <batchtest>
+        <fileset dir="${build.test.classes}" />
+      </batchtest>
+    </junit>
+    <fail if="junit.failure" message="There are unit test failures. Please check the output above." />
+  </target>
+
+  <target name="jar" depends="test">
     <echo>Packaging ${ant.project.name}</echo>
     <jar destfile="${build.dir}/${jar.file}">
       <fileset dir="${build.classes}" />

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml?rev=1100442&r1=1100441&r2=1100442&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml (original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml Sat May  7 04:14:04 2011
@@ -25,29 +25,6 @@
   <property name="bundle.symbolic.name" value="org.apache.forrest.util" />
   <property name="bundle.bnd.file" location="util.bnd" />
 
-  <target name="compile-tests">
-    <javac srcdir="src/test"
-           destdir="build/classes"
-           debug="true"
-           includeantruntime="false">
-      <compilerarg value="-Xlint" />
-      <classpath>
-        <pathelement location="../lib/junit-4.8.1.jar" />
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile-tests">
-    <java classname="org.junit.runner.JUnitCore"
-          fork="no">
-      <classpath>
-        <pathelement location="../lib/junit-4.8.1.jar" />
-        <pathelement location="build/classes" />
-      </classpath>
-      <arg value="org.apache.forrest.util.ContentTypeTest" />
-    </java>
-  </target>
-
   <import file="../master.xml" />
 
 </project>

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java?rev=1100442&r1=1100441&r2=1100442&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java (original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/test/org/apache/forrest/util/ContentTypeTest.java Sat May  7 04:14:04 2011
@@ -23,16 +23,18 @@ import org.apache.forrest.util.ContentTy
 
 public class ContentTypeTest {
 
+  static final String HTML_NAME = "index.html";
+
   @Test
   public void getExtensionByName() {
-    String extension = ContentType.getExtensionByName("index.html");
-    assertTrue("html".equals(extension));
+    String extension = ContentType.getExtensionByName(HTML_NAME);
+    assertEquals("html", extension);
   }
 
   @Test
   public void getContentTypeByName() {
-    String contentType = ContentType.getContentTypeByName("index.html");
-    assertTrue("text/html".equals(contentType));
+    String contentType = ContentType.getContentTypeByName(HTML_NAME);
+    assertEquals("text/html", contentType);
   }
 
 }