Author: heiko.braun(a)jboss.com Date: 2007-08-02 10:39:29 -0400 (Thu, 02 Aug 2007) New Revision: 4104 Modified: trunk/JBossWS-Trunk.iws trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java Log: Example usage of the CmdTracker added Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/JBossWS-Trunk.iws 2007-08-02 14:39:29 UTC (rev 4104) @@ -20,21 +20,10 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/int-native.iml" afterPath="$PROJECT_DIR$/integration/native/int-native.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -385,7 +374,7 @@ <file leaf-file-name="CmdConsumeTestCase.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <state line="119" column="68" selection-start="3912" selection-end="3912" vertical-scroll-proportion="0.46373364"> <folding> <element signature="imports" expanded="true" /> <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> @@ -397,7 +386,7 @@ <file leaf-file-name="WSConsume.java" pinned="false" current="false" current-in-tab="false"> <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <state line="208" column="33" selection-start="7086" selection-end="7101" vertical-scroll-proportion="0.6896552"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -426,7 +415,7 @@ <file leaf-file-name="CmdConsumeTracker.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> + <state line="85" column="29" selection-start="0" selection-end="2457" vertical-scroll-proportion="0.68370986"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1246,7 +1235,7 @@ </entry> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> + <state line="85" column="29" selection-start="0" selection-end="2457" vertical-scroll-proportion="0.68370986"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1255,7 +1244,7 @@ </entry> <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <state line="208" column="33" selection-start="7086" selection-end="7101" vertical-scroll-proportion="0.6896552"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1264,7 +1253,7 @@ </entry> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <state line="119" column="68" selection-start="3912" selection-end="3912" vertical-scroll-proportion="0.46373364"> <folding> <element signature="imports" expanded="true" /> <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 14:39:29 UTC (rev 4104) @@ -111,12 +111,13 @@ public void testInvalidBindingOption() throws Exception { - executeCmd("-b", true); + executeCmd("-b", true); } public void testValidBindingOption() throws Exception { executeCmd("-b binding-file.xml Service.wsdl", false); + assertEquals(CmdConsumeTracker.LAST_EVENT, "setBindingFiles"); } public void testMissingOptions() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 14:39:29 UTC (rev 4104) @@ -35,7 +35,7 @@ public class CmdConsumeTracker extends WSContractConsumer { public static String LAST_EVENT = ""; - + public void setBindingFiles(List<File> bindingFiles) { LAST_EVENT = "setBindingFiles"; @@ -43,51 +43,51 @@ public void setCatalog(File catalog) { - + LAST_EVENT = "setCatalog"; } public void setOutputDirectory(File directory) { - + LAST_EVENT = "setOutputDirectory"; } public void setSourceDirectory(File directory) { - + LAST_EVENT = "setSourceDirectory"; } public void setGenerateSource(boolean generateSource) { - + LAST_EVENT = "setGenerateSource"; } public void setTargetPackage(String targetPackage) { - + LAST_EVENT = "setTargetPackage"; } public void setWsdlLocation(String wsdlLocation) { - + LAST_EVENT = "setWsdlLocation"; } public void setMessageStream(PrintStream messageStream) { - + LAST_EVENT = "setMessageStream"; } public void setAdditionalCompilerClassPath(List<String> classPath) { - + LAST_EVENT = "setAdditionalCompilerClassPath"; } public void setTarget(String target) { - + LAST_EVENT = "setTarget"; } public void consume(URL wsdl) { - + } }