[jbosstools-commits] JBoss Tools SVN: r24208 - trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command.

Author: Grid.Qian Date: 2010-08-17 06:01:12 -0400 (Tue, 17 Aug 2010) New Revision: 24208 Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java Log: JBIDE-6481: commit the test changes Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208) @@ -67,6 +67,7 @@ import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.test.util.TestProjectProvider; +import org.jboss.tools.ws.creation.core.data.ServiceModel; @SuppressWarnings("restriction") public abstract class AbstractJBossWSCommandTest extends TestCase { @@ -217,8 +218,6 @@ model.setWebProjectName(fproject.getProject().getName()); IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); model.setWsdlURI(wsdlFile.getLocation().toOSString()); - model.addServiceName("SOAPService"); - model.addPortTypes("Greeter"); model.setCustomPackage("org.apache.hello_world_soap_http"); return model; Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208) @@ -97,10 +97,8 @@ IStatus status = cmdInitial.execute(null, null); assertTrue(status.getMessage(), status.isOK()); - assertTrue(model.getServiceNames().contains("SOAPService")); assertEquals(wsdlFile.getLocation().toOSString(), model.getWsdlURI()); - assertTrue(model.getPortTypes().contains("Greeter")); - assertEquals("org.apache.hello_world_soap_http", model + assertEquals("", model .getCustomPackage()); } Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208) @@ -9,11 +9,11 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaCore; -import org.jboss.tools.test.util.TestProjectProvider; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.ws.creation.core.commands.ClientSampleCreationCommand; +import org.jboss.tools.test.util.TestProjectProvider; import org.jboss.tools.ws.creation.core.data.ServiceModel; +import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; public class JBossWSClientSampleCreationCommandTest extends TestCase{ static String BUNDLE = "org.jboss.tools.ws.creation.core.test"; @@ -33,8 +33,7 @@ ServiceModel model = new ServiceModel(); model.setCustomPackage(""); model.setWebProjectName("WebTest"); - ClientSampleCreationCommand command = new ClientSampleCreationCommand(model); - List<ICompilationUnit> list = command.findJavaUnitsByAnnotation(JavaCore.create(prj), "@WebService"); + List<ICompilationUnit> list = JBossWSCreationUtils.findJavaUnitsByAnnotation(JavaCore.create(prj), "@WebService", ""); assertTrue("No java files in src!",list.isEmpty()); } Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-08-17 09:46:32 UTC (rev 24207) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-08-17 10:01:12 UTC (rev 24208) @@ -109,10 +109,8 @@ IStatus status = cmdInitial.execute(null, null); assertTrue(status.getMessage(), status.isOK()); - assertTrue(model.getServiceNames().contains("SOAPService")); assertEquals(wsdlFile.getLocation().toOSString(), model.getWsdlURI()); - assertTrue(model.getPortTypes().contains("Greeter")); - assertEquals("org.apache.hello_world_soap_http", model.getCustomPackage()); + assertEquals("", model.getCustomPackage()); } @@ -246,8 +244,6 @@ model.setWebProjectName(fproject.getProject().getName()); IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); model.setWsdlURI(wsdlFile.getLocation().toOSString()); - model.addServiceName("SOAPService"); - model.addPortTypes("Greeter"); model.setCustomPackage("org.apache.hello_world_soap_http"); return model;