velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wgl...@apache.org
Subject svn commit: r530634 - in /velocity/texen/trunk/build: build.xml testcases.xml
Date Fri, 20 Apr 2007 04:15:53 GMT
Author: wglass
Date: Thu Apr 19 21:15:52 2007
New Revision: 530634

URL: http://svn.apache.org/viewvc?view=rev&rev=530634
Log:
attempt to make gump work by moving Texen test to separate build file (as it was before)

Added:
    velocity/texen/trunk/build/testcases.xml   (with props)
Modified:
    velocity/texen/trunk/build/build.xml

Modified: velocity/texen/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/texen/trunk/build/build.xml?view=diff&rev=530634&r1=530633&r2=530634
==============================================================================
--- velocity/texen/trunk/build/build.xml (original)
+++ velocity/texen/trunk/build/build.xml Thu Apr 19 21:15:52 2007
@@ -509,70 +509,12 @@
 
 
   <target name="test"
-          depends="build-prepare,compile-test,test-texen,test-texen-classpath"/>
+          depends="build-prepare,compile-test"
+          description="runs the test cases">
 
-    <!-- ================================================================ -->
-    <!-- T E X E N  T E S T                                               -->
-    <!-- ================================================================ -->
-    <!-- Generate turbine service code via Texen                          -->
-    <!-- ================================================================ -->
+    <ant antfile="${ant.build.dir}/testcases.xml"
+         target="test-all"/>
 
-    <target name="test-texen">
-
-      <taskdef name="texen" classname="org.apache.texen.ant.TexenTask"
-               classpathref="test.classpath"/>
-
-      <texen
-        contextProperties="${test.dir}/texen/service.props,${test.dir}/texen/additional.props"
-        controlTemplate="Control.vm"
-        outputDirectory="${build.test}/texen"
-        templatePath="${test.dir}/texen/templates"
-        outputFile="report"
-      />
-
-      <java classname="${test.runner}" fork="yes" dir="${app.dir}" failonerror="${test.haltonerror}"
-            classpathref="test.classpath">
-        <arg value="org.apache.texen.TexenTestCase"/>
-      </java>
-
-    </target>
-
-    <!-- ================================================================ -->
-    <!-- T E X E N  C L A S S P A T H                                     -->
-    <!-- ================================================================ -->
-    <!-- Generate turbine service code via Texen with all the templates   -->
-    <!-- and ancillary files in a JAR.                                    -->
-    <!-- ================================================================ -->
-
-    <target name="test-texen-classpath">
-
-    <path id="test.texen.classpath">
-        <fileset dir="${build.test.lib}">
-          <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${build.lib}">
-          <include name="**/*.jar"/>
-        </fileset>
-        <pathelement location="${build.dest}" />
-        <pathelement location="${build.test.dest}" />
-        <pathelement location="${test.dir}/texen-classpath/test.jar"/>
-    </path>
-
-      <taskdef name="texen" classname="org.apache.texen.ant.TexenTask" classpathref="test.texen.classpath"/>
-
-      <texen
-        useClassPath="true"
-        contextProperties="service.props"
-        controlTemplate="Control.vm"
-        outputDirectory="${build.test}/texen-classpath"
-        outputFile="report"
-      />
-
-      <java classname="${test.runner}" fork="yes" dir="${app.dir}" failonerror="${test.haltonerror}"
-            classpathref="test.classpath">
-        <arg value="org.apache.texen.TexenClasspathTestCase"/>
-      </java>
-
-    </target>
+   </target>
 
 </project>

Added: velocity/texen/trunk/build/testcases.xml
URL: http://svn.apache.org/viewvc/velocity/texen/trunk/build/testcases.xml?view=auto&rev=530634
==============================================================================
--- velocity/texen/trunk/build/testcases.xml (added)
+++ velocity/texen/trunk/build/testcases.xml Thu Apr 19 21:15:52 2007
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.    
+-->
+
+<!-- 
+  TestCases for Texen.  Kept in a separate file for Gump compatibility.
+-->
+
+<project name="main" default="test-all" basedir="..">
+  <property file="${user.home}/.ant.properties" />
+  <property file="${user.home}/build.properties" />
+  <property file=".ant.properties" />
+
+  <!-- This file contains all the defaults -->
+  <property file="build/build.properties" />
+
+  <!-- JUnit Testbed properties -->
+  <property name="test.runner" value="junit.textui.TestRunner"/>
+
+  <!-- Build classpath -->
+  <path id="test.classpath">
+    <fileset dir="${build.lib}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${build.test.lib}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <pathelement location="${build.dest}"/>
+    <pathelement location="${build.test.dest}"/>
+  </path>
+
+
+  <target name="test-all"
+          depends="test-texen,test-texen-classpath"
+          description="Runs all tests"/>
+
+
+    <!-- ================================================================ -->
+    <!-- T E X E N  T E S T                                               -->
+    <!-- ================================================================ -->
+    <!-- Generate turbine service code via Texen                          -->
+    <!-- ================================================================ -->
+
+    <target name="test-texen">
+
+      <taskdef name="texen" classname="org.apache.texen.ant.TexenTask"
+               classpathref="test.classpath"/>
+
+      <texen
+        contextProperties="${test.dir}/texen/service.props,${test.dir}/texen/additional.props"
+        controlTemplate="Control.vm"
+        outputDirectory="${build.test}/texen"
+        templatePath="${test.dir}/texen/templates"
+        outputFile="report"
+      />
+
+      <java classname="${test.runner}" fork="yes" dir="${app.dir}" failonerror="${test.haltonerror}"
+            classpathref="test.classpath">
+        <arg value="org.apache.texen.TexenTestCase"/>
+      </java>
+
+    </target>
+
+    <!-- ================================================================ -->
+    <!-- T E X E N  C L A S S P A T H                                     -->
+    <!-- ================================================================ -->
+    <!-- Generate turbine service code via Texen with all the templates   -->
+    <!-- and ancillary files in a JAR.                                    -->
+    <!-- ================================================================ -->
+
+    <target name="test-texen-classpath">
+
+    <path id="test.texen.classpath">
+        <fileset dir="${build.test.lib}">
+          <include name="**/*.jar"/>
+        </fileset>
+        <fileset dir="${build.lib}">
+          <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="${build.dest}" />
+        <pathelement location="${build.test.dest}" />
+        <pathelement location="${test.dir}/texen-classpath/test.jar"/>
+    </path>
+
+      <taskdef name="texen" classname="org.apache.texen.ant.TexenTask" classpathref="test.texen.classpath"/>
+
+      <texen
+        useClassPath="true"
+        contextProperties="service.props"
+        controlTemplate="Control.vm"
+        outputDirectory="${build.test}/texen-classpath"
+        outputFile="report"
+      />
+
+      <java classname="${test.runner}" fork="yes" dir="${app.dir}" failonerror="${test.haltonerror}"
+            classpathref="test.texen.classpath">
+        <arg value="org.apache.texen.TexenClasspathTestCase"/>
+      </java>
+
+    </target>
+
+</project>

Propchange: velocity/texen/trunk/build/testcases.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/texen/trunk/build/testcases.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision



Mime
View raw message