Author: heiko.braun(a)jboss.com Date: 2007-08-03 06:12:48 -0400 (Fri, 03 Aug 2007) New Revision: 4148 Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java spi/trunk/src/test/resources/smoke/tools/consume-test.xml Modified: spi/trunk/ant-import/build-testsuite.xml spi/trunk/ant-import/build-thirdparty.xml spi/trunk/spi.iml spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java Log: Added WSConsumeTask test case and general Ant task helper classes Modified: spi/trunk/ant-import/build-testsuite.xml =================================================================== --- spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:08:11 UTC (rev 4147) +++ spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:12:48 UTC (rev 4148) @@ -43,27 +43,28 @@ </target> - <target name="tests-compile" depends="init, jars, tests-init"> - <macro-compile-classes srcdir="${spi.test.java.dir}"/> - </target> - <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> + + <target name="tests-compile" depends="init, jars, tests-init"> + + <mkdir dir="${spi.test.output.dir}/classes" /> + <javac destdir="${spi.test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}"> + <src path="${spi.test.java.dir}"/> + <classpath refid="test.classpath"/> + </javac> - <macrodef name="macro-compile-classes"> - <attribute name="srcdir"/> - <sequential> - <mkdir dir="${spi.test.output.dir}/classes" /> + <!-- copy non binary files --> + <mkdir dir="${spi.test.output.dir}/resources"/> + <copy todir="${spi.test.output.dir}/resources"> + <fileset dir="${spi.test.resources.dir}"> + <include name="**/*.xml"/> + </fileset> + </copy> + </target> - <javac destdir="${spi.test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}"> - <src path="@{srcdir}"/> - <classpath refid="test.classpath"/> - </javac> - </sequential> - </macrodef> - <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> @@ -114,8 +115,7 @@ <target name="one-test" depends="tests-init" if="test"> <mkdir dir="${spi.test.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${spi.test.output.dir}"> - <jvmarg line="${remote.debug.line}"/> - <jvmarg value="-Djava.security.manager"/> + <jvmarg line="${remote.debug.line}"/> <sysproperty key="build.testlog" value="${spi.test.output.dir}/log"/> <classpath> <path refid="test.classpath"/> Modified: spi/trunk/ant-import/build-thirdparty.xml =================================================================== --- spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:08:11 UTC (rev 4147) +++ spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:12:48 UTC (rev 4148) @@ -79,6 +79,9 @@ <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> + + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/ant-nodeps.jar"/> </path> </target> Modified: spi/trunk/spi.iml =================================================================== --- spi/trunk/spi.iml 2007-08-03 10:08:11 UTC (rev 4147) +++ spi/trunk/spi.iml 2007-08-03 10:12:48 UTC (rev 4148) @@ -192,6 +192,15 @@ </library> </orderEntry> <orderEntry type="module" module-name="common" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/ant-nodeps.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2007-08-03 10:12:48 UTC (rev 4148) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.ant.WSConsumeTask; + +/** + * Test the WSConsumeTask. + * This test needs to be executed in 'SPI_HOME/output/tests', + * because it works with relative paths. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class AntConsumeTestCase extends BuildFileTest +{ + WSConsumeTask task; + + protected void setUp() throws Exception + { + super.setUp(); + + // cleanup events + CmdConsumeTracker.LAST_EVENT = ""; + + // enforce loading of the tracker implemenation + System.setProperty( + "org.jboss.wsf.spi.tools.ConsumerFactoryImpl", + "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory" + ); + + // the build files used by this test case needs to build a classpath + // in this case we assum test execution in 'SPI_HOME/output/tests' + System.setProperty("SPI_HOME", "../../"); + + configureProject("resources/smoke/tools/consume-test.xml"); + } + + public void testPlainInvocation() + { + executeTarget("plainInvocation"); + assertTrue("consume() not invoked", CmdConsumeTracker.LAST_EVENT.indexOf("consume")!=-1); + } + +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java 2007-08-03 10:12:48 UTC (rev 4148) @@ -0,0 +1,543 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.jboss.test.wsf.spi.tools; + +import junit.framework.TestCase; +import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.BuildListener; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; + +import java.io.File; +import java.io.PrintStream; +import java.net.URL; + +/** + * A BuildFileTest is a TestCase which executes targets from an Ant buildfile + * for testing. + * + * This class provides a number of utility methods for particular build file + * tests which extend this class. + * + * @author Apache Ant contributors + */ +public abstract class BuildFileTest extends TestCase { + + protected Project project; + + private StringBuffer logBuffer; + private StringBuffer fullLogBuffer; + private StringBuffer outBuffer; + private StringBuffer errBuffer; + private BuildException buildException; + + /** + * Default constructor for the BuildFileTest object. + */ + public BuildFileTest() { + super(); + } + + /** + * Constructor for the BuildFileTest object. + * + * @param name string to pass up to TestCase constructor + */ + public BuildFileTest(String name) { + super(name); + } + + /** + * Automatically calls the target called "tearDown" + * from the build file tested if it exits. + * + * This allows to use Ant tasks directly in the build file + * to clean up after each test. Note that no "setUp" target + * is automatically called, since it's trivial to have a + * test target depend on it. + */ + protected void tearDown() throws Exception { + if (project == null) { + /* + * Maybe the BuildFileTest was subclassed and there is + * no initialized project. So we could avoid getting a + * NPE. + * If there is an initialized project getTargets() does + * not return null as it is initialized by an empty + * HashSet. + */ + return; + } + final String tearDown = "tearDown"; + if (project.getTargets().containsKey(tearDown)) { + project.executeTarget(tearDown); + } + } + + /** + * run a target, expect for any build exception + * + * @param target target to run + * @param cause information string to reader of report + */ + public void expectBuildException(String target, String cause) { + expectSpecificBuildException(target, cause, null); + } + + /** + * Assert that only the given message has been logged with a + * priority &lt;= INFO when running the given target. + */ + public void expectLog(String target, String log) { + executeTarget(target); + String realLog = getLog(); + assertEquals(log, realLog); + } + + /** + * Assert that the given substring is in the log messages. + */ + public void assertLogContaining(String substring) { + String realLog = getLog(); + assertTrue("expecting log to contain \"" + substring + "\" log was \"" + + realLog + "\"", + realLog.indexOf(substring) >= 0); + } + + /** + * Assert that the given substring is in the output messages. + * @since Ant1.7 + */ + public void assertOutputContaining(String substring) { + String realOutput = getOutput(); + assertTrue("expecting output to contain \"" + substring + + "\" output was \"" + realOutput + "\"", + realOutput.indexOf(substring) >= 0); + } + + /** + * Assert that the given message has been logged with a priority + * &lt;= INFO when running the given target. + */ + public void expectLogContaining(String target, String log) { + executeTarget(target); + assertLogContaining(log); + } + + /** + * Gets the log the BuildFileTest object. + * Only valid if configureProject() has been called. + * + * @pre logBuffer!=null + * @return The log value + */ + public String getLog() { + return logBuffer.toString(); + } + + /** + * Assert that the given message has been logged with a priority + * &gt;= VERBOSE when running the given target. + */ + public void expectDebuglog(String target, String log) { + executeTarget(target); + String realLog = getFullLog(); + assertEquals(log, realLog); + } + + /** + * Assert that the given substring is in the log messages. + */ + public void assertDebuglogContaining(String substring) { + String realLog = getFullLog(); + assertTrue("expecting debug log to contain \"" + substring + + "\" log was \"" + + realLog + "\"", + realLog.indexOf(substring) >= 0); + } + + /** + * Gets the log the BuildFileTest object. + * + * Only valid if configureProject() has been called. + * + * @pre fullLogBuffer!=null + * @return The log value + */ + public String getFullLog() { + return fullLogBuffer.toString(); + } + + /** + * execute the target, verify output matches expectations + * + * @param target target to execute + * @param output output to look for + */ + public void expectOutput(String target, String output) { + executeTarget(target); + String realOutput = getOutput(); + assertEquals(output, realOutput.trim()); + } + + /** + * Executes the target, verify output matches expectations + * and that we got the named error at the end + * + * @param target target to execute + * @param output output to look for + * @param error Description of Parameter + */ + public void expectOutputAndError(String target, String output, String error) { + executeTarget(target); + String realOutput = getOutput(); + assertEquals(output, realOutput); + String realError = getError(); + assertEquals(error, realError); + } + + public String getOutput() { + return cleanBuffer(outBuffer); + } + + public String getError() { + return cleanBuffer(errBuffer); + } + + public BuildException getBuildException() { + return buildException; + } + + private String cleanBuffer(StringBuffer buffer) { + StringBuffer cleanedBuffer = new StringBuffer(); + boolean cr = false; + for (int i = 0; i < buffer.length(); i++) { + char ch = buffer.charAt(i); + if (ch == '\r') { + cr = true; + continue; + } + + if (!cr) { + cleanedBuffer.append(ch); + } else { + cleanedBuffer.append(ch); + } + } + return cleanedBuffer.toString(); + } + + /** + * Sets up to run the named project + * + * @param filename name of project file to run + */ + public void configureProject(String filename) throws BuildException { + configureProject(filename, Project.MSG_DEBUG); + } + + /** + * Sets up to run the named project + * + * @param filename name of project file to run + */ + public void configureProject(String filename, int logLevel) + throws BuildException { + logBuffer = new StringBuffer(); + fullLogBuffer = new StringBuffer(); + project = new Project(); + project.init(); + File antFile = new File(System.getProperty("root"), filename); + project.setUserProperty("ant.file" , antFile.getAbsolutePath()); + project.addBuildListener(new AntTestListener(logLevel)); + ProjectHelper.configureProject(project, antFile); + } + + /** + * Executes a target we have set up + * + * @pre configureProject has been called + * @param targetName target to run + */ + public void executeTarget(String targetName) { + PrintStream sysOut = System.out; + PrintStream sysErr = System.err; + try { + sysOut.flush(); + sysErr.flush(); + outBuffer = new StringBuffer(); + PrintStream out = new PrintStream(new AntOutputStream(outBuffer)); + System.setOut(out); + errBuffer = new StringBuffer(); + PrintStream err = new PrintStream(new AntOutputStream(errBuffer)); + System.setErr(err); + logBuffer = new StringBuffer(); + fullLogBuffer = new StringBuffer(); + buildException = null; + project.executeTarget(targetName); + } finally { + System.setOut(sysOut); + System.setErr(sysErr); + } + + } + + /** + * Get the project which has been configured for a test. + * + * @return the Project instance for this test. + */ + public Project getProject() { + return project; + } + + /** + * Gets the directory of the project. + * + * @return the base dir of the project + */ + public File getProjectDir() { + return project.getBaseDir(); + } + + /** + * Runs a target, wait for a build exception. + * + * @param target target to run + * @param cause information string to reader of report + * @param msg the message value of the build exception we are waiting + * for set to null for any build exception to be valid + */ + public void expectSpecificBuildException(String target, String cause, String msg) { + try { + executeTarget(target); + } catch (org.apache.tools.ant.BuildException ex) { + buildException = ex; + if ((null != msg) && (!ex.getMessage().equals(msg))) { + fail("Should throw BuildException because '" + cause + + "' with message '" + msg + + "' (actual message '" + ex.getMessage() + "' instead)"); + } + return; + } + fail("Should throw BuildException because: " + cause); + } + + /** + * run a target, expect an exception string + * containing the substring we look for (case sensitive match) + * + * @param target target to run + * @param cause information string to reader of report + * @param contains substring of the build exception to look for + */ + public void expectBuildExceptionContaining(String target, String cause, String contains) { + try { + executeTarget(target); + } catch (org.apache.tools.ant.BuildException ex) { + buildException = ex; + if ((null != contains) && (ex.getMessage().indexOf(contains) == -1)) { + fail("Should throw BuildException because '" + cause + "' with message containing '" + contains + "' (actual message '" + ex.getMessage() + "' instead)"); + } + return; + } + fail("Should throw BuildException because: " + cause); + } + + /** + * call a target, verify property is as expected + * + * @param target build file target + * @param property property name + * @param value expected value + */ + public void expectPropertySet(String target, String property, String value) { + executeTarget(target); + assertPropertyEquals(property, value); + } + + /** + * assert that a property equals a value; comparison is case sensitive. + * + * @param property property name + * @param value expected value + */ + public void assertPropertyEquals(String property, String value) { + String result = project.getProperty(property); + assertEquals("property " + property,value,result); + } + + /** + * assert that a property equals "true". + * + * @param property property name + */ + public void assertPropertySet(String property) { + assertPropertyEquals(property, "true"); + } + + /** + * assert that a property is null. + * + * @param property property name + */ + public void assertPropertyUnset(String property) { + assertPropertyEquals(property, null); + } + + /** + * call a target, verify named property is "true". + * + * @param target build file target + * @param property property name + */ + public void expectPropertySet(String target, String property) { + expectPropertySet(target, property, "true"); + } + + /** + * Call a target, verify property is null. + * + * @param target build file target + * @param property property name + */ + public void expectPropertyUnset(String target, String property) { + expectPropertySet(target, property, null); + } + + /** + * Retrieve a resource from the caller classloader to avoid + * assuming a vm working directory. The resource path must be + * relative to the package name or absolute from the root path. + * + * @param resource the resource to retrieve its url. + * @throws junit.framework.AssertionFailedError if the resource is not found. + */ + public URL getResource(String resource){ + URL url = getClass().getResource(resource); + assertNotNull("Could not find resource :" + resource, url); + return url; + } + + /** + * an output stream which saves stuff to our buffer. + */ + private static class AntOutputStream extends java.io.OutputStream { + private StringBuffer buffer; + + public AntOutputStream( StringBuffer buffer ) { + this.buffer = buffer; + } + + public void write(int b) { + buffer.append((char)b); + } + } + + /** + * Our own personal build listener. + */ + private class AntTestListener implements BuildListener + { + private int logLevel; + + /** + * Constructs a test listener which will ignore log events + * above the given level. + */ + public AntTestListener(int logLevel) { + this.logLevel = logLevel; + } + + /** + * Fired before any targets are started. + */ + public void buildStarted(BuildEvent event) { + } + + /** + * Fired after the last target has finished. This event + * will still be thrown if an error occurred during the build. + * + * @see BuildEvent#getException() + */ + public void buildFinished(BuildEvent event) { + } + + /** + * Fired when a target is started. + * + * @see BuildEvent#getTarget() + */ + public void targetStarted(BuildEvent event) { + System.out.println("targetStarted " + event.getTarget().getName()); + } + + /** + * Fired when a target has finished. This event will + * still be thrown if an error occurred during the build. + * + * @see BuildEvent#getException() + */ + public void targetFinished(BuildEvent event) { + System.out.println("targetFinished " + event.getTarget().getName()); + } + + /** + * Fired when a task is started. + * + * @see BuildEvent#getTask() + */ + public void taskStarted(BuildEvent event) { + //System.out.println("taskStarted " + event.getTask().getTaskName()); + } + + /** + * Fired when a task has finished. This event will still + * be throw if an error occurred during the build. + * + * @see BuildEvent#getException() + */ + public void taskFinished(BuildEvent event) { + //System.out.println("taskFinished " + event.getTask().getTaskName()); + } + + /** + * Fired whenever a message is logged. + * + * @see BuildEvent#getMessage() + * @see BuildEvent#getPriority() + */ + public void messageLogged(BuildEvent event) { + if (event.getPriority() > logLevel) { + // ignore event + return; + } + + if (event.getPriority() == Project.MSG_INFO || + event.getPriority() == Project.MSG_WARN || + event.getPriority() == Project.MSG_ERR) { + logBuffer.append(event.getMessage()); + } + fullLogBuffer.append(event.getMessage()); + } + } + +} + Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 10:08:11 UTC (rev 4147) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 10:12:48 UTC (rev 4148) @@ -88,6 +88,6 @@ public void consume(URL wsdl) { - + LAST_EVENT += "consume"; } } Added: spi/trunk/src/test/resources/smoke/tools/consume-test.xml =================================================================== --- spi/trunk/src/test/resources/smoke/tools/consume-test.xml (rev 0) +++ spi/trunk/src/test/resources/smoke/tools/consume-test.xml 2007-08-03 10:12:48 UTC (rev 4148) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- + An example build file that used to test the WSConsume Task + --> + +<project name="consume-test" basedir="."> + + <property environment="env"/> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath> + <pathelement location="${env.SPI_HOME}/output/lib/jbossws-spi.jar"/> + </classpath> + </taskdef> + + <target name="plainInvocation"> + <wsconsume wsdl="Service.wsdl" verbose="true"/> + </target> + +</project> \ No newline at end of file Property changes on: spi/trunk/src/test/resources/smoke/tools/consume-test.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF