Author: alessio.soldano(a)jboss.com
Date: 2012-07-25 07:37:52 -0400 (Wed, 25 Jul 2012)
New Revision: 16533
Removed:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
Log:
Removing unrequired abstractions
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -25,7 +25,5 @@
{
public void setIsNative(boolean integrationNative);
- public void setIsMetro(boolean integrationMetro);
-
public void setIsCXF(boolean integrationCXF);
}
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -39,7 +39,7 @@
* @author Heiko.Braun <heiko.braun(a)jboss.com>
* @author alessio.soldano(a)jboss.com
*/
-public class WSConsumerPlugin extends JBossWSTest implements WSConsumerPluginDelegate,
StackConfigurable
+public class WSConsumerPlugin extends JBossWSTest implements StackConfigurable
{
// Tools delegate. Recreated for every test. See setup(...)
WSContractConsumer consumer;
@@ -447,11 +447,6 @@
return integrationNative;
}
- public boolean getIsMetro()
- {
- return integrationMetro;
- }
-
public boolean getIsCXF()
{
return integrationCXF;
@@ -462,11 +457,6 @@
this.integrationNative = integrationNative;
}
- public void setIsMetro(boolean integrationMetro)
- {
- this.integrationMetro = integrationMetro;
- }
-
public void setIsCXF(boolean integrationCXF)
{
this.integrationCXF = integrationCXF;
Deleted:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.ws.jaxws.smoke.tools;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface WSConsumerPluginDelegate
-{
- void testBindingFiles() throws Exception;
-
- void testCatalog() throws Exception;
-
- void testOutputDirectory() throws Exception;
-
- void testSourceDirectory() throws Exception;
-
- void testGenerateSource() throws Exception;
-
- void testTargetPackage() throws Exception;
-
- void testWsdlLocation() throws Exception;
-
- void testMessageStream() throws Exception;
-
- void testAdditionalCompilerClassPath();
-
- void testTarget() throws Exception;
-
- void testSOAP12Extension() throws Exception;
-
- void testAdditionalHeaders() throws Exception;
-}
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -23,12 +23,11 @@
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @author alessio.soldano(a)jboss.com
*/
-public class WSConsumerTestCaseForked extends PluginBase implements
WSConsumerPluginDelegate
+public class WSConsumerTestCaseForked extends PluginBase
{
/**
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -42,7 +42,7 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class WSProviderPlugin extends JBossWSTest implements WSProviderPluginDelegate
+public class WSProviderPlugin extends JBossWSTest
{
private static final String FS = System.getProperty("file.separator"); //
'/' on unix, '\' on windows
// tools delegate
Deleted:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPluginDelegate.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.ws.jaxws.smoke.tools;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public interface WSProviderPluginDelegate
-{
- void testGenerateWsdl() throws Exception;
-
- void testGenerateSource() throws Exception;
-
- void testOutputDirectory() throws Exception;
-
- void testResourceDirectory() throws Exception;
-
- void testSourceDirectory() throws Exception;
-
- void testClassLoader() throws Exception;
-
- void testMessageStream() throws Exception;
-}
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2012-07-25
10:49:50 UTC (rev 16532)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2012-07-25
11:37:52 UTC (rev 16533)
@@ -24,7 +24,7 @@
/**
* @author Heiko.Braun(a)jboss.com
*/
-public class WSProviderTestCaseForked extends PluginBase implements
WSProviderPluginDelegate
+public class WSProviderTestCaseForked extends PluginBase
{
/**
* Recreates a tools delegate for every test