[jboss-svn-commits] JBL Code SVN: r27617 - in labs/jbossesb/trunk: product/rosetta/tests/src/org/jboss/internal/soa/esb/util and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2009-07-06 08:03:47 -0400 (Mon, 06 Jul 2009)
New Revision: 27617

Removed:
   labs/jbossesb/trunk/testlib/jetty-6.1.15.jar
   labs/jbossesb/trunk/testlib/jetty-util-6.1.15.jar
Modified:
   labs/jbossesb/trunk/product/.classpath
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java
Log:
remove http test from xmlhelper unit test: JBESB-2610

Modified: labs/jbossesb/trunk/product/.classpath
===================================================================
--- labs/jbossesb/trunk/product/.classpath	2009-07-06 12:01:12 UTC (rev 27616)
+++ labs/jbossesb/trunk/product/.classpath	2009-07-06 12:03:47 UTC (rev 27617)
@@ -115,8 +115,6 @@
 	<classpathentry kind="lib" path="services/spring/lib/ext/spring.jar"/>
 	<classpathentry kind="lib" path="tools/console/lib/ant.jar"/>
 	<classpathentry kind="lib" path="tools/console/lib/hsqldb.jar"/>
-	<classpathentry kind="var" path="ESB_ROOT/testlib/jetty-6.1.15.jar"/>
-	<classpathentry kind="var" path="ESB_ROOT/testlib/jetty-util-6.1.15.jar"/>
 	<classpathentry kind="var" path="ESB_ROOT/testlib/junit-4.1.jar"/>
 	<classpathentry kind="var" path="ESB_ROOT/testlib/mockejb.jar"/>
 	<classpathentry kind="var" path="ESB_ROOT/testlib/xmlunit-1.2.jar"/>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java	2009-07-06 12:01:12 UTC (rev 27616)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/util/XMLHelperUnitTest.java	2009-07-06 12:03:47 UTC (rev 27617)
@@ -23,16 +23,12 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.Properties;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.validation.Schema;
 
@@ -40,14 +36,7 @@
 
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.testutils.StringUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -57,12 +46,6 @@
  */
 public class XMLHelperUnitTest
 {
-    private static String returnUrl;
-    private static Server server;
-    
-    private static final int PORT = 9999;
-    private static final String CONTEXT = "schematest";
-
     @Test
     public void testReplaceSystemProperties()
         throws Exception
@@ -121,65 +104,6 @@
         assertTrue(XMLHelper.validate(schema, xml));
     }
     
-    /**
-     * This is an integration test that is intended to be run manually.
-     */
-    @Test
-    public void testValidateSchemaHttpWithImports() throws ConfigurationException, UnsupportedEncodingException, SAXException
-    {
-        final Schema schema = XMLHelper.getSchema("http://localhost:9999/schemastest/request2.xsd");
-        
-        final String xml = StreamUtils.readStreamString(getClass().getResourceAsStream("sample-request.xml"), "UTF-8");
-        assertTrue(XMLHelper.validate(schema, xml));
-    }
-    
-    
-    @BeforeClass
-    public static void setupJetty() throws Exception
-    {
-        server = new Server(PORT);  
-        Handler handler = new AbstractHandler()   
-        {  
-            public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch)   throws IOException, ServletException  
-            {  
-                handleHttpRequest(target, request, response);  
-            }
-        };  
-   
-        returnUrl = "http://localhost:" + Integer.toString(PORT) + "/" + CONTEXT;  
-        server.setHandler(handler);  
-        server.start();  
-    }
-    
-    public static void handleHttpRequest(String target, HttpServletRequest request, HttpServletResponse response)  
-    {  
-        try  
-        {  
-            String pathInfo = request.getPathInfo();
-            String file = pathInfo.substring(pathInfo.indexOf("/" + CONTEXT) + CONTEXT.length() + 3);
-            file = "/org/jboss/internal/soa/esb/util/" + file;
-            InputStream in = org.jboss.soa.esb.util.ClassUtil.getResourceAsStream(file, XMLHelperUnitTest.class);
-            String xsd = StreamUtils.readStreamString(in, "UTF-8");
-            response.setContentType("text/html");  
-            response.getOutputStream().write(xsd.getBytes());
-            response.setStatus(HttpServletResponse.SC_OK);  
-            ((Request)request).setHandled(true);  
-        }  
-        catch(Exception ignore)  
-        {  
-        }  
-    }  
-    
-    @AfterClass
-    public static void shutdownJetty() 
-    {
-        try
-        {
-            server.stop();
-        } 
-        catch (Exception ignore) { }
-    }
-    
     public static junit.framework.Test suite()
     {
         return new JUnit4TestAdapter(XMLHelperUnitTest.class);

Deleted: labs/jbossesb/trunk/testlib/jetty-6.1.15.jar
===================================================================
(Binary files differ)

Deleted: labs/jbossesb/trunk/testlib/jetty-util-6.1.15.jar
===================================================================
(Binary files differ)