svn commit: r629473 - /webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java

[jkaputin]

Author: jkaputin
Date: Wed Feb 20 06:29:45 2008
New Revision: 629473

URL: http://svn.apache.org/viewvc?rev=629473&view=rev
Log:
Changed use of InterfaceImpl to InterfaceElement and use URI.create method to 
eliminate need to catch URISyntaxException.

Modified:
    
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java

Modified: 
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java?rev=629473&r1=629472&r2=629473&view=diff
==============================================================================
--- 
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java
 (original)
+++ 
webservices/woden/branches/woden62/test/org/apache/woden/internal/wsdl20/assertions/TestInterface1009.java
 Wed Feb 20 06:29:45 2008
@@ -17,13 +17,13 @@
 package org.apache.woden.internal.wsdl20.assertions;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 
 import junit.framework.TestCase;
 
 import org.apache.woden.ErrorReporter;
 import org.apache.woden.WSDLException;
 import org.apache.woden.WSDLFactory;
+import org.apache.woden.WSDLReader;
 import org.apache.woden.internal.wsdl20.InterfaceImpl;
 import org.apache.woden.tests.TestErrorHandler;
 import org.apache.woden.types.NCName;
@@ -52,9 +52,11 @@
                fail("Can't instantiate the WSDLFactory object.");
            }
            
-           handler = new TestErrorHandler();
-           reporter = factory.newWSDLReader().getErrorReporter();
-               reporter.setErrorHandler(handler);
+           WSDLReader reader = factory.newWSDLReader();
+        reader.setFeature(WSDLReader.FEATURE_VALIDATION, true);
+           reporter = reader.getErrorReporter();
+        handler = new TestErrorHandler();
+           reporter.setErrorHandler(handler);
                assertionContext = new AssertionContextImpl(reporter, null);
        }
        
@@ -72,13 +74,9 @@
        public void testNoInterfaceExtension() {
                DescriptionElement descEl = factory.newDescription();
                Description descComp = descEl.toComponent();
-               try {
-                       descEl.setTargetNamespace(new 
URI("http://testnamespace";));
-               } catch(URISyntaxException e) {
-                       // Do nothing.
-               }
+               descEl.setTargetNamespace(URI.create("http://testnamespace";));
                
-               InterfaceImpl interfac = 
(InterfaceImpl)descEl.addInterfaceElement();
+               InterfaceElement interfac = descEl.addInterfaceElement();
                interfac.setName(new NCName("name"));
                
                // init Interface's ref to its Description, needed for 
interface extension.
@@ -96,16 +94,12 @@
        /**
         * Test that the assertion fails if the interface is in the direct list.
         */
-       public void testInterfaceExtendsItselfDirectly() {
+       public void testInterfaceExtendsItselfDirectly() throws Exception {
                DescriptionElement descEl = factory.newDescription();
                Description descComp = descEl.toComponent();
-               try {
-                       descEl.setTargetNamespace(new 
URI("http://testnamespace";));
-               } catch(URISyntaxException e) {
-                       // Do nothing.
-               }
+        descEl.setTargetNamespace(URI.create("http://testnamespace";));
                  
-               InterfaceImpl interfac = 
(InterfaceImpl)descEl.addInterfaceElement();
+        InterfaceElement interfac = descEl.addInterfaceElement();
                interfac.setName(new NCName("name1"));
                
            interfac.addExtendedInterfaceName(interfac.getName());
@@ -129,12 +123,9 @@
        public void testInterfaceExtendsItselfIndirectly() {
                DescriptionElement descEl = factory.newDescription();
                Description descComp = descEl.toComponent();
-               try {
-                       descEl.setTargetNamespace(new 
URI("http://testnamespace";));
-               } catch(URISyntaxException e) {
-                       // Do nothing.
-               }
-               InterfaceImpl interfac = 
(InterfaceImpl)descEl.addInterfaceElement();
+        descEl.setTargetNamespace(URI.create("http://testnamespace";));
+        
+        InterfaceElement interfac = descEl.addInterfaceElement();
                interfac.setName(new NCName("name1"));
                InterfaceImpl interfac2 = 
(InterfaceImpl)descEl.addInterfaceElement();
                interfac2.setName(new NCName("name2"));
@@ -163,11 +154,7 @@
                DescriptionElement descEl = factory.newDescription();
                Description descComp = descEl.toComponent();
              
-               try {
-                       descEl.setTargetNamespace(new 
URI("http://testnamespace";));
-               } catch(URISyntaxException e) {
-                       // Do nothing.
-               }
+        descEl.setTargetNamespace(URI.create("http://testnamespace";));
              
                // Create an interface, set it to extend to other interfaces 
and have
                // one of those interfaces extend a fourth interface.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]