Changeset 1549

Show
Ignore:
Timestamp:
05/13/2009 03:15:45 AM (10 months ago)
Author:
kurtwiersma
Message:

- Tests for expression support in redirectEvent and redirectRoute methods. ref[t:285]

Location:
testharness/1-8-0/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • testharness/1-8-0/trunk/config/mach-ii.xml

    r1451 r1549  
    272272                </event-handler> 
    273273                 
     274                <event-handler event="testRedirectFromListenerExp" access="public"> 
     275                        <notify listener="redirect" method="redirectToEventExp" /> 
     276                </event-handler> 
     277                 
    274278                <event-handler event="testRedirectRouteFromListener" access="public"> 
    275279                        <notify listener="redirect" method="redirectToRoute" /> 
     280                </event-handler> 
     281                 
     282                <event-handler event="testRedirectRouteFromListenerExp" access="public"> 
     283                        <notify listener="redirect" method="redirectToRouteExp" /> 
    276284                </event-handler> 
    277285                 

  • testharness/1-8-0/trunk/listeners/redirectListener.cfc

    r1427 r1549  
    5555        </cffunction> 
    5656         
     57        <cffunction name="redirectToEventExp" access="public" returntype="void" output="false"> 
     58                <cfargument name="event" type="MachII.framework.Event" required="true" /> 
     59                 
     60                <cfset var persistArgs = StructNew() /> 
     61                 
     62                <cfset arguments.event.setArg("foo", "bar") /> 
     63                <cfset arguments.event.setArg("bar", "foo") /> 
     64                <cfset arguments.event.setArg("msg", "RedirectEvent() from a listener worked with args list including expressions.") /> 
     65                <cfset persistArgs.bar = "foo" /> 
     66                <cfset persistArgs.msg = "RedirectEvent() from a listener worked." /> 
     67                 
     68                <!--- <cfset redirectEvent("redirectEndPoint", event.getArgs(), true, persistArgs) /> ---> 
     69                <cfset redirectEvent("redirectEndPoint", "foo=${event.foo}", true, "bar=${event.bar},msg=${event.msg}")> 
     70        </cffunction> 
     71         
    5772        <cffunction name="redirectToRoute" access="public" returntype="void" output="false"> 
    5873                <cfargument name="event" type="MachII.framework.Event" required="true" /> 
    … …  
    6782        </cffunction> 
    6883         
     84        <cffunction name="redirectToRouteExp" access="public" returntype="void" output="false"> 
     85                <cfargument name="event" type="MachII.framework.Event" required="true" /> 
     86                 
     87                <cfset var persistArgs = StructNew() /> 
     88                 
     89                <cfset arguments.event.setArg("productID", "5") /> 
     90                <cfset arguments.event.setArg("displayType", "normal") /> 
     91                <cfset persistArgs.testingRedirectPersist = "RedirectEvent() from a listener worked." /> 
     92                <cfset arguments.event.setArg("testingRedirectPersist", persistArgs.testingRedirectPersist) /> 
     93                 
     94                <cfset redirectRoute("testroute", "productID=${event.productID},displayType=${event.displayType}", true,  
     95                        "testingRedirectPersist=${event.testingRedirectPersist}") /> 
     96                 
     97        </cffunction> 
     98         
    6999</cfcomponent> 

  • testharness/1-8-0/trunk/views/home.cfm

    r1441 r1549  
    111111        <li><a href="#buildUrl("testRedirectFromListener")#">Redirect to an event using a listener</a></li> 
    112112        <li><a href="#buildUrl("testRedirectRouteFromListener")#">Redirect to a route using a listener</a></li> 
     113        <li><a href="#buildUrl("testRedirectFromListenerExp")#">Redirect to an event using a listener with expressions</a></li> 
     114        <li><a href="#buildUrl("testRedirectRouteFromListenerExp")#">Redirect to an route using a listener with expressions</a></li> 
    113115</ul> 
    114116</div> 

  • testharness/1-8-0/trunk/views/layout/wrapper.cfm

    r1115 r1549  
    2323---> 
    2424 
    25 <cfset variables.directory = "" /> 
     25<cfset variables.directory = "/m2harness" /> 
    2626<cfif ListLen(cgi.script_name, "/") GT 1> 
    2727        <cfset variables.directory = ListDeleteAt(cgi.script_name, ListLen(cgi.script_name, "/"), "/") & "/" /> 
    … …  
    3636 
    3737        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    38         <cfif getProperty("urlParseSES")>                
    39                 <base href="http://#cgi.server_name##variables.directory#/" /> 
    40         </cfif> 
     38        <!--- <cfif getProperty("urlParseSES")> --->             
     39                <base href="http://#cgi.server_name##variables.directory#" /> 
     40        <!--- </cfif> ---> 
    4141        <link rel="stylesheet" type="text/css" href="css/basic.css" media="screen,projection" /> 
    4242</head>