Author: jsong Date: Mon Nov 29 15:15:35 2004 New Revision: 106973 URL: http://svn.apache.org/viewcvs?view=rev&rev=106973 Log: Update milton code and milton.jar to support testing jws in beehive.
Modified: incubator/beehive/trunk/controls/test/infra/milton/milton.jar incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java Modified: incubator/beehive/trunk/controls/test/infra/milton/milton.jar Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/infra/milton/milton.jar?view=diff&rev=106973&p1=incubator/beehive/trunk/controls/test/infra/milton/milton.jar&r1=106972&p2=incubator/beehive/trunk/controls/test/infra/milton/milton.jar&r2=106973 ============================================================================== Binary files. No diff available. Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java?view=diff&rev=106973&p1=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java&r1=106972&p2=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java&r2=106973 ============================================================================== --- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java (original) +++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/TestInstantiate.java Mon Nov 29 15:15:35 2004 @@ -15,10 +15,10 @@ /** * Tests instantiating a custom control programmatically */ - @Freq("detailed") + @Freq("checkin") public void testDeclarativeInstantiate() throws Exception { - assertReport("/controlsWeb/jws/instantiate.jws","testDeclarativeInstantiate"); + assertReport("http://localhost:8080/controlsWeb/jws/instantiate.jws","testDeclarativeInstantiate";); } } Modified: incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java?view=diff&rev=106973&p1=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java&r1=106972&p2=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java&r2=106973 ============================================================================== --- incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java (original) +++ incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/HtmlReportTestCase.java Mon Nov 29 15:15:35 2004 @@ -41,23 +41,11 @@ public void assertReport(WebConversation p_wc, String p_url, String p_link) throws Exception { - String url = null; + String url = createUrl(p_url); WebResponse wr = null; - if (null == p_wc || null == p_url) - throw new IllegalArgumentException("WebConversation and URL " + - "cannot be null"); - - // find out if user has passed an entire url complete with protocol - // or if we need to prepend this.urlPrefix - if (p_url.startsWith(HTTP_PREFIX) || p_url.startsWith(HTTPS_PREFIX)) - url = p_url; - else { - if (p_url.startsWith("/")) - url = getUrlPrefix() + p_url; - else - url = getUrlPrefix() + "/" + p_url; - } + if (null == p_wc) + throw new IllegalArgumentException("WebConversation cannot be null"); try { wr = p_wc.getResponse(url); Modified: incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java?view=diff&rev=106973&p1=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java&r1=106972&p2=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java&r2=106973 ============================================================================== --- incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java (original) +++ incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java Mon Nov 29 15:15:35 2004 @@ -10,7 +10,7 @@ protected static final String HTTPS_PREFIX = "https://";; private String urlPrefix = null; - + public ReportTestCase(String name) { super(name); @@ -49,5 +49,24 @@ } this.urlPrefix = p_urlPrefix; + } + + protected String createUrl(String p_url) + { + String l_url = null; + + if (null == p_url) + throw new IllegalArgumentException("URL cannot be null"); + + if (p_url.startsWith(HTTP_PREFIX) || p_url.startsWith(HTTPS_PREFIX)) + l_url = p_url; + else { + if (p_url.startsWith("/")) + l_url = getUrlPrefix() + p_url; + else + l_url = getUrlPrefix() + "/" + p_url; + } + + return l_url; } } Modified: incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java?view=diff&rev=106973&p1=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java&r1=106972&p2=incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java&r2=106973 ============================================================================== --- incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java (original) +++ incubator/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/SOAPReportTestCase.java Mon Nov 29 15:15:35 2004 @@ -20,12 +20,15 @@ } private Call createCall(String p_uri, String p_method) throws java.net.MalformedURLException { + + String l_url = createUrl(p_uri); + Call l_call = new Call(p_uri); QName l_qname = new QName("http://common.milton.tools.test.beehive.apache.org";, "Report"); l_call.setOperationName(new javax.xml.namespace.QName(p_method)); l_call.setReturnType(l_qname, Report.class); - l_call.registerTypeMapping(Report.class, l_qname, + l_call.registerTypeMapping(Report.class, l_qname, new BeanSerializerFactory(Report.class, l_qname), new BeanDeserializerFactory(Report.class, l_qname), true); return l_call; @@ -35,9 +38,9 @@ { if (null == p_uri || null == p_method) throw new IllegalArgumentException("URI and Method cannot be Null"); - + Object l_resp = createCall(p_uri, p_method).invoke(new Object[] {}); - + if (l_resp instanceof java.rmi.RemoteException) throw (java.rmi.RemoteException)l_resp; @@ -48,19 +51,19 @@ String l_exceptionStack = l_report.getExceptionStack(); if (Report.ABORT.equals(l_status)) - throw new AbortTestException("Abort Status Dectected: \n" + + throw new AbortTestException("Abort Status Dectected: \n" + l_report.toString()); else if (Report.FAIL.equals(l_status)) - throw new junit.framework.AssertionFailedError("FAILURE: \n" + + throw new junit.framework.AssertionFailedError("FAILURE: \n" + l_report.toString()); - + else if (! Report.PASS.equals(l_status)) throw new AbortTestException("Unknown Status Detected: \n" + l_report.toString()); if (null != l_message && ! "".equals(l_message)) System.out.println("\n[MESSAGES]\n\t" + l_message); - + if (null != l_exceptionStack && ! "".equals(l_exceptionStack)) System.out.println("\n[EXCEPTION]\n\t" + l_exceptionStack); }
