beehive-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Eddie O'Neil <ekon...@gmail.com>
Subject Re: svn commit: r332417 - in /beehive/trunk/controls/test: build.xml infra/tch/tchx.jar tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java
Date Fri, 11 Nov 2005 01:50:11 GMT
  Forgot to acknowledge the contribution here -- Jacob Danner
contributed the patch to fix the DTD problem.

  Thanks, Jacob!

Eddie


On 11/10/05, ekoneil@apache.org <ekoneil@apache.org> wrote:
> Author: ekoneil
> Date: Thu Nov 10 17:47:39 2005
> New Revision: 332417
>
> URL: http://svn.apache.org/viewcvs?rev=332417&view=rev
> Log:
> Controls test infrastructure cleanup:
>
> - stop resolving a DTD over the network; this allows the tests to be run offline
> - move the tch.* output files into the controls/test/build directory
>
> BB: self
> Test: Controls BVT pass
>
>
> Modified:
>     beehive/trunk/controls/test/build.xml
>     beehive/trunk/controls/test/infra/tch/tchx.jar
>     beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java
>
> Modified: beehive/trunk/controls/test/build.xml
> URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/build.xml?rev=332417&r1=332416&r2=332417&view=diff
> ==============================================================================
> --- beehive/trunk/controls/test/build.xml (original)
> +++ beehive/trunk/controls/test/build.xml Thu Nov 10 17:47:39 2005
> @@ -6,15 +6,15 @@
>     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.
> -
> +
>     $Header:$
>   -->
>  <project name="Beehive/Controls/Test" default="usage">
> @@ -27,15 +27,15 @@
>
>      <property file="${beehive.home}/controls/test/common/path.properties"/>
>
> -    <taskdef name="apt"
> -             classname="org.apache.beehive.controls.runtime.generator.AptTask"
> -             classpathref="controls.dependency.path"
> +    <taskdef name="apt"
> +             classname="org.apache.beehive.controls.runtime.generator.AptTask"
> +             classpathref="controls.dependency.path"
>               onerror="report"/>
>
> -    <taskdef name="assemble"
> -             classname="org.apache.beehive.controls.runtime.assembly.AssembleTask"
> -             classpathref="controls.dependency.path"
> -             onerror="report"/>
> +    <taskdef name="assemble"
> +             classname="org.apache.beehive.controls.runtime.assembly.AssembleTask"
> +             classpathref="controls.dependency.path"
> +             onerror="report"/>
>
>      <taskdef name="mantis"
>               classname="org.apache.beehive.test.tools.mantis.MantisTask"
> @@ -52,7 +52,7 @@
>      <taskdef name="finally"
>               classname="org.apache.beehive.test.tools.ant.FinallyTask"
>               classpath="${ant-ext.jar}"/>
> -
> +
>      <taskdef name="tch"
>               classname="org.apache.beehive.test.tools.tch.TchVMTask"
>               classpathref="tch.run.classpath"/>
> @@ -123,7 +123,6 @@
>          <pathelement path="${mantis.milton.srcgen.dir}"/>
>          <pathelement path="${build.drivers}"/>
>          <pathelement location="${build.tests}"/>
> -         <!-- the following are needed for axis clients -->
>          <path refid="webservice.classpath"/>
>      </path>
>
> @@ -152,7 +151,7 @@
>          <delete dir="${mantis.milton.cases.dir}"/>
>          <delete file="velocity.log"/>
>          <delete>
> -            <fileset dir="." includes="tch*.*"/>
> +            <fileset dir="${basedir}" includes="tch*.*"/>
>          </delete>
>          <ant dir="webapps" target="clean" inheritAll="false"/>
>      </target>
> @@ -166,14 +165,14 @@
>          <mkdir dir="${build.testsrc}"/>
>          <mkdir dir="${build.jars}"/>
>      </target>
> -
> +
>      <target name="build-test-beans" depends="dirs">
>
>          <echo message="** Compiling Controls **"/>
> -        <apt srcdir="${controls.test.controls}"
> -             destdir="${build.beans}"
> +        <apt srcdir="${controls.test.controls}"
> +             destdir="${build.beans}"
>               gendir="${build.beansrc}"
> -             debug="on"
> +             debug="on"
>               classpathref="test.classpath"
>               srcExtensions="*.java,*.jcx,*.jcs">
>              <!--compilerarg line="-Xmaxerrs 0" /-->
> @@ -196,7 +195,7 @@
>      </target>
>
>      <!-- Aux files are those needed for tests but which must be built before beans/drivers
> -         like Checkers.  Files in 'aux' should only have dependecies on the existing
classpath and
> +         like Checkers.  Files in 'aux' should only have dependecies on the existing
classpath and
>           have NO DEPENDENCIES on artifacts from this build process! -->
>      <target name="build-test-auxilaries" depends="dirs">
>          <echo message="Building Test Auxilary Files into ${build.beans}"/>
> @@ -205,12 +204,12 @@
>              destdir="${build.beans}"
>              gendir="${build.beansrc}"
>              classpathref="test.classpath"
> -            debug="on"
> +            debug="on"
>              verbose="false"
>              failonerror="true"
>              srcExtensions="*.java"/>
>      </target>
> -
> +
>      <target name="build-test-drivers" depends="dirs">
>
>          <echo>build helper class for testing controls</echo>
> @@ -239,7 +238,7 @@
>      <target name="build-test-units" depends="dirs">
>          <!-- Build the test source directory -->
>
> -        <!-- First APT process Unit files.  There should be a lot of files in here
needing processing. -->
> +        <!-- First APT process Unit files.  There should be a lot of files in here
needing processing. -->
>          <apt srcdir="${controls.test.units}"
>              destdir="${build.tests}"
>              gendir="${build.beansrc}"
> @@ -311,7 +310,7 @@
>          </copy>
>
>          <jar destfile="${controlstestjunits.jar}" basedir="${build.tests}"/>
> -
> +
>      </target>
>
>      <target name="build-test-webapp" depends="build-test-drivers">
> @@ -349,9 +348,9 @@
>
>          <property name="test.freq" value="detailed"/>
>
> -        <antcall target="run.test"/>
> +        <antcall target="run.test"/>
>      </target>
> -
> +
>      <target name="run.test">
>          <antcall target="build-test-webapp"/>
>          <parallel>
> @@ -378,7 +377,7 @@
>                  </try>
>              </sequential>
>          </parallel>
> -    </target>
> +    </target>
>
>      <!-- ==================================================================== -->
>      <!--                                                                      -->
> @@ -402,7 +401,7 @@
>          <property name="tch.filter.frequencies" value="${test.freq}"/>
>          <echoproperties prefix="tch.filter"/>
>          <gethostname/> <!-- set ${hostname} -->
> -        <property name="gtlf.dtd.use.remote" value="true"/>
> +        <property name="gtlf.dtd.use.remote" value="false"/>
>          <property name="gtlf.dtd.remote" value="http://incubator.apache.org/beehive/dtd/gtlf/gtlf-config-2.0.dtd"/>
>          <property name="gtlf.dtd.local" value="infra/gtlf/gtlf-config-2.0.dtd"/>
>
> @@ -419,7 +418,7 @@
>               classpathref="tch.run.classpath"
>               failureproperty="run.failed"
>               failonerror="${tch.fail-build}"
> -             dir="${controls.test.root}"
> +             dir="${controls.test.root}/build"
>               inheritall="true">
>               <arg value="-emacs"/>
>               <property name="tch.replication.entry-point" value="ant -f ${controls.test.root}/build.xml
run"/>
> @@ -429,10 +428,10 @@
>               <sysproperty key="gtlf.dtd.remote" value="${gtlf.dtd.remote}"/>
>               <sysproperty key="gtlf.dtd.local" value="${gtlf.dtd.local}"/>
>          </tch>
> -
> +
>          <ant antfile="${controls.test.infra.dir}/tch/runtime/build.xml" target="generate-html-log"
dir="${controls.test.root}" inheritAll="false">
> -            <property name="gtlf.file" location="${controls.test.root}/${tch.base-logfile-name}.xml"/>
> -            <property name="output.file" location="${controls.test.root}/${tch.base-logfile-name}.html"/>
> +            <property name="gtlf.file" location="${controls.test.root}/build/${tch.base-logfile-name}.xml"/>
> +            <property name="output.file" location="${controls.test.root}/build/${tch.base-logfile-name}.html"/>
>              <property name="controls.test.infra.dir" location="${controls.test.infra.dir}"/>
>              <property name="controls.test.root" location="${controls.test.root}"/>
>              <property name="beehive.home" location="${beehive.home}"/>
>
> Modified: beehive/trunk/controls/test/infra/tch/tchx.jar
> URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tchx.jar?rev=332417&r1=332416&r2=332417&view=diff
> ==============================================================================
> Binary files - no diff available.
>
> Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java
> URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java?rev=332417&r1=332416&r2=332417&view=diff
> ==============================================================================
> --- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java
(original)
> +++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/GTLFLogger.java
Thu Nov 10 17:47:39 2005
> @@ -18,7 +18,7 @@
>
>  /**
>   * Logger class that writes the GTLF format
> - *
> + *
>   * @version 1.0, Mar 3, 2001
>   */
>  public class GTLFLogger
> @@ -92,8 +92,8 @@
>     */
>    public void logInit(Map m)
>    {
> -    // we do not want to override stuff in GTLFHeaderParams with null so
> -    // check that it really is in 'm'
> +    // we do not want to override stuff in GTLFHeaderParams with null so
> +    // check that it really is in 'm'
>      if (m.get(EXPECTED_NUM_TESTS) != null)
>      {
>        GTLFHeaderParams.put(PARAM_HEAD_RESULTCOUNT, m.get(EXPECTED_NUM_TESTS));
> @@ -139,7 +139,7 @@
>        return;
>
>      // HACK, should not be outcome, dammit
> -    // Looks like Scratch is no longer an outcome,
> +    // Looks like Scratch is no longer an outcome,
>      // 99% we can remove this
>      if (res.getType() == SCRATCH_LEVEL_INT)
>      {
> @@ -177,7 +177,7 @@
>      if ( use_remote == null || use_remote.toLowerCase().equals("true") )
>      {
>        String remote_dtd = System.getProperty("gtlf.dtd.remote");
> -      dtd_ref = ( ( remote_dtd == null ) ?
> +      dtd_ref = ( ( remote_dtd == null ) ?
>          DEFAULT_DTD_REF : "<!DOCTYPE " + TEST_LOG_ELEMENT
>                    + " PUBLIC \"-//BEA Systems, Inc.//DTD GTLF 1.0//EN\""
>                    + " \"" + remote_dtd + "\">");
> @@ -198,11 +198,11 @@
>                    + " \"" + local_dtd + "\">";
>        }
>      }
> -
> +
>      buf
>        .append("<?xml version=\"1.0\"?>")
>        .append(sep)
> -      .append(dtd_ref)
> +//      .append(dtd_ref)
>        .append(sep)
>        .append(sep)
>        .append("<" + TEST_LOG_ELEMENT + " ")
>
>
>

Mime
View raw message