[jbossws-commits] JBossWS SVN: r6388 - spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools.
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:38:14 -0400 (Sat, 12 Apr 2008)
New Revision: 6388
Modified:
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
Log:
cleanup tests
Modified: 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 2008-04-12
12:34:12 UTC (rev 6387)
+++
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2008-04-12
12:38:14 UTC (rev 6388)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.wsf.spi.tools;
-import java.io.File;
-
/**
* Test the WSConsumeTask.
* This test needs to be executed in 'SPI_HOME/output/tests',
@@ -32,7 +30,7 @@
* @version $Revision$
*/
public class AntConsumeTestCase extends BuildFileTest
-{
+{
protected void setUp() throws Exception
{
super.setUp();
@@ -41,24 +39,15 @@
CmdConsumeTracker.LAST_EVENT = "";
// enforce loading of the tracker implemenation
- System.setProperty(
- "org.jboss.wsf.spi.tools.ConsumerFactoryImpl",
- "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory"
- );
+ System.setProperty("org.jboss.wsf.spi.tools.ConsumerFactoryImpl",
"org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory");
- // maven style
- if (new
File("src/test/resources/smoke/tools/consume-test.xml").exists())
- configureProject("src/test/resources/smoke/tools/consume-test.xml");
-
- // ant style
- else if (new File("resources/smoke/tools/consume-test.xml").exists())
- configureProject("resources/smoke/tools/consume-test.xml");
+ configureProject("src/test/resources/smoke/tools/consume-test.xml");
}
-
+
public void testPlainInvocation()
{
executeTarget("plainInvocation");
- assertTrue("consume() not invoked",
CmdConsumeTracker.LAST_EVENT.indexOf("consume")!=-1);
+ assertTrue("consume() not invoked",
CmdConsumeTracker.LAST_EVENT.indexOf("consume") != -1);
}
}
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
===================================================================
---
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-12
12:34:12 UTC (rev 6387)
+++
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-12
12:38:14 UTC (rev 6388)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.wsf.spi.tools;
-import java.io.File;
-
/**
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -37,36 +35,27 @@
CmdProvideTracker.LAST_EVENT = "";
// enforce loading of the tracker implemenation
- System.setProperty(
- "org.jboss.wsf.spi.tools.ProviderFactoryImpl",
- "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory"
- );
+ System.setProperty("org.jboss.wsf.spi.tools.ProviderFactoryImpl",
"org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory");
- // maven style
- if (new
File("src/test/resources/smoke/tools/provide-test.xml").exists())
- configureProject("src/test/resources/smoke/tools/provide-test.xml");
-
- // ant style
- else if (new File("resources/smoke/tools/provide-test.xml").exists())
- configureProject("resources/smoke/tools/provide-test.xml");
+ configureProject("src/test/resources/smoke/tools/provide-test.xml");
}
public void testPlainInvocation()
{
executeTarget("plainInvocation");
- assertTrue("provide() not invoked",
CmdProvideTracker.LAST_EVENT.indexOf("provide")!=-1);
+ assertTrue("provide() not invoked",
CmdProvideTracker.LAST_EVENT.indexOf("provide") != -1);
}
public void testIncludeWSDL()
{
executeTarget("includeWSDL");
- assertTrue("setGenerateWsdl() not invoked",
CmdProvideTracker.LAST_EVENT.indexOf("setGenerateWsdl")!=-1);
+ assertTrue("setGenerateWsdl() not invoked",
CmdProvideTracker.LAST_EVENT.indexOf("setGenerateWsdl") != -1);
}
public void testExtraClasspath()
{
executeTarget("extraClasspath");
-
+
}
}