[jboss-svn-commits] JBL Code SVN: r8264 - in labs/jbossesb/trunk/product: . core core/listeners core/listeners/tests core/rosetta core/rosetta/src/org/jboss/internal/soa/esb/util core/rosetta/tests core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests core/services core/services/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 12 12:56:15 EST 2006
Author: mark.little at jboss.com
Date: 2006-12-12 12:56:04 -0500 (Tue, 12 Dec 2006)
New Revision: 8264
Added:
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java
Removed:
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpUserInfo.java
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
Log:
Added support for integration tests, with new rule.
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -108,9 +108,15 @@
<!-- Test targets -->
<target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
- <echo message="Testing modules"/>
+ <echo message="Testing of modules, excluding integration tests"/>
<ant dir="core" target="org.jboss.esb.core.test"/>
</target>
+
+ <!-- Integration test targets -->
+ <target name="org.jboss.esb.integration.test" depends="org.jboss.esb.compile">
+ <echo message="Testing of modules, including integration tests"/>
+ <ant dir="core" target="org.jboss.esb.core.integration.test"/>
+ </target>
<!-- javadocs paths -->
<path id="org.jboss.esb.javadocs.path">
@@ -348,6 +354,9 @@
<target name="test">
<runant target="org.jboss.esb.test"/>
</target>
+ <target name="integration">
+ <runant target="org.jboss.esb.integration.test"/>
+ </target>
<target name="jar">
<runant target="org.jboss.esb.jar"/>
</target>
Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -42,14 +42,24 @@
</target>
<!-- =================================================================== -->
- <!-- Test all the classes -->
+ <!-- Test all the classes excluding integration test -->
<!-- =================================================================== -->
<target name="org.jboss.esb.core.test" depends="org.jboss.esb.core.compile" description="Test subprojects">
<echo message="Testing submodules"/>
<ant dir="rosetta" target="org.jboss.esb.rosetta.test"/>
<ant dir="listeners" target="org.jboss.esb.listeners.test"/>
<ant dir="services" target="org.jboss.esb.services.test"/>
- </target>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run all tests including integration -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.core.integration.test" depends="org.jboss.esb.core.compile" description="Integration test subprojects">
+ <echo message="Testing submodules including integration tests"/>
+ <ant dir="rosetta" target="org.jboss.esb.rosetta.integration.test"/>
+ <ant dir="listeners" target="org.jboss.esb.listeners.integration.test"/>
+ <ant dir="services" target="org.jboss.esb.services.integration.test"/>
+ </target>
<!-- =================================================================== -->
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -43,17 +43,13 @@
<target name="purge" depends="clean">
</target>
-
-
<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>
+
<target name="org.jboss.esb.listeners.internal.compile" depends="org.jboss.esb.listeners.prepare"
description="Compile all classes">
@@ -106,9 +102,13 @@
<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>
+
+ <target name="org.jboss.esb.listeners.integration.test" description="Run integration tests for this module">
+ <!-- Compile listener integration tests -->
+ <ant dir="tests" target="org.jboss.esb.listeners.internal.integration.test"/>
+ </target>
-
<target name="all" depends="recompile,jar" />
</project>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -35,7 +35,7 @@
<target name="org.jboss.esb.tests.init">
<tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
+ <format property="TODAY" pattern="dd-MM-yy"/>
</tstamp>
<mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
@@ -94,7 +94,7 @@
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module"/>
+ <echo message="Running tests for module, excluding integration"/>
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
@@ -123,5 +123,71 @@
<report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
- </target>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S TS -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.listeners.internal.integration.test">
+ <property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/listeners"/>
+ <property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+
+ <!-- Instrument the code for code coverage - using emma... -->
+ <delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <mkdir dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <emma>
+ <instr instrpath="${org.jboss.esb.module.classes.dir}"
+ destdir="${org.jboss.esb.module.classes.instr.dir}"
+ metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ </emma>
+ <!-- Run the tests -->
+ <antcall target="org.jboss.esb.services.internal.integration.test.exec"/>
+
+ <!-- Generate the coverage report -->
+ <emma>
+ <report sourcepath="${org.jboss.esb.module.src.dir}" sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${org.jboss.esb.module.tests.coverage.dir}" >
+ <include name="*.emma" />
+ </fileset>
+ <html outfile="${org.jboss.esb.module.tests.coverage.dir}/index.html" depth="method" columns="name,line,class,method,block"/>
+ </report>
+ </emma>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S T S -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.services.internal.integration.test.exec">
+ <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.module.tests.src.dir}">
+ <include name="**/**UnitTest.java"/>
+ <include name="**/**FuncTest.java"/>
+ <include name="**/**IntegrationTest.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <!-- using instrumented code for code coverage -->
+ <pathelement location="${org.jboss.esb.module.classes.instr.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
+ <!-- Need the tests src folder because there may be non-compiled test resources -->
+ <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
+ <path refid="org.jboss.esb.tests.base.classpath"/>
+ </classpath>
+ <!-- emma jvm args -->
+ <jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ <jvmarg value="-Demma.coverage.out.merge=true" />
+ </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>
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -36,7 +36,6 @@
<target name="purge" depends="clean">
</target>
-
<target name="org.jboss.esb.rosetta.compile">
<!-- Compile common -->
<antcall target="org.jboss.esb.rosetta.internal.compile"/>
@@ -44,7 +43,6 @@
<ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
</target>
-
<target name="org.jboss.esb.rosetta.internal.compile" depends="org.jboss.esb.rosetta.prepare"
description="Compile all classes">
@@ -74,16 +72,16 @@
includes="org/jboss/soa/esb/testutils/**/*.class"/>
</target>
-
-
<target name="org.jboss.esb.rosetta.test" description="Run tests for this module">
- <!-- Compile common tests -->
+ <!-- Compile rosetta tests -->
<ant dir="tests" target="org.jboss.esb.rosetta.internal.test"/>
- </target>
+ </target>
+
+ <target name="org.jboss.esb.rosetta.integration.test" description="Run integration tests for this module">
+ <!-- Compile rosetta integration tests -->
+ <ant dir="tests" target="org.jboss.esb.rosetta.internal.integration.test"/>
+ </target>
-
-
-
<target name="all" depends="recompile,jar" />
</project>
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java 2006-12-12 17:56:04 UTC (rev 8264)
@@ -1,3 +1,25 @@
+/*
+ * 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.
+ */
+
/**
*
*/
@@ -38,9 +60,12 @@
private ConfigTree m_oParms;
- private String m_sFtpServer, m_sUser, m_sPasswd;
+ private String m_sFtpServer;
+ private String m_sUser;
+ private String m_sPasswd;
- private String m_sRemoteDir, m_sLocalDir;
+ private String m_sRemoteDir;
+ private String m_sLocalDir;
private int m_iPort;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpUserInfo.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpUserInfo.java 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpUserInfo.java 2006-12-12 17:56:04 UTC (rev 8264)
@@ -1,3 +1,25 @@
+/*
+ * 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.
+ */
+
/**
*
*/
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -89,7 +89,7 @@
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module"/>
+ <echo message="Running tests for module, excluding integration"/>
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
@@ -128,5 +128,78 @@
<report format="frames" todir="${org.jboss.esb.tests.report.dir}"/>
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
- </target>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S T -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.rosetta.internal.integration.test">
+ <!-- Instrument the code for code coverage - using emma... -->
+ <delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <mkdir dir="${org.jboss.esb.module.classes.instr.dir}" />
+ <emma>
+ <instr instrpath="${org.jboss.esb.module.classes.dir}"
+ destdir="${org.jboss.esb.module.classes.instr.dir}"
+ metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ </emma>
+
+ <!-- Run the tests -->
+ <antcall target="org.jboss.esb.services.internal.integration.test.exec"/>
+
+ <!-- Generate the coverage report -->
+ <emma>
+ <report sourcepath="${org.jboss.esb.module.src.dir}" sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${org.jboss.esb.module.tests.coverage.dir}" >
+ <include name="*.emma" />
+ </fileset>
+ <html outfile="${org.jboss.esb.module.tests.coverage.dir}/index.html" depth="method" columns="name,line,class,method,block"/>
+ </report>
+ </emma>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S T S -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.services.internal.integration.test.exec">
+ <echo message="Running all 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.module.tests.src.dir}">
+ <include name="**/**UnitTest.java"/>
+ <include name="**/**FuncTest.java"/>
+ <include name="**/**IntegrationTest.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <!-- using instrumented code for code coverage -->
+ <pathelement location="${org.jboss.esb.module.classes.instr.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
+ <!-- Need the tests src folder because there may be non-compiled test resources -->
+ <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
+ <path refid="org.jboss.esb.tests.base.classpath"/>
+ </classpath>
+ <!-- emma jvm args -->
+ <jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ <jvmarg value="-Demma.coverage.out.merge=true" />
+
+ <sysproperty key="org.jboss.esb.test.db.driver" value="${org.jboss.esb.test.db.driver}"/>
+ <sysproperty key="org.jboss.esb.test.db.url" value="${org.jboss.esb.test.db.url}"/>
+ <sysproperty key="org.jboss.esb.test.db.user" value="${org.jboss.esb.test.db.user}"/>
+ <sysproperty key="org.jboss.esb.test.db.password" value="${org.jboss.esb.test.db.password}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.hostname" value="${org.jboss.esb.test.ftp.hostname}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
+ <sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
+ <sysproperty key="log4j.configuration" value="log4j.xml"/>
+ </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/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java (from rev 8260, labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java)
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java 2006-12-12 16:26:53 UTC (rev 8260)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerIntegrationTest.java 2006-12-12 17:56:04 UTC (rev 8264)
@@ -0,0 +1,249 @@
+/*
+ * 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.internal.soa.esb.couriers.tests;
+
+import java.io.File;
+
+import junit.framework.Assert;
+import junit.framework.JUnit4TestAdapter;
+
+import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
+import org.jboss.internal.soa.esb.couriers.helpers.FtpFileHandler;
+import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+import org.jboss.soa.esb.common.tests.BaseTest;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.junit.Test;
+
+/**
+ * Tests for internal FtpFileHandler class
+ *
+ * @since Version 4.0
+ *
+ */
+public class FtpFileHandlerIntegrationTest extends BaseTest
+{
+ public static junit.framework.Test suite()
+ {
+ System.err.println("<------------------------------------------>");
+ System.err.println("<- FTPFileHandlerIntegrationTest requires ->");
+ System.err.println("<- an available FTP server to work. ->");
+ System.err.println("<------------------------------------------>");
+
+ return new JUnit4TestAdapter(FtpFileHandlerIntegrationTest.class);
+ }
+
+ @Test
+ public void testConstructor () throws Exception
+ {
+ FTPEpr ftpEpr = new FTPEpr("ftp://test:password@foo.bar");
+
+ try
+ {
+ @SuppressWarnings("unused")
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+
+ ftpEpr = new FTPEpr("ftp://foo.bar");
+
+ try
+ {
+ @SuppressWarnings("unused")
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testInvalidConnect () throws Exception
+ {
+ File theFile = new File("test.txt");
+ FTPEpr ftpEpr = new FTPEpr("ftp://test:password@foo.bar");
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ @SuppressWarnings("unused")
+ byte[] content = handler.getFileContents(theFile);
+ }
+ catch (CourierException ex)
+ {
+ // good!!
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+
+ ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + ":9090");
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ @SuppressWarnings("unused")
+ byte[] content = handler.getFileContents(theFile);
+ }
+ catch (CourierException ex)
+ {
+ // good!!
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+
+ ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname());
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ @SuppressWarnings("unused")
+ byte[] content = handler.getFileContents(theFile);
+ }
+ catch (CourierException ex)
+ {
+ // good!!
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testValidConnect () throws Exception
+ {
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ @SuppressWarnings("unused")
+ File[] files = handler.getFileList();
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testDeleteBadFile () throws Exception
+ {
+ File theFile = new File("test1234567890.txt");
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ handler.deleteFile(theFile);
+ }
+ catch (CourierException ex)
+ {
+ // TODO should really look for false being returned to indicate no such file!
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testGetFileList () throws Exception
+ {
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ File[] files = handler.getFileList();
+
+ System.err.println("Received information on "+files.length+" files");
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+ @Test
+ public void testGetFile () throws Exception
+ {
+ FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
+
+ try
+ {
+ FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
+
+ File[] files = handler.getFileList();
+
+ if (files.length > 0)
+ {
+ System.err.println("Getting file "+files[0]);
+
+ byte[] contents = handler.getFileContents(files[0]);
+
+ String theFile = new String(contents);
+
+ System.err.println("Received:\n"+theFile);
+ }
+ else
+ System.err.println("No files on remote server.");
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+
+ Assert.fail();
+ }
+ }
+
+}
Deleted: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FtpFileHandlerUnitTest.java 2006-12-12 17:56:04 UTC (rev 8264)
@@ -1,244 +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.internal.soa.esb.couriers.tests;
-
-import java.io.File;
-
-import junit.framework.Assert;
-import junit.framework.JUnit4TestAdapter;
-
-import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
-import org.jboss.internal.soa.esb.couriers.helpers.FtpFileHandler;
-import org.jboss.soa.esb.addressing.eprs.FTPEpr;
-import org.jboss.soa.esb.common.tests.BaseTest;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.junit.Test;
-
-/**
- * Tests for internal FtpFileHandler class
- *
- * @since Version 4.0
- *
- */
-public class FtpFileHandlerUnitTest extends BaseTest
-{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(FtpFileHandlerUnitTest.class);
- }
-
- @Test
- public void testConstructor () throws Exception
- {
- FTPEpr ftpEpr = new FTPEpr("ftp://test:password@foo.bar");
-
- try
- {
- @SuppressWarnings("unused")
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
-
- ftpEpr = new FTPEpr("ftp://foo.bar");
-
- try
- {
- @SuppressWarnings("unused")
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
- @Test
- public void testInvalidConnect () throws Exception
- {
- File theFile = new File("test.txt");
- FTPEpr ftpEpr = new FTPEpr("ftp://test:password@foo.bar");
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- @SuppressWarnings("unused")
- byte[] content = handler.getFileContents(theFile);
- }
- catch (CourierException ex)
- {
- // good!!
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
-
- ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + ":9090");
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- @SuppressWarnings("unused")
- byte[] content = handler.getFileContents(theFile);
- }
- catch (CourierException ex)
- {
- // good!!
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
-
- ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname());
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- @SuppressWarnings("unused")
- byte[] content = handler.getFileContents(theFile);
- }
- catch (CourierException ex)
- {
- // good!!
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
- @Test
- public void testValidConnect () throws Exception
- {
- FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- @SuppressWarnings("unused")
- File[] files = handler.getFileList();
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
- @Test
- public void testDeleteBadFile () throws Exception
- {
- File theFile = new File("test1234567890.txt");
- FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- handler.deleteFile(theFile);
- }
- catch (CourierException ex)
- {
- // TODO should really look for false being returned to indicate no such file!
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
- @Test
- public void testGetFileList () throws Exception
- {
- FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- File[] files = handler.getFileList();
-
- System.err.println("Received information on "+files.length+" files");
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
- @Test
- public void testGetFile () throws Exception
- {
- FTPEpr ftpEpr = new FTPEpr("ftp://" + getFtpUser() + "@" + getFtpHostname() + getFtpDir());
-
- try
- {
- FtpFileHandler handler = (FtpFileHandler) FileHandlerFactory.getInstance().getFileHandler(ftpEpr);
-
- File[] files = handler.getFileList();
-
- if (files.length > 0)
- {
- System.err.println("Getting file "+files[0]);
-
- byte[] contents = handler.getFileContents(files[0]);
-
- String theFile = new String(contents);
-
- System.err.println("Received:\n"+theFile);
- }
- else
- System.err.println("No files on remote server.");
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
-
- Assert.fail();
- }
- }
-
-}
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -53,7 +53,6 @@
<!-- Compiles all the classes -->
<!-- =================================================================== -->
-
<target name="org.jboss.esb.services.compile">
<!-- Compile services -->
<antcall target="org.jboss.esb.services.internal.compile"/>
@@ -61,7 +60,6 @@
<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">
@@ -104,7 +102,6 @@
<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
</path>
-
<!-- =================================================================== -->
<!-- Jar -->
<!-- =================================================================== -->
@@ -125,9 +122,17 @@
<!-- =================================================================== -->
<!-- Test -->
<!-- =================================================================== -->
- <target name="org.jboss.esb.services.test" description="Run tests for this module">
+ <target name="org.jboss.esb.services.test" description="Run tests for this module, excluding integration">
<!-- Compile tests -->
<ant dir="tests" target="org.jboss.esb.services.internal.test"/>
- </target>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Integration Test -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.services.integration.test" description="Run all tests for this module">
+ <!-- Compile tests -->
+ <ant dir="tests" target="org.jboss.esb.services.internal.integration.test"/>
+ </target>
</project>
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-12-12 17:51:58 UTC (rev 8263)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-12-12 17:56:04 UTC (rev 8264)
@@ -91,7 +91,7 @@
<!-- U N I T A N D F U N C T I O N A L T E S T S -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
- <echo message="Running tests for module"/>
+ <echo message="Running tests for module, excluding integration"/>
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
@@ -129,4 +129,78 @@
<report format="noframes" todir="${org.jboss.esb.tests.report.dir}"/>
</junitreport>
</target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S T -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.services.internal.integration.test">
+ <property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/services"/>
+ <property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+
+ <delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <mkdir dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <emma>
+ <instr instrpath="${org.jboss.esb.module.classes.dir}"
+ destdir="${org.jboss.esb.module.classes.instr.dir}"
+ metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ </emma>
+
+ <!-- Run the tests -->
+ <antcall target="org.jboss.esb.services.internal.integration.test.exec"/>
+
+ <!-- Generate the coverage report -->
+ <emma>
+ <report sourcepath="${org.jboss.esb.module.src.dir}" sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${org.jboss.esb.module.tests.coverage.dir}" >
+ <include name="*.emma" />
+ </fileset>
+ <html outfile="${org.jboss.esb.module.tests.coverage.dir}/index.html" depth="method" columns="name,line,class,method,block"/>
+ </report>
+ </emma>
+
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- INTEGRATION T E S T S -->
+ <!-- ====================================================================== -->
+ <target name="org.jboss.esb.services.internal.integration.test.exec">
+ <echo message="Running all 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.module.tests.src.dir}">
+ <include name="**/**UnitTest.java"/>
+ <include name="**/**FuncTest.java"/>
+ <include name="**/**IntegrationTest.java"/>
+ </fileset>
+ </batchtest>
+ <classpath>
+ <!-- using instrumented code for code coverage -->
+ <pathelement location="${org.jboss.esb.module.classes.instr.dir}"/>
+ <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
+ <!-- Need the tests src folder because there may be non-compiled test resources -->
+ <pathelement location="${org.jboss.esb.module.tests.src.dir}"/>
+ <path refid="org.jboss.esb.tests.base.classpath"/>
+
+ </classpath>
+ <!-- emma jvm args -->
+ <jvmarg value="-Demma.coverage.out.file=${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ <jvmarg value="-Demma.coverage.out.merge=true" />
+ <!-- setting system properties -->
+ <sysproperty key="org.jboss.esb.db.driver" value="${org.jboss.esb.db.driver}"/>
+ <sysproperty key="org.jboss.esb.db.url" value="${org.jboss.esb.db.url}"/>
+ <sysproperty key="org.jboss.esb.db.user" value="${org.jboss.esb.db.user}"/>
+ <sysproperty key="org.jboss.esb.db.password" value="${org.jboss.esb.db.password}"/>
+ <sysproperty key="log4j.configuration" value="log4j.xml"/>
+
+ </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>
More information about the jboss-svn-commits
mailing list