[jbossws-commits] JBossWS SVN: r1200 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/assertions

Author: thomas.diesler(a)jboss.com Date: 2006-10-11 02:47:47 -0400 (Wed, 11 Oct 2006) New Revision: 1200 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java Log: [JBWS-335] Cleanup Jaxrpc20AssertionsTestCase Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-10-11 06:45:17 UTC (rev 1199) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-10-11 06:47:47 UTC (rev 1200) @@ -1,24 +1,24 @@ /* - * 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. - */ + * 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.ws.tools.assertions; import org.jboss.test.ws.tools.WSToolsTest; @@ -43,37 +43,27 @@ { public void testIsInterface() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(SomeException.class); - //assertWSDL20Test(SomeException.class); } public void testRemoteType() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteType.class); - //assertWSDL20Test(AssertRemoteType.class); } public void testRemoteExceptionsDeclared() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertRemoteExceptions.class); - //assertWSDL20Test(AssertRemoteExceptions.class); } public void testAssertMethodParamExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertMethodParamExtendRemote.class); - //assertWSDL20Test(AssertMethodParamExtendRemote.class); } public void testAssertReturnTypeExtendRemote() throws Exception { - System.out.println("FIXME: JBWS-335"); assertWSDL11Test(AssertReturnTypeExtendRemote.class); - //assertWSDL20Test(AssertReturnTypeExtendRemote.class); } /** @@ -90,21 +80,20 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); + jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); } - catch (WSException is ) + catch (WSException is) { //pass - } catch( Exception e) + } + catch (Exception e) { e.printStackTrace(); fail("Test should not have passed"); } } - - /** * The test is to see if the JavaToWSDL subsystem throws Jaxrpc 2.0 Assertions * for WSDL 1.1 @@ -119,12 +108,14 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) + WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + fail("Test should have failed"); + } + catch (IllegalArgumentException iae) { //pass - }catch(WSException ise) + } + catch (WSException ise) { //pass } @@ -144,12 +135,14 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(seiClass); - fail("Test should have failed"); - }catch(IllegalArgumentException iae) + WSDLDefinitions wsdl = jwsdl.generate(seiClass); + fail("Test should have failed"); + } + catch (IllegalArgumentException iae) { //pass - }catch(WSException ise) + } + catch (WSException ise) { //pass }