[jboss-svn-commits] JBL Code SVN: r5153 - in labs/jbossesb/trunk: . ESBCore ESBCore/common ESBCore/common/tests ESBCore/common/tests/src ESBCore/common/tests/src/org ESBCore/common/tests/src/org/jboss ESBCore/common/tests/src/org/jboss/soa ESBCore/common/tests/src/org/jboss/soa/esb ESBCore/common/tests/src/org/jboss/soa/esb/common ESBCore/common/tests/src/org/jboss/soa/esb/common/tests ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses ESBCore/listeners ESBCore/listeners/tests ESBCore/listeners/tests/src ESBCore/listeners/tests/src/org ESBCore/listeners/tests/src/org/jboss ESBCore/listeners/tests/src/org/jboss/soa ESBCore/listeners/tests/src/org/jboss/soa/esb ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests ESBCore/processors ESBCore/processors/tests ESBCore/processors/tests/src ESBCore/processors/tests/src/org ESBCore/processors/tests/src/org/jboss ESBCore/processors/tests/src/org/jboss/soa ESBCore/p! rocessors/tests/src/org/jboss/soa/esb ESBCore/processors/tests/src/org/jboss/soa/esb/processors ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests ESBCore/services ESBCore/services/tests ESBCore/services/tests/src ESBCore/services/tests/src/org ESBCore/services/tests/src/org/jboss ESBCore/services/tests/src/org/jboss/soa ESBCore/services/tests/src/org/jboss/soa/esb ESBCore/services/tests/src/org/jboss/soa/esb/services ESBCore/services/tests/src/org/jboss/soa/esb/services/tests lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 18 14:25:35 EDT 2006
Author: arvinder
Date: 2006-07-18 14:24:55 -0400 (Tue, 18 Jul 2006)
New Revision: 5153
Added:
labs/jbossesb/trunk/ESBCore/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/build.xml
labs/jbossesb/trunk/ESBCore/common/tests/src/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/ESBCore/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
labs/jbossesb/trunk/ESBCore/listeners/tests/src/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
labs/jbossesb/trunk/ESBCore/processors/tests/src/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/build.xml
labs/jbossesb/trunk/ESBCore/services/tests/src/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
labs/jbossesb/trunk/lib/ext/junit.jar
Removed:
labs/jbossesb/trunk/ESBCore/common/tests/build.xml
labs/jbossesb/trunk/ESBCore/common/tests/src/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
labs/jbossesb/trunk/ESBCore/listeners/tests/src/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/
labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
labs/jbossesb/trunk/ESBCore/processors/tests/src/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/
labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
labs/jbossesb/trunk/ESBCore/services/tests/build.xml
labs/jbossesb/trunk/ESBCore/services/tests/src/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/
labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
Modified:
labs/jbossesb/trunk/ESBCore/build.xml
labs/jbossesb/trunk/ESBCore/common/build.xml
labs/jbossesb/trunk/ESBCore/listeners/build.xml
labs/jbossesb/trunk/ESBCore/processors/build.xml
labs/jbossesb/trunk/ESBCore/services/build.xml
labs/jbossesb/trunk/build.xml
Log:
Merge with cleaned up refactor branch
Modified: labs/jbossesb/trunk/ESBCore/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -18,12 +18,6 @@
</tstamp>
</target>
- <!--
- <condition property="org.jboss.esb.internal.dest" value="..">
- <equals arg1="$org.jboss.esb.internal.dest}" arg2=""/>
- </condition>
- -->
-
<!-- =================================================================== -->
<!-- Prepares the directory structure -->
<!-- =================================================================== -->
@@ -35,15 +29,28 @@
<!-- =================================================================== -->
<!-- Compiles all the classes -->
<!-- =================================================================== -->
-
<target name="org.jboss.esb.core.compile" depends="org.jboss.esb.core.prepare" description="Compile subprojects">
<echo message="Compiling submodules"/>
<ant dir="common"/>
<ant dir="services"/>
<ant dir="processors"/>
<ant dir="listeners"/>
- <ant dir="tests"/>
+ <!--
+ <ant dir="tests"/>
+ -->
</target>
+
+ <!-- =================================================================== -->
+ <!-- Test all the classes -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.core.test" depends="org.jboss.esb.core.compile" description="Test subprojects">
+ <echo message="Testing submodules"/>
+ <ant dir="common" target="org.jboss.esb.common.test"/>
+ <ant dir="listeners" target="org.jboss.esb.listeners.test"/>
+ <ant dir="processors" target="org.jboss.esb.processors.test"/>
+ <ant dir="services" target="org.jboss.esb.services.test"/>
+ </target>
+
<!-- =================================================================== -->
<!-- Assemble jars -->
@@ -72,21 +79,38 @@
<!-- Clean all -->
<!-- =================================================================== -->
<target name="clean" description="Clean dist directory and cleans subprojects">
- <ant dir="common" target="clean"/>
- <ant dir="listeners" target="clean"/>
- <ant dir="processors" target="clean"/>
- <ant dir="services" target="clean"/>
- <ant dir="tests" target="clean"/>
+ <delete dir="${org.jboss.esb.internal.dest}"/>
+ <!--
+ for now I am going to delete the build directory as each module builds
+ to a common place, so calling clean on each module does not make sense,
+ that is unless we later configure the clean task to delete <module>
+ specific classes
+ -->
+ <!--
+ <ant dir="common" target="clean"/>
+ <ant dir="listeners" target="clean"/>
+ <ant dir="processors" target="clean"/>
+ <ant dir="services" target="clean"/>
+ -->
+ <!-- tests are now per module, this will be cleaned up later
+ <ant dir="tests" target="clean"/>
+ -->
</target>
<target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.internal.dest}/dist"/>
-
- <ant dir="common" target="purge"/>
+ <!--
+ <delete dir="${org.jboss.esb.internal.dest}/dist"/>
+ -->
+ <!-- see comment above w.r.t clean and where module are build to -->
+ <!--
+ <ant dir="common" target="purge"/>
<ant dir="listeners" target="purge"/>
<ant dir="processors" target="purge"/>
<ant dir="services" target="purge"/>
- <ant dir="tests" target="purge"/>
+ -->
+ <!-- tests are now per module, this will be cleaned up later
+ <ant dir="tests" target="purge"/>
+ -->
</target>
<!-- =================================================================== -->
Modified: labs/jbossesb/trunk/ESBCore/common/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/common/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -34,8 +34,17 @@
<target name="purge" depends="clean">
<delete dir="${org.jboss.esb.common.bin.dir}"/>
</target>
-
- <target name="org.jboss.esb.common.compile" depends="org.jboss.esb.common.prepare"
+
+
+ <target name="org.jboss.esb.common.compile">
+ <!-- Compile common -->
+ <antcall target="org.jboss.esb.common.internal.compile"/>
+ <!-- Compile common tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.common.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.common.internal.compile" depends="org.jboss.esb.common.prepare"
description="Compile all classes">
<javac
@@ -61,6 +70,16 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+
+ <target name="org.jboss.esb.common.test" description="Run tests for this module">
+ <!-- Compile common tests -->
+ <ant dir="tests" target="org.jboss.esb.common.internal.test"/>
+ </target>
+
+
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Copied: labs/jbossesb/trunk/ESBCore/common/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/common/tests/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.common.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test">
- <antcall target="org.jboss.esb.common.internal.test.unit"/>
- <antcall target="org.jboss.esb.common.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/common/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/common/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/common/tests/build.xml (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.common.tests;
-
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-
-/**
- * Base test class for esb test classes, uses jboss logging.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class BaseTest extends TestCase {
-
- /**
- * The Logger.
- */
- protected Logger log = Logger.getLogger(getClass());
-
- /**
- * Default class constructor.
- */
- public BaseTest() {
- }
-
- /**
- * Utility constructor.
- * @param name The test name.
- */
- public BaseTest(String name) {
- super(name);
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java)
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,124 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.common.tests.bizclasses;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the address class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class AddressUnitTest extends BaseTest {
-
-
- public void testAddress() throws Exception {
- Address address = getAddress();
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
- }
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject addressA = getAddress();
- addressA.setPackage();
-
- BobjStdDTO oDto = addressA.toDTO();
- System.out.println(oDto.toXml());
-
- Address addressB = (Address) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(addressB.toDTO().toXml());
-
- assertTrue("Expecting AddressA == AddressB", addressA.toDTO().toXml().equals(addressB.toDTO().toXml()));
- }
-
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole, String p_sCtry, String p_sCity,
- String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/AddressUnitTest.java)
Deleted: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,204 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.common.tests.bizclasses;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.common.bizclasses.Person;
-import org.jboss.soa.esb.common.bizclasses.OneValue;
-import org.jboss.soa.esb.common.bizclasses.Address;
-import org.jboss.soa.esb.common.bizclasses.Telephone;
-import org.jboss.soa.esb.util.BaseBusinessObject;
-import org.jboss.soa.esb.util.BobjStdDTO;
-
-/**
- * Unit test for the person class.
- *
- * @author <a href="mailto:schifest at gmail.com">Esteban Shifman</a>
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class PersonUnitTest extends BaseTest {
-
-
- public void testPerson() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.pfx to be Mr. Actual was " +
- person.getField(Person.ATTRIB.pfx), person.getField(Person.ATTRIB.pfx).equals("Mr."));
- assertTrue("Expecting Person.fmlyN to be Brum. Actual was " +
- person.getField(Person.ATTRIB.fmlyN), person.getField(Person.ATTRIB.fmlyN).equals("Brum"));
- assertTrue("Expecting Person.givN to be Daniel. Actual was " +
- person.getField(Person.ATTRIB.givN), person.getField(Person.ATTRIB.givN).equals("Daniel"));
- assertTrue("Expecting Person.sfx to be the 1st.. Actual was " +
- person.getField(Person.ATTRIB.sfx), person.getField(Person.ATTRIB.sfx).equals("the 1st."));
-
- }
-
- public void testPersonEmail() throws Exception {
-
- Person person = getPerson();
-
- String expectedEmail0 = "<OneValue rol=\"home\" v=\"myaddr at gmail.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(0).toString(), person.getEmailAt(0).toString().equals(expectedEmail0));
-
- String expectedEmail1 = "<OneValue rol=\"work\" v=\"john.smith at jboss.com\"/>";
- assertTrue("Expecting Person.email[0] to be Actual was " +
- person.getEmailAt(1).toString(), person.getEmailAt(1).toString().equals(expectedEmail1));
- }
-
- public void testPersonTelephone() throws Exception {
-
- Person person = getPerson();
-
- assertTrue("Expecting Person.phone[0].role to be basement. Actual was " +
- person.getPhoneAt(0).getRole(), person.getPhoneAt(0).getRole().equals("basement"));
- assertTrue("Expecting Person.phone[0].country to be 1. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(0).getField(Telephone.ATTRIB.cntry).equals("1"));
- assertTrue("Expecting Person.phone[0].city to be 416. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.city), person.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[0].num to be 555-1212. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.num), person.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Person.phone[0].ext to be null. Actual was " +
- person.getPhoneAt(0).getField(Telephone.ATTRIB.ext), person.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Person.phone[1].role to be basement. Actual was " +
- person.getPhoneAt(1).getRole(), person.getPhoneAt(1).getRole().equals("cell"));
- assertTrue("Expecting Person.phone[1].country to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), person.getPhoneAt(1).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Person.phone[1].city to be 416. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.city), person.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Person.phone[1].num to be 666-4444. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.num), person.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("666-4444"));
- assertTrue("Expecting Person.phone[1].ext to be null. Actual was " +
- person.getPhoneAt(1).getField(Telephone.ATTRIB.ext), person.getPhoneAt(1).getField(Telephone.ATTRIB.ext) == null);
-
- }
-
- public void testPersonAddress() throws Exception {
-
- Address address = getPerson().getAddressAt(0);
- assertTrue("Expecting Address.strNum to be 50. Actual was " +
- address.getField(Address.ATTRIB.strNum), address.getField(Address.ATTRIB.strNum).equals("50"));
- assertTrue("Expecting Address.strLine1 to be Balcarce. Actual was " +
- address.getField(Address.ATTRIB.strLine1), address.getField(Address.ATTRIB.strLine1).equals("Balcarce"));
- assertTrue("Expecting Address.twnCty1 to be San Isidro. Actual was " +
- address.getField(Address.ATTRIB.twnCty1), address.getField(Address.ATTRIB.twnCty1).equals("San Isidro"));
- assertTrue("Expecting Address.postalZip to be 1642. Actual was " +
- address.getField(Address.ATTRIB.postalZip), address.getField(Address.ATTRIB.postalZip).equals("1642"));
- assertTrue("Expecting Address.provSt to be Buenos Aires. Actual was " +
- address.getField(Address.ATTRIB.provSt), address.getField(Address.ATTRIB.provSt).equals("Buenos Aires"));
- assertTrue("Expecting Address.cntry to be Argentina. Actual was " +
- address.getField(Address.ATTRIB.cntry), address.getField(Address.ATTRIB.cntry).equals("Argentina"));
-
- // Phone
- assertTrue("Expecting Address.phone[0].role to be torIP. Actual was " +
- address.getPhoneAt(0).getRole(), address.getPhoneAt(0).getRole().equals("torIP"));
- assertTrue("Expecting Address.phone[0].country to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(0).getField(Telephone.ATTRIB.cntry) == null);
- assertTrue("Expecting Address.phone[0].city to be 416. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.city), address.getPhoneAt(0).getField(Telephone.ATTRIB.city).equals("416"));
- assertTrue("Expecting Address.phone[0].num to be 555-1212. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.num), address.getPhoneAt(0).getField(Telephone.ATTRIB.num).equals("555-1212"));
- assertTrue("Expecting Address.phone[0].ext to be null. Actual was " +
- address.getPhoneAt(0).getField(Telephone.ATTRIB.ext), address.getPhoneAt(0).getField(Telephone.ATTRIB.ext) == null);
-
- assertTrue("Expecting Address.phone[1].role to be home. Actual was " +
- address.getPhoneAt(1).getRole(), address.getPhoneAt(1).getRole().equals("home"));
- assertTrue("Expecting Address.phone[1].country to be 54. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry), address.getPhoneAt(1).getField(Telephone.ATTRIB.cntry).equals("54"));
- assertTrue("Expecting Address.phone[1].city to be 11. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.city), address.getPhoneAt(1).getField(Telephone.ATTRIB.city).equals("11"));
- assertTrue("Expecting Address.phone[1].num to be 4555-1111. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.num), address.getPhoneAt(1).getField(Telephone.ATTRIB.num).equals("4555-1111"));
- assertTrue("Expecting Address.phone[1].ext to be 7. Actual was " +
- address.getPhoneAt(1).getField(Telephone.ATTRIB.ext), address.getPhoneAt(1).getField(Telephone.ATTRIB.ext).equals("7"));
-
-
- }
-
-
-
-
-
- public void testToDTO() throws Exception {
- BaseBusinessObject personA = getPerson();
- personA.setPackage();
-
- BobjStdDTO oDto = personA.toDTO();
- System.out.println(oDto.toXml());
-
- Person personB = (Person) BaseBusinessObject.getFromDTO(oDto);
- System.out.println(personB.toDTO().toXml());
-
- assertTrue("Expecting PersonA == PersonB", personA.toDTO().toXml().equals(personB.toDTO().toXml()));
- }
-
-
- static Person getPerson() throws Exception {
- Person oP = new Person((String) null);
- oP.setField(Person.ATTRIB.pfx, "Mr.");
- oP.setField(Person.ATTRIB.fmlyN, "Brum");
- oP.setField(Person.ATTRIB.givN, "Daniel");
- oP.setField(Person.ATTRIB.sfx, "the 1st.");
-
- oP.addAddress(getAddress());
-
- oP.addEmail(OneValue.getStringValue("myaddr at gmail.com", "home"));
- oP.addEmail(OneValue.getStringValue("john.smith at jboss.com", "work"));
-
- oP.addPhone(newPhone("basement", "1", "416", "555-1212", null));
- oP.addPhone(newPhone("cell", null, "416", "666-4444", null));
-
- return oP;
- }
-
- static Address getAddress() throws Exception {
- Address oP = new Address((String) null);
- oP.setField(Address.ATTRIB.strNum, "50");
- oP.setField(Address.ATTRIB.strLine1, "Balcarce");
- oP.setField(Address.ATTRIB.twnCty1, "San Isidro");
- oP.setField(Address.ATTRIB.postalZip, "1642");
- oP.setField(Address.ATTRIB.provSt, "Buenos Aires");
- oP.setField(Address.ATTRIB.cntry, "Argentina");
-
- oP.addPhone(newPhone("torIP", null, "416", "555-1212", null));
- oP.addPhone(newPhone("home", "54", "11", "4555-1111", "7"));
-
- return oP;
- }
-
- public static Telephone newPhone(String p_sRole,
- String p_sCtry, String p_sCity, String p_sNum, String p_sExt) {
- Telephone oP = new Telephone((String) null);
- oP.setRole(p_sRole);
- oP.setField(Telephone.ATTRIB.cntry, p_sCtry);
- oP.setField(Telephone.ATTRIB.city, p_sCity);
- oP.setField(Telephone.ATTRIB.num, p_sNum);
- oP.setField(Telephone.ATTRIB.ext, p_sExt);
-
- return oP;
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/common/tests/src/org/jboss/soa/esb/common/tests/bizclasses/PersonUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/listeners/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -40,7 +40,18 @@
<delete dir="${org.jboss.esb.listeners.bin.dir}"/>
</target>
- <target name="org.jboss.esb.listeners.compile" depends="org.jboss.esb.listeners.prepare"
+
+
+ <target name="org.jboss.esb.listeners.compile">
+ <!-- Compile listeners -->
+ <antcall target="org.jboss.esb.listeners.internal.compile"/>
+ <!-- Compile listener tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.listeners.tests.compile"/>
+ </target>
+
+
+
+ <target name="org.jboss.esb.listeners.internal.compile" depends="org.jboss.esb.listeners.prepare"
description="Compile all classes">
<javac
@@ -66,6 +77,14 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+
+ <target name="org.jboss.esb.listeners.test" description="Run tests for this module">
+ <!-- Compile listener tests -->
+ <ant dir="tests" target="org.jboss.esb.listeners.internal.test"/>
+ </target>
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests)
Deleted: labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/tests/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.listeners.tests" default="org.jboss.esb.listeners.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.listeners.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test">
- <antcall target="org.jboss.esb.listeners.internal.test.unit"/>
- <antcall target="org.jboss.esb.listeners.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/listeners/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.listeners.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/listeners/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/build.xml (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners)
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests)
Deleted: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.listeners.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/listeners/tests/src/org/jboss/soa/esb/listeners/tests/DummyUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/processors/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/processors/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/processors/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -40,7 +40,16 @@
<delete dir="${org.jboss.esb.processors.bin.dir}"/>
</target>
- <target name="org.jboss.esb.processors.compile" depends="org.jboss.esb.processors.prepare"
+
+ <target name="org.jboss.esb.processors.compile">
+ <!-- Compile processors -->
+ <antcall target="org.jboss.esb.processors.internal.compile"/>
+ <!-- Compile processors tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.processors.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.processors.internal.compile" depends="org.jboss.esb.processors.prepare"
description="Compile all classes">
<javac
@@ -66,6 +75,14 @@
/>
</target>
- <target name="all" depends="recompile,jar" />
+ <target name="org.jboss.esb.processors.test" description="Run tests for this module">
+ <!-- Compile processors tests -->
+ <ant dir="tests" target="org.jboss.esb.processors.internal.test"/>
+ </target>
+
+
+
+ <target name="all" depends="recompile,jar" />
+
</project>
Copied: labs/jbossesb/trunk/ESBCore/processors/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests)
Deleted: labs/jbossesb/trunk/ESBCore/processors/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/processors/tests/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/processors/tests/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.processors.tests" default="org.jboss.esb.processors.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.processors.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test">
- <antcall target="org.jboss.esb.processors.internal.test.unit"/>
- <antcall target="org.jboss.esb.processors.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/processors/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.processors.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/processors/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/build.xml (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors)
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests)
Deleted: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.processors.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/processors/tests/src/org/jboss/soa/esb/processors/tests/DummyUnitTest.java)
Modified: labs/jbossesb/trunk/ESBCore/services/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/services/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -59,7 +59,16 @@
<!-- Compiles all the classes -->
<!-- =================================================================== -->
- <target name="org.jboss.esb.services.compile" depends="org.jboss.esb.services.prepare"
+
+ <target name="org.jboss.esb.services.compile">
+ <!-- Compile services -->
+ <antcall target="org.jboss.esb.services.internal.compile"/>
+ <!-- Compile services tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.services.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.services.internal.compile" depends="org.jboss.esb.services.prepare"
description="Compile all classes">
<javac
@@ -180,7 +189,7 @@
/>
<jar destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services.jar"
basedir="${org.jboss.esb.internal.dest}/classes"
- includes="**/EJBs/*.class"
+ includes="**/EJBs/*.class"
manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
>
<metainf dir="${org.jboss.esb.services.metainf.dir}" includes="*.xml"
@@ -203,4 +212,16 @@
</target>
+
+ <!-- =================================================================== -->
+ <!-- Test -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.services.test" description="Run tests for this module">
+ <!-- Compile processors tests -->
+ <ant dir="tests" target="org.jboss.esb.services.internal.test"/>
+ </target>
+
+
+
+
</project>
Copied: labs/jbossesb/trunk/ESBCore/services/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests)
Deleted: labs/jbossesb/trunk/ESBCore/services/tests/build.xml
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/services/tests/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<project name="build.services.tests" default="org.jboss.esb.services.tests.compile" basedir=".">
-
- <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
- <path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
- includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- </path>
-
- <target name="org.jboss.esb.tests.init">
- <tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
- </tstamp>
-
- <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
- <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
- </target>
-
- <target name="clean"/>
-
- <target name="purge" depends="clean">
- <delete dir="${org.jboss.esb.tests.bin.dir}"/>
- </target>
-
- <target name="org.jboss.esb.services.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
-
- <javac
- destdir="${org.jboss.esb.tests.bin.dir}"
- classpathref="org.jboss.esb.tests.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.tests.src.dir}"/>
- </javac>
-
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- T E S T -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test">
- <antcall target="org.jboss.esb.services.internal.test.unit"/>
- <antcall target="org.jboss.esb.services.internal.test.functional"/>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- U N I T T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test.unit">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/services/**/**UnitTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-
- <!-- ====================================================================== -->
- <!-- F U NC T I O N A L T E S T S -->
- <!-- ====================================================================== -->
- <target name="org.jboss.esb.services.internal.test.functional">
- <echo message="Running tests for module"/>
- <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <batchtest todir="${org.jboss.esb.tests.report.dir}">
- <fileset dir="${org.jboss.esb.tests.bin.dir}">
- <include name="**/**/services/**/**FuncTest.class"/>
- </fileset>
- </batchtest>
- <classpath>
- <path refid="org.jboss.esb.tests.base.classpath"/>
- <pathelement location="${org.jboss.esb.core.bin.dir}"/>
- <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
- </classpath>
- </junit>
- <junitreport>
- <fileset dir="${org.jboss.esb.tests.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
- <report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
- </junitreport>
- </target>
-
-</project>
Copied: labs/jbossesb/trunk/ESBCore/services/tests/build.xml (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/build.xml)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services)
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests)
Deleted: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java
===================================================================
--- labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java 2006-07-18 18:24:55 UTC (rev 5153)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.services.tests;
-
-import org.jboss.soa.esb.common.tests.BaseTest;
-
-/**
- * Dummy test file.
- *
- * @author <a href="mailto:arvinder.singh at indigo-logic.com">Arvinder Singh</a>
- * @version <tt>$Revision:$</tt>
- * $Id:$
- */
-public class DummyUnitTest extends BaseTest {
-
- /**
- * Remove me
- * @throws Exception
- */
- public void testDummyCompileAndInvoke() throws Exception {
- log.info("****************************************************************");
- log.info(" Dummy unit test called. Replace this with module level tests");
- log.info("****************************************************************");
- }
-
-}
Copied: labs/jbossesb/trunk/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java (from rev 5152, labs/jbossesb/branches/refactor/ESBCore/services/tests/src/org/jboss/soa/esb/services/tests/DummyUnitTest.java)
Modified: labs/jbossesb/trunk/build.xml
===================================================================
--- labs/jbossesb/trunk/build.xml 2006-07-18 18:20:41 UTC (rev 5152)
+++ labs/jbossesb/trunk/build.xml 2006-07-18 18:24:55 UTC (rev 5153)
@@ -13,10 +13,6 @@
<!-- Set default properties filename -->
<property name="org.jboss.esb.properties" value="product.properties"/>
- <!-- Some default build locations -->
- <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
-
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
@@ -56,6 +52,8 @@
<!-- Path names -->
<property name="org.jboss.esb.internal.core" value="ESBCore"/>
+ <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
+ <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
<property name="org.jboss.esb.internal.javadocs.dest" value="javadocs"/>
<!-- Initialisation -->
@@ -80,7 +78,15 @@
<ant dir="ESBCore"/>
</target>
- <!-- javadocs paths -->
+ <!-- Test targets -->
+ <target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
+ <echo message="Testing modules"/>
+ <ant dir="ESBCore" target="org.jboss.esb.core.test"/>
+ </target>
+
+
+
+ <!-- javadocs paths -->
<path id="org.jboss.esb.javadocs.path">
<pathelement path="ESBCore/classes"/>
</path>
@@ -150,7 +156,7 @@
<target name="org.jboss.esb.clean">
<echo message="Cleaning modules"/>
- <echo message="Compiling modules"/>
+ <echo message="Cleaning ESBCore"/>
<ant dir="ESBCore" target="clean"/>
</target>
@@ -166,7 +172,8 @@
<!-- Short target names -->
<target name="compile" depends="org.jboss.esb.compile"/>
- <target name="jar" depends="org.jboss.esb.jar"/>
+ <target name="test" depends="org.jboss.esb.test"/>
+ <target name="jar" depends="org.jboss.esb.jar"/>
<target name="clean" depends="org.jboss.esb.clean"/>
<target name="purge" depends="org.jboss.esb.purge"/>
</project>
Copied: labs/jbossesb/trunk/lib/ext/junit.jar (from rev 5152, labs/jbossesb/branches/refactor/lib/ext/junit.jar)
More information about the jboss-svn-commits
mailing list