Menu
▾
▴
openxcf-cvs — CVS commit notifications
You can subscribe to this list here.
| 2004 |
Jan
(6) |
Feb
(36) |
Mar
(6) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(97) |
Sep
(4) |
Oct
(52) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(42) |
Feb
(135) |
Mar
(39) |
Apr
(3) |
May
(90) |
Jun
(46) |
Jul
(62) |
Aug
(95) |
Sep
(130) |
Oct
(125) |
Nov
(26) |
Dec
(74) |
| 2006 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(35) |
Aug
(11) |
Sep
|
Oct
|
Nov
(59) |
Dec
(90) |
| 2007 |
Jan
|
Feb
(28) |
Mar
(23) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul K. <pau...@us...> - 2007-03-11 08:30:20
|
Update of /cvsroot/openxcf/cfcUnit/release In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28809/release Modified Files: version.properties Log Message: Changed version info to reflect Beta2. Index: version.properties =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/release/version.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** version.properties 22 Dec 2006 08:48:36 -0000 1.1 --- version.properties 11 Mar 2007 08:30:17 -0000 1.2 *************** *** 1,4 **** ! product.name=cfcUnit version.major=1 version.minor=2 ! version.label=Beta1 \ No newline at end of file --- 1,4 ---- ! product.name=cfcunit version.major=1 version.minor=2 ! version.label=Beta2 \ No newline at end of file |
|
From: Paul K. <pau...@us...> - 2007-03-11 06:03:39
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/service In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5501/cfcunit/service Modified Files: cfcunit.properties Log Message: Added Apahce license to tops of two files that need it. Index: cfcunit.properties =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/service/cfcunit.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cfcunit.properties 11 Mar 2007 04:40:09 -0000 1.2 --- cfcunit.properties 11 Mar 2007 06:03:38 -0000 1.3 *************** *** 1,2 **** --- 1,19 ---- + # Copyright (c) 2006, Paul Kenney + # All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + + ############################################################################# # READ THIS CAREFULLY # *************** *** 5,8 **** --- 22,26 ---- # DIFFERENT, USER-DEFINED PROPERTIES FILE. FOR MORE INFORMATION, # CHECK OUT THE DOCUMENTATION. + ############################################################################# |
|
From: Paul K. <pau...@us...> - 2007-03-11 06:03:39
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5501/cfcunit/app/machii/model Modified Files: BaseUIListener.cfc Log Message: Added Apahce license to tops of two files that need it. Index: BaseUIListener.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/model/BaseUIListener.cfc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseUIListener.cfc 11 Mar 2007 05:54:22 -0000 1.1 --- BaseUIListener.cfc 11 Mar 2007 06:03:38 -0000 1.2 *************** *** 1,2 **** --- 1,19 ---- + <!--- + Copyright (c) 2006, Paul Kenney + All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ---> + <cfcomponent name="BaseUIListener" extends="cfcunit.machii.framework.Listener" output="false"> |
|
From: Paul K. <pau...@us...> - 2007-03-11 05:54:23
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1950/cfcunit/app/machii/model Modified Files: TextUIListener.cfc HTMLUIListener.cfc Added Files: BaseUIListener.cfc Log Message: Found bug where text ui did not work the same as the html ui when dealing with parameters. In fact, the text ui did not deal with parameters at all. Now it does, and the functionality that is common to both MachII listeners is contained in the new BaseUIListener class. This includes dealing with parameters. --- NEW FILE: BaseUIListener.cfc --- <cfcomponent name="BaseUIListener" extends="cfcunit.machii.framework.Listener" output="false"> <!---------------------------------------------------------------------------> <cfproperty name="testRunnerClassName" type="string" hint=""/> <cfset NULL = ""> <cfset variables["testRunnerClassName"] = NULL> <!---------------------------------------------------------------------------> <cffunction name="configure" returntype="void" access="public" output="false" hint="Initialize this listener component." throws="Exception.MachII.MissingParameter"> <cfset variables.testRunnerClassName = getParameter("TestRunnerClassName")> </cffunction> <!---------------------------------------------------------------------------> <!---------------------------------------------------------------------------> <cffunction name="createTestRunner" returntype="org.cfcunit.service.TestRunner" access="private" output="false"> <cfargument name="listener" type="org.cfcunit.framework.TestListener" required="false"/> <cfargument name="event" type="cfcunit.machii.framework.Event" required="true" hint=""/> <cfset var runnerArgs = structNew()> <cfif structKeyExists(arguments, "listener")> <cfset runnerArgs.listener = arguments.listener> </cfif> <cfif arguments.event.isArgDefined("parameters")> <cfset runnerArgs.parameters = arguments.event.getArg("parameters")> </cfif> <cfreturn createObject("component", variables.testRunnerClassName).init(argumentCollection=runnerArgs)/> </cffunction> <!---------------------------------------------------------------------------> <cffunction name="newObject" returntype="WEB-INF.cftags.component" access="private" output="false" hint=""> <cfargument name="type" type="string" required="true"/> <cfreturn CreateObject("component", arguments.type) /> </cffunction> <!---------------------------------------------------------------------------> </cfcomponent> Index: TextUIListener.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/model/TextUIListener.cfc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TextUIListener.cfc 17 Dec 2006 00:30:26 -0000 1.5 --- TextUIListener.cfc 11 Mar 2007 05:54:22 -0000 1.6 *************** *** 16,31 **** ---> ! <cfcomponent displayname="TextUIListener" extends="cfcunit.machii.framework.Listener" output="false" hint="Manages the CFCUnit Test Application."> <!---------------------------------------------------------------------------> - <cfproperty name="testRunnerClassName" type="string" hint=""/> <cfproperty name="resultPrinterClassName" type="string" hint=""/> - <cfset NULL = ""> - - <cfset variables["testRunnerClassName"] = NULL> <cfset variables["resultPrinterClassName"] = NULL> <!---------------------------------------------------------------------------> --- 16,28 ---- ---> ! <cfcomponent displayname="TextUIListener" extends="BaseUIListener" output="false" hint="Manages the CFCUnit Test Application."> <!---------------------------------------------------------------------------> <cfproperty name="resultPrinterClassName" type="string" hint=""/> <cfset variables["resultPrinterClassName"] = NULL> + <!---------------------------------------------------------------------------> *************** *** 35,39 **** throws="Exception.MachII.MissingParameter"> ! <cfset variables.testRunnerClassName = getParameter("TestRunnerClassName")> <cfset variables.resultPrinterClassName = getParameter("ResultPrinterClassName")> </cffunction> --- 32,37 ---- throws="Exception.MachII.MissingParameter"> ! <cfset super.configure()> ! <cfset variables.resultPrinterClassName = getParameter("ResultPrinterClassName")> </cffunction> *************** *** 46,50 **** <cfset var testClassName = arguments.event.getArg("testClassName")> <cfset var printer = newObject(variables.resultPrinterClassName)> ! <cfset var runner = newObject(variables.testRunnerClassName).init(printer)> <cfset var newArgs = StructNew()> <cfset var startTime = 0> --- 44,48 ---- <cfset var testClassName = arguments.event.getArg("testClassName")> <cfset var printer = newObject(variables.resultPrinterClassName)> ! <cfset var runner = createTestRunner(printer, arguments.event)> <cfset var newArgs = StructNew()> <cfset var startTime = 0> *************** *** 71,99 **** <!---------------------------------------------------------------------------> - <cffunction name="newObject" returntype="WEB-INF.cftags.component" access="private" output="false" hint="" - throws="Exception.NoSuchComponent,Exception.Instantiation"> - - <cfargument name="type" type="string" required="true"/> - <!--- ---> - <cfset var ret = NULL> - - <cftry> - <cfset ret = CreateObject("component", arguments.type)> - - <cfcatch type="coldfusion.runtime.CfJspPage$NoSuchTemplateException"> - <cfthrow type="Exception.NoSuchComponent" message="Could not find the component '#arguments.Type#'"/> - </cfcatch> - - <cfcatch type="any"> - <cfthrow type="Exception.Instantiation" - message="Could not instantiate object of type #arguments.type#" - detail="#arguments.type#"/> - </cfcatch> - </cftry> - - <cfreturn ret/> - </cffunction> - - <!---------------------------------------------------------------------------> - </cfcomponent> \ No newline at end of file --- 69,71 ---- Index: HTMLUIListener.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/model/HTMLUIListener.cfc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** HTMLUIListener.cfc 16 Dec 2006 10:07:51 -0000 1.7 --- HTMLUIListener.cfc 11 Mar 2007 05:54:22 -0000 1.8 *************** *** 16,30 **** ---> ! <cfcomponent displayname="HTMLUIListener" extends="cfcunit.machii.framework.Listener" output="false" hint="Manages the CFCUnit Test Application."> <!---------------------------------------------------------------------------> - <cfproperty name="testRunnerClassName" type="string" hint=""/> <cfproperty name="testListenerClassName" type="string" hint=""/> - <cfset NULL = ""> - - <cfset variables["testRunnerClassName"] = NULL> <cfset variables["testListenerClassName"] = NULL> --- 16,26 ---- ---> ! <cfcomponent displayname="HTMLUIListener" extends="BaseUIListener" output="false" hint="Manages the CFCUnit Test Application."> <!---------------------------------------------------------------------------> <cfproperty name="testListenerClassName" type="string" hint=""/> <cfset variables["testListenerClassName"] = NULL> *************** *** 35,39 **** throws="Exception.MachII.MissingParameter"> ! <cfset variables.testRunnerClassName = getParameter("TestRunnerClassName")> <cfset variables.testListenerClassName = getParameter("TestListenerClassName")> </cffunction> --- 31,36 ---- throws="Exception.MachII.MissingParameter"> ! <cfset super.configure()> ! <cfset variables.testListenerClassName = getParameter("TestListenerClassName")> </cffunction> *************** *** 97,148 **** <!---------------------------------------------------------------------------> - <!---------------------------------------------------------------------------> - - <cffunction name="createTestRunner" returntype="org.cfcunit.service.TestRunner" access="private" output="false"> - <cfargument name="listener" type="org.cfcunit.framework.TestListener" required="false"/> - <cfargument name="event" type="cfcunit.machii.framework.Event" required="true" hint=""/> - - <cfset var runnerArgs = structNew()> - - <cfif structKeyExists(arguments, "listener")> - <cfset runnerArgs.listener = arguments.listener> - </cfif> - - <cfif arguments.event.isArgDefined("parameters")> - <cfset runnerArgs.parameters = arguments.event.getArg("parameters")> - </cfif> - - <cfreturn createObject("component", "org.cfcunit.service.TestRunner").init(argumentCollection=runnerArgs)/> - </cffunction> - - - <!---------------------------------------------------------------------------> - - - <cffunction name="newObject" returntype="WEB-INF.cftags.component" access="private" output="false" hint="" - throws="Exception.NoSuchComponent,Exception.Instantiation"> - - <cfargument name="type" type="string" required="true"/> - <!--- ---> - <cfset var ret = NULL> - - <cftry> - <cfset ret = CreateObject("component", arguments.type)> - - <cfcatch type="coldfusion.runtime.CfJspPage$NoSuchTemplateException"> - <cfthrow type="Exception.NoSuchComponent" message="Could not find the component '#arguments.Type#'"/> - </cfcatch> - - <cfcatch type="any"> - <cfthrow type="Exception.Instantiation" - message="Could not instantiate object of type #arguments.type#" - detail="#arguments.type#"/> - </cfcatch> - </cftry> - - <cfreturn ret/> - </cffunction> - - <!---------------------------------------------------------------------------> </cfcomponent> \ No newline at end of file --- 94,97 ---- |
|
From: Paul K. <pau...@us...> - 2007-03-11 04:45:23
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9113/cfcunit/tests Modified Files: Application.cfc Application.cfm Log Message: Found some bugs in how the location of the assets folder is calculated by the test runner's remote entry points. Index: Application.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/tests/Application.cfc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Application.cfc 4 Mar 2007 11:28:50 -0000 1.1 --- Application.cfc 11 Mar 2007 04:45:20 -0000 1.2 *************** *** 16,20 **** ---> ! <cfcomponent hint=" If any component in this folder (and subfolders) is invoked directly via a Url, this will run it inside the --- 16,20 ---- ---> ! <cfcomponent name="Application" hint=" If any component in this folder (and subfolders) is invoked directly via a Url, this will run it inside the *************** *** 36,40 **** </cfif> ! <cfmodule template="/cfcunit/cfcunit.cfm"/> </cffunction> --- 36,44 ---- </cfif> ! <cfif url.runnerType is "xml"> ! <cfinclude template="../XmlService.cfm"/> ! <cfelse> ! <cfmodule template="../cfcunit.cfm"/> ! </cfif> </cffunction> Index: Application.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/tests/Application.cfm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Application.cfm 4 Mar 2007 11:28:50 -0000 1.1 --- Application.cfm 11 Mar 2007 04:45:20 -0000 1.2 *************** *** 38,42 **** <cfinclude template="../Application.cfm"/> ! <cfmodule template="/cfcunit/cfcunit.cfm"/> <cfabort/> --- 38,46 ---- <cfinclude template="../Application.cfm"/> ! <cfif url.runnerType is "xml"> ! <cfinclude template="../XmlService.cfm"/> ! <cfelse> ! <cfmodule template="../cfcunit.cfm"/> ! </cfif> <cfabort/> |
|
From: Paul K. <pau...@us...> - 2007-03-11 04:45:23
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9113/cfcunit Modified Files: index.cfm Log Message: Found some bugs in how the location of the assets folder is calculated by the test runner's remote entry points. Index: index.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/index.cfm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.cfm 4 Mar 2007 07:57:09 -0000 1.6 --- index.cfm 11 Mar 2007 04:45:20 -0000 1.7 *************** *** 16,20 **** ---> ! <cfmodule template="cfcunit.cfm"/> <!---------------------------------------------------------------------------------------------> \ No newline at end of file --- 16,20 ---- ---> ! <cfmodule template="cfcunit.cfm" assetsFolder="assets"/> <!---------------------------------------------------------------------------------------------> \ No newline at end of file |
|
From: Paul K. <pau...@us...> - 2007-03-11 04:42:58
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/plugins In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7978/cfcunit/app/machii/plugins Modified Files: PreferencesPlugin.cfc Log Message: Added exception handling around the checks for file existence so that security exceptions caused by any existing security sandbox is caught and handled without crashing the application. Thanks for catching this one Sean. Index: PreferencesPlugin.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/plugins/PreferencesPlugin.cfc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PreferencesPlugin.cfc 16 Dec 2006 10:07:51 -0000 1.1 --- PreferencesPlugin.cfc 11 Mar 2007 04:42:56 -0000 1.2 *************** *** 22,43 **** <cffunction name="configure" returntype="void" access="public" output="false"> ! <cfset var defaultPropertiesFile = expandPath("service/cfcunit.properties")> <cfset var customPropertiesFile = ""> <cfset var defaultPreferences = ""> <cfset var preferences = ""> ! <cfset defaultPreferences = createObject("component", "org.cfcunit.util.Properties").init()> ! <cfif fileExists(defaultPropertiesFile)> ! <cfset defaultPreferences.load(defaultPropertiesFile)> ! </cfif> <cfset preferences = createObject("component", "org.cfcunit.util.Properties").init(defaultPreferences)> ! ! <cfset customPropertiesFile = expandPath(getProperty("preferencesFile", ""))> ! <cfif fileExists(customPropertiesFile)> ! <cfset preferences.load(customPropertiesFile)> </cfif> <cfset setProperty("preferences", preferences)> </cffunction> --- 22,70 ---- <cffunction name="configure" returntype="void" access="public" output="false"> ! <cfset var defaultPropertiesFile = ""> <cfset var customPropertiesFile = ""> <cfset var defaultPreferences = ""> <cfset var preferences = ""> ! <cfset defaultPreferences = createObject("component", "org.cfcunit.util.Properties").init()> ! <cfset defaultPropertiesFile = expandPath("service/cfcunit.properties")> ! ! <cftry> ! <cfif fileExists(defaultPropertiesFile)> ! <cfset defaultPreferences.load(defaultPropertiesFile)> ! </cfif> ! ! <cfcatch type="security"> ! <!--- Sandbox security violation. ---> ! </cfcatch> ! </cftry> <cfset preferences = createObject("component", "org.cfcunit.util.Properties").init(defaultPreferences)> ! ! <cfset customPropertiesFile = getProperty("preferencesFile", "")> ! ! <cfif len(customPropertiesFile)> ! <cftry> ! <cfif not fileExists(customPropertiesFile)> ! <cfset customPropertiesFile = expandPath(customPropertiesFile)> ! </cfif> ! ! <cfcatch type="security"> ! <cfset customPropertiesFile = expandPath(customPropertiesFile)> ! </cfcatch> ! </cftry> </cfif> + <cftry> + <cfif fileExists(customPropertiesFile)> + <cfset preferences.load(customPropertiesFile)> + </cfif> + + <cfcatch type="security"> + <!--- Sandbox security violation. ---> + </cfcatch> + </cftry> + <cfset setProperty("preferences", preferences)> </cffunction> |
|
From: Paul K. <pau...@us...> - 2007-03-11 04:40:15
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/service In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7053/cfcunit/service Modified Files: cfcunit.properties Log Message: Added documentation to the cfcunit.properties file so that the different settings make a little more sense. The whole process of creating a custom properties file still needs to be documented though. Index: cfcunit.properties =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/service/cfcunit.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cfcunit.properties 16 Dec 2006 10:07:51 -0000 1.1 --- cfcunit.properties 11 Mar 2007 04:40:09 -0000 1.2 *************** *** 1,5 **** --- 1,53 ---- + # READ THIS CAREFULLY + # + # DO NOT MODIFY THE CONTENTS OF THIS FILE. THESE ARE DEFAULT + # SETTINGS FOR THE TEST RUNNER AND SHOULD BE OVERRIDDEN IN A + # DIFFERENT, USER-DEFINED PROPERTIES FILE. FOR MORE INFORMATION, + # CHECK OUT THE DOCUMENTATION. + + + + # Setting this to true will cause the test runner to display + # a text input where you can enter parameters that can be + # used by the test suite when run. By default, it is set + # to false so that it is not displayed, and none of the + # properties starting with 'html.parameters.*' properties + # are considered. + htmlui.parameters.enabled=false + + + + + # This is the name of the url/form variable that contains the + # parameters as an ecoded string. + htmlui.parameters.eventArg=testClassArgs + + + + + # This is the fully qualified name of the class that is responsible + # for decoding the parameter string into individual paramter values + # on behalf of the html runner application. The provided decoders + # are: + # + # cfcunit.service.util.EncodedParameters (default) + # cfcunit.service.util.JSONEncodedParameters + # cfcunit.service.util.UnencodedParameters + htmlui.parameters.className=cfcunit.service.util.EncodedParameters + + + + # This is the fully qualified name of the class that is responsible + # for decoding the parameter string into individual paramter values + # on behalf of the remote testing service. The provided decoders + # are: + # + # cfcunit.service.util.EncodedParameters (default) + # cfcunit.service.util.JSONEncodedParameters + # cfcunit.service.util.UnencodedParameters + service.parameters.className=cfcunit.service.util.EncodedParameters \ No newline at end of file |
|
From: Paul K. <pau...@us...> - 2007-03-04 23:17:58
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11464/cfcunit Modified Files: cfcunit.cfm Log Message: This file should only be callable as a custom tag and not via directly via url. Index: cfcunit.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/cfcunit.cfm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cfcunit.cfm 4 Mar 2007 07:57:09 -0000 1.1 --- cfcunit.cfm 4 Mar 2007 23:17:36 -0000 1.2 *************** *** 16,19 **** --- 16,24 ---- ---> + <cfif not isDefined("thistag")> + <!--- This must be called as a custom tag (or at least included in one). ---> + <cfabort/> + </cfif> + <cfparam name="attributes.preferencesFile" type="string" default=""/> <cfparam name="attributes.assetsFolder" type="string" default="#getPageContext().getRequest().getContextPath()#/cfcunit/assets"/> |
|
From: Paul K. <pau...@us...> - 2007-03-04 11:28:52
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29433/cfcunit/app/machii/views/tests Modified Files: classSelection.cfm Log Message: Added ability to run tests by directly invoking a test class via the url. Check out the following files for examples of how this can be done: /cfcunit/tests/Application.cfm /cfcunit/tests/Application.cfc Once launched, the runner can continue to be used though the original component that was invoked (instead of /cfcunit/index.cfm) when using the included form. Its actually pretty neat. Index: classSelection.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/classSelection.cfm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** classSelection.cfm 16 Dec 2006 10:07:51 -0000 1.5 --- classSelection.cfm 4 Mar 2007 11:28:50 -0000 1.6 *************** *** 22,27 **** <cfsilent> ! <cfparam name="event" type="struct"/> ! <cfset testClassName = event.getArg("testClassName", "")> <cfset runnerType = event.getArg("runnerType", "html")> --- 22,26 ---- <cfsilent> ! <cfset self = event.getArg("self", "index.cfm")> <cfset testClassName = event.getArg("testClassName", "")> <cfset runnerType = event.getArg("runnerType", "html")> *************** *** 54,58 **** <h3><label for="testClassName">Enter test to run:</label></h3> ! <form action="index.cfm" method="get"> <input type="hidden" name="event" value="runTest" /> --- 53,57 ---- <h3><label for="testClassName">Enter test to run:</label></h3> ! <form action="#self#" method="get"> <input type="hidden" name="event" value="runTest" /> |
|
From: Paul K. <pau...@us...> - 2007-03-04 11:28:51
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29433/cfcunit/app/machii/config Modified Files: mach-ii.xml Log Message: Added ability to run tests by directly invoking a test class via the url. Check out the following files for examples of how this can be done: /cfcunit/tests/Application.cfm /cfcunit/tests/Application.cfc Once launched, the runner can continue to be used though the original component that was invoked (instead of /cfcunit/index.cfm) when using the included form. Its actually pretty neat. Index: mach-ii.xml =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/config/mach-ii.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mach-ii.xml 4 Mar 2007 07:57:09 -0000 1.7 --- mach-ii.xml 4 Mar 2007 11:28:50 -0000 1.8 *************** *** 281,285 **** </parameters> </plugin> </plugins> ! </mach-ii> --- 281,287 ---- </parameters> </plugin> + + <plugin name="selfPlugin" type="cfcunit.app.machii.plugins.SelfPlugin"/> </plugins> ! </mach-ii> |
|
From: Paul K. <pau...@us...> - 2007-03-04 11:28:51
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29433/cfcunit/tests Added Files: Application.cfc Application.cfm Log Message: Added ability to run tests by directly invoking a test class via the url. Check out the following files for examples of how this can be done: /cfcunit/tests/Application.cfm /cfcunit/tests/Application.cfc Once launched, the runner can continue to be used though the original component that was invoked (instead of /cfcunit/index.cfm) when using the included form. Its actually pretty neat. --- NEW FILE: Application.cfc --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfcomponent hint=" If any component in this folder (and subfolders) is invoked directly via a Url, this will run it inside the HTML test runner application and display the results. The runner application will continue to operate through this url for subsequent requests, including those that run different tests. "> <cffunction name="onRequest" access="public" returntype="void"> <cfargument name="requestPath" type="string" required="true"/> <cfset var className = ""> <cfif listLast(arguments.requestPath, ".") is "cfc"> <cfset className = listChangeDelims(listDeleteAt(arguments.requestPath, listLen(arguments.requestPath, "."), "."), ".", "/")> <cfparam name="url.event" default="runTest" /> <cfparam name="url.runnerType" default="html" /> <cfparam name="url.testClassName" default="#className#"/> </cfif> <cfmodule template="/cfcunit/cfcunit.cfm"/> </cffunction> </cfcomponent> --- NEW FILE: Application.cfm --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <!--- If any component in this folder (and subfolders) is invoked directly via a Url, this will run it inside the HTML test runner application and display the results. The runner application will continue to operate through this url for subsequent requests, including those that run different tests. ---> <cfset contextRoot = getPageContext().getRequest().getContextPath()> <cfset requestPath = cgi.script_name> <cfif findNoCase(contextRoot, requestPath, 1) is 1> <cfset requestPath = replaceNoCase(requestPath, contextRoot, "", "one")> </cfif> <cfif listLast(requestPath, ".") is "cfc"> <cfset className = listChangeDelims(listDeleteAt(requestPath, listLen(requestPath, "."), "."), ".", "/")> <cfparam name="url.event" default="runTest" /> <cfparam name="url.runnerType" default="html" /> <cfparam name="url.testClassName" default="#className#"/> </cfif> <cfinclude template="../Application.cfm"/> <cfmodule template="/cfcunit/cfcunit.cfm"/> <cfabort/> |
|
From: Paul K. <pau...@us...> - 2007-03-04 11:28:51
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/plugins In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29433/cfcunit/app/machii/plugins Added Files: SelfPlugin.cfc Log Message: Added ability to run tests by directly invoking a test class via the url. Check out the following files for examples of how this can be done: /cfcunit/tests/Application.cfm /cfcunit/tests/Application.cfc Once launched, the runner can continue to be used though the original component that was invoked (instead of /cfcunit/index.cfm) when using the included form. Its actually pretty neat. --- NEW FILE: SelfPlugin.cfc --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfcomponent name="SelfPlugin" extends="cfcunit.machii.framework.Plugin" output="false"> <!-----------------------------------------------------------------------------------------> <cffunction name="preEvent" access="public" returntype="void" output="false"> <cfargument name="eventContext" type="cfcunit.machii.framework.EventContext" required="true" /> <cfset var event = arguments.eventContext.getCurrentEvent()> <cfset event.setArg("self", cgi.script_name)> </cffunction> <!-----------------------------------------------------------------------------------------> </cfcomponent> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/machii/config Modified Files: mach-ii.xml Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". Index: mach-ii.xml =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/config/mach-ii.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mach-ii.xml 17 Dec 2006 00:30:26 -0000 1.6 --- mach-ii.xml 4 Mar 2007 07:57:09 -0000 1.7 *************** *** 31,37 **** --- 31,41 ---- <property name="exceptionEvent" value="exception" /> + <!-- MODIFY THIS PATH TO OVERRIDE SOME DEFAULTS: <property name="preferencesFile" value="PATH_TO_PROPERTIES_FILE"/> --> + + <!-- MODIFY THIS PATH TO SET THE LOCATION OF THE ASSETS FOLDER, RELATIVE TO THE CFCUNIT WEBROOT: --> + <property name="assetsFolder" value="assets"/> </properties> *************** *** 261,265 **** --- 265,284 ---- <!-- PLUGINS --> <plugins> + <plugin name="externalConfigPlugin" type="cfcunit.app.machii.plugins.ExternalConfigPlugin"> + <parameters> + <parameter name="externalConfigStructName" value="request.externalConfig"/> + + <parameter name="externalName:preferencesFile" value="propertyName:preferencesFile"/> + <parameter name="externalName:assetsFolder" value="propertyName:assetsFolder"/> + </parameters> + </plugin> + <plugin name="preferencesPlugin" type="cfcunit.app.machii.plugins.PreferencesPlugin"/> + + <plugin name="propertyToEventPlugin" type="cfcunit.app.machii.plugins.PropertyToEventPlugin"> + <parameters> + <parameter name="propertyName:assetsFolder" value="eventName:assetsFolder"/> + </parameters> + </plugin> </plugins> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/plugins In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/machii/plugins Added Files: PropertyToEventPlugin.cfc ExternalConfigPlugin.cfc Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". --- NEW FILE: ExternalConfigPlugin.cfc --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfcomponent name="ExternalConfigPlugin" extends="cfcunit.machii.framework.Plugin" output="false"> <!------------------------------------------------------------------------------------> <cffunction name="configure" returntype="void" access="public" output="false"> <cfset var parameters = getParameters()> <cfset var externalConfigStructName = getParameter("externalConfigStructName", "request.externalConfig")> <cfset var externalConfigStruct = evaluate(externalConfigStructName)> <cfset var key = ""> <cfset var externalName = ""> <cfset var propertyName = ""> <cfloop collection="#parameters#" item="key"> <cfif listFirst(key, ":") is "externalName" and listFirst(parameters[key], ":") is "propertyName"> <cfset externalName = listRest(key, ":")> <cfset propertyName = listRest(parameters[key], ":")> <cfif structKeyExists(externalConfigStruct, externalName)> <cfset setProperty(propertyName, externalConfigStruct[externalName])> </cfif> </cfif> </cfloop> </cffunction> <!------------------------------------------------------------------------------------> </cfcomponent> --- NEW FILE: PropertyToEventPlugin.cfc --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfcomponent name="PropertyToEventPlugin" extends="cfcunit.machii.framework.Plugin" output="false"> <!-----------------------------------------------------------------------------------------> <cfproperty name="mappings" type="struct"/> <!-----------------------------------------------------------------------------------------> <cffunction name="configure" returntype="void" access="public" output="false"> <cfset var parameters = getParameters()> <cfset var key = ""> <cfset var propertyName = ""> <cfset var eventName = ""> <cfset variables.mappings = structNew()> <cfloop collection="#parameters#" item="key"> <cfif listFirst(key, ":") is "propertyName" and listFirst(parameters[key], ":") is "eventName"> <cfset propertyName = listRest(key, ":")> <cfset eventName = listRest(parameters[key], ":")> <cfset variables.mappings[propertyName] = eventName> </cfif> </cfloop> </cffunction> <!-----------------------------------------------------------------------------------------> <cffunction name="preView" access="public" returntype="void" output="false"> <cfargument name="eventContext" type="cfcunit.machii.framework.EventContext" required="true" /> <cfset var event = arguments.eventContext.getCurrentEvent()> <cfset var propertyName = ""> <cfloop collection="#variables.mappings#" item="propertyName"> <cfset event.setArg(variables.mappings[propertyName], getProperty(propertyName))> </cfloop> </cffunction> <!-----------------------------------------------------------------------------------------> </cfcomponent> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/machii/views Modified Files: showpage.cfm Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". Index: showpage.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/showpage.cfm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** showpage.cfm 21 Nov 2006 20:49:43 -0000 1.4 --- showpage.cfm 4 Mar 2007 07:57:09 -0000 1.5 *************** *** 17,22 **** <cfsilent> ! <cfparam name="request.event" type="struct"/> ! <cfset viewData = request.event.getArg("viewData", StructNew())> <cfsetting showdebugoutput="false"/> </cfsilent> --- 17,24 ---- <cfsilent> ! <cfset viewData = event.getArg("viewData", StructNew())> ! <cfset pageTitle = event.getArg("pageTitle", "cfcUnit Test Runner")> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> ! <cfsetting showdebugoutput="false"/> </cfsilent> *************** *** 24,32 **** <!-----------------------------------------------------> - <cfoutput> <cfmodule template="/cfcunit/app/tag/ui/page.cfm" pagedata="stPage"> ! <cfparam name="stPage.title" type="string" default="CFCUnit Test Application"/> ! <cfparam name="stPage.pageContent" type="string" default=""/> ! <div id="header"> <h1>cfcUnit</h1> --- 26,34 ---- <!-----------------------------------------------------> <cfmodule template="/cfcunit/app/tag/ui/page.cfm" pagedata="stPage"> ! <cfset stPage.title = pageTitle> ! <cfset stPage.assetsFolder = assetsFolder> ! ! <cfoutput> <div id="header"> <h1>cfcUnit</h1> *************** *** 37,40 **** #stPage.pageContent# </div> ! </cfmodule> ! </cfoutput> \ No newline at end of file --- 39,42 ---- #stPage.pageContent# </div> ! </cfoutput> ! </cfmodule> \ No newline at end of file |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/machii/views/tests/htmlui Modified Files: results.cfm resultsWithErrors.cfm tests.cfm resultsWithException.cfm resultsWithFailure.cfm Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". Index: resultsWithErrors.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/resultsWithErrors.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resultsWithErrors.cfm 21 Nov 2006 20:49:41 -0000 1.2 --- resultsWithErrors.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 17,24 **** <cfsilent> ! <cfparam name="event" type="struct"/> <cfsavecontent variable="headStyle"> ! <link href="assets/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> --- 17,24 ---- <cfsilent> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <cfsavecontent variable="headStyle"> ! <link href="<cfoutput>#assetsFolder#</cfoutput>/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> Index: resultsWithFailure.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/resultsWithFailure.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resultsWithFailure.cfm 21 Nov 2006 20:49:41 -0000 1.2 --- resultsWithFailure.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 17,24 **** <cfsilent> ! <cfparam name="event" type="struct"/> <cfsavecontent variable="headStyle"> ! <link href="assets/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> --- 17,24 ---- <cfsilent> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <cfsavecontent variable="headStyle"> ! <link href="<cfoutput>#assetsFolder#</cfoutput>/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> Index: results.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/results.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** results.cfm 21 Nov 2006 20:49:41 -0000 1.2 --- results.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 17,24 **** <cfsilent> ! <cfparam name="event" type="struct"/> <cfsavecontent variable="headStyle"> ! <link href="assets/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> --- 17,24 ---- <cfsilent> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <cfsavecontent variable="headStyle"> ! <link href="<cfoutput>#assetsFolder#</cfoutput>/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> Index: resultsWithException.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/resultsWithException.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resultsWithException.cfm 21 Nov 2006 20:49:41 -0000 1.2 --- resultsWithException.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 17,24 **** <cfsilent> ! <cfparam name="event" type="struct"/> <cfsavecontent variable="headStyle"> ! <link href="assets/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> --- 17,24 ---- <cfsilent> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <cfsavecontent variable="headStyle"> ! <link href="<cfoutput>#assetsFolder#</cfoutput>/styles/htmlui.css" rel="stylesheet" type="text/css" /> </cfsavecontent> <cfhtmlhead text="#headStyle#"/> Index: tests.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/tests.cfm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tests.cfm 20 Feb 2007 14:27:44 -0000 1.4 --- tests.cfm 4 Mar 2007 07:57:09 -0000 1.5 *************** *** 17,24 **** <cfsilent> - <cfparam name="event" type="struct"/> - <cfset listener = event.getArg("listener")> <cfset testResults = event.getArg("testResults")> <cfset allTests = listener.getTests()> --- 17,23 ---- <cfsilent> <cfset listener = event.getArg("listener")> <cfset testResults = event.getArg("testResults")> + <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <cfset allTests = listener.getTests()> *************** *** 26,30 **** <cfset allErrors = listener.getErrors()> ! <cfset iconDirectory = "assets/images/icons"> <cfif testResults.wasSuccessful()> --- 25,29 ---- <cfset allErrors = listener.getErrors()> ! <cfset iconDirectory = "#assetsFolder#/images/icons"> <cfif testResults.wasSuccessful()> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/errors In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/machii/views/errors Modified Files: exception.cfm Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". Index: exception.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/errors/exception.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** exception.cfm 21 Nov 2006 20:49:43 -0000 1.2 --- exception.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 16,28 **** ---> ! <cfparam name="request.event" type="struct" /> ! ! <cfset exception = request.event.getArg("exception")> ! <cfset exceptionEvent = request.event.getArg("exceptionEvent")> <!---------------------------------------------------------------------> <util:htmlhead key="exception"> ! <link href="assets/styles/exception.css" rel="stylesheet" type="text/css" /> </util:htmlhead> --- 16,27 ---- ---> ! <cfset exception = event.getArg("exception")> ! <cfset exceptionEvent = event.getArg("exceptionEvent")> ! <cfset assetsFolder = event.getArg("assetsFolder", "assets")> <!---------------------------------------------------------------------> <util:htmlhead key="exception"> ! <link href="<cfoutput>#assetsFolder#</cfoutput>/styles/exception.css" rel="stylesheet" type="text/css" /> </util:htmlhead> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/tag/ui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit/app/tag/ui Modified Files: page.cfm Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". Index: page.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/tag/ui/page.cfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page.cfm 21 Nov 2006 20:49:44 -0000 1.2 --- page.cfm 4 Mar 2007 07:57:09 -0000 1.3 *************** *** 25,29 **** <cfparam name="caller.viewData" type="struct" default="#StructNew()#"/> - <cfparam name="caller.viewData.title" type="string" default=""/> <cfif NOT StructKeyExists(caller.viewdata, "htmlhead")> --- 25,28 ---- *************** *** 37,40 **** --- 36,42 ---- <cfcase value="end"> + <cfparam name="caller.viewData.title" type="string" default=""/> + <cfparam name="caller.viewData.assetsFolder" type="string" default="assets"/> + <cfset content = thisTag.generatedContent> *************** *** 51,55 **** <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <link href="assets/styles/default.css" rel="stylesheet" type="text/css" /> <cfloop index="i" from="1" to="#caller.viewdata.htmlhead.size()#"> --- 53,57 ---- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <link href="#caller.viewData.assetsFolder#/styles/default.css" rel="stylesheet" type="text/css" /> <cfloop index="i" from="1" to="#caller.viewdata.htmlhead.size()#"> |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:57:13
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9749/cfcunit Modified Files: index.cfm Added Files: cfcunit.cfm Log Message: Created a custom tag that allows the test runner application to be invoked from a location other than the "/cfcunit" folder. The tag has two attributes: "preferencesFile" and "assetsFolder". --- NEW FILE: cfcunit.cfm --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfparam name="attributes.preferencesFile" type="string" default=""/> <cfparam name="attributes.assetsFolder" type="string" default="#getPageContext().getRequest().getContextPath()#/cfcunit/assets"/> <!---------------------------------------------------------------------------------------------> <cfset request.externalConfig = structNew()> <cfset request.externalConfig.preferencesFile = attributes.preferencesFile> <cfset request.externalConfig.assetsFolder = attributes.assetsFolder> <!---------------------------------------------------------------------------------------------> <cfset currentFolder = getDirectoryFromPath(getCurrentTemplatePath())> <!--- Set the configuration mode (when to reload): -1=never, 0=dynamic, 1=always ---> <cfset MACHII_CONFIG_MODE = 0> <cfset MACHII_CONFIG_PATH = currentFolder & "app/machii/config/mach-ii.xml"> <cfset MACHII_RESET = FALSE> <cfset MACHII_APP_KEY = "cfcunit"> <!---------------------------------------------------------------------------------------------> <cfsetting showdebugoutput="false"/> <cfinclude template="machii/mach-ii.cfm"/> <cfsetting showdebugoutput="false"/> <!---------------------------------------------------------------------------------------------> <cfexit method="exittag"/> Index: index.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/index.cfm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.cfm 22 Dec 2006 03:09:21 -0000 1.5 --- index.cfm 4 Mar 2007 07:57:09 -0000 1.6 *************** *** 16,31 **** ---> ! <!--- Set the configuration mode (when to reload): -1=never, 0=dynamic, 1=always ---> ! <cfset MACHII_CONFIG_MODE = 0> ! <cfset MACHII_CONFIG_PATH = ExpandPath("app/machii/config/mach-ii.xml")> ! <cfset MACHII_RESET = FALSE> ! <cfset MACHII_APP_KEY = "cfcunit"> ! ! <!---------------------------------------------------------------------------------------------> ! <cfsetting showdebugoutput="false"/> ! ! <cfinclude template="machii/mach-ii.cfm"/> ! ! <cfsetting showdebugoutput="false"/> <!---------------------------------------------------------------------------------------------> \ No newline at end of file --- 16,20 ---- ---> ! <cfmodule template="cfcunit.cfm"/> <!---------------------------------------------------------------------------------------------> \ No newline at end of file |
|
From: Paul K. <pau...@us...> - 2007-03-04 07:39:53
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/machii In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2905/cfcunit/machii Added Files: version.txt Log Message: Justed need a way of knowing what version of Mach-II is in use. --- NEW FILE: version.txt --- This is an embedded version of the Mach-II Framework v1.0.9 (http://www.mach-ii.com) |
|
From: Paul K. <pau...@us...> - 2007-03-03 16:09:34
|
Update of /cvsroot/openxcf/cfcUnit/org/cfcunit/framework In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29425/org/cfcunit/framework Modified Files: TestSuite.cfc Log Message: Fixed bug where an unhandled exception was thrown as the metadata was traversed for a TestCase subclass that did not have ANY methods of its own. Basically, if a class has no methods of its own, there is not a "functions" struct in the metadata, so before iterating over it, I first must check for its existence. Otherwise, I skip that class and move on to its super class. Index: TestSuite.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/org/cfcunit/framework/TestSuite.cfc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestSuite.cfc 20 Feb 2007 14:17:06 -0000 1.9 --- TestSuite.cfc 3 Mar 2007 16:09:32 -0000 1.10 *************** *** 122,130 **** <cfloop condition="TRUE"> ! <cfset methods = metadata.functions> ! ! <cfloop index="i" from="1" to="#ArrayLen(methods)#"> ! <cfset addTestMethod(methods[i], names, arguments.testClass)> ! </cfloop> <cfif metadata.Name IS "org.cfcunit.framework.TestCase"> --- 122,132 ---- <cfloop condition="TRUE"> ! <cfif structKeyExists(metadata, "functions")> ! <cfset methods = metadata.functions> ! ! <cfloop index="i" from="1" to="#ArrayLen(methods)#"> ! <cfset addTestMethod(methods[i], names, arguments.testClass)> ! </cfloop> ! </cfif> <cfif metadata.Name IS "org.cfcunit.framework.TestCase"> |
|
From: Paul K. <pau...@us...> - 2007-03-03 16:09:34
|
Update of /cvsroot/openxcf/cfcUnit/org/cfcunit/tests/framework In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29425/org/cfcunit/tests/framework Modified Files: SuiteTest.cfc Added Files: NoMethodsClass.cfc Log Message: Fixed bug where an unhandled exception was thrown as the metadata was traversed for a TestCase subclass that did not have ANY methods of its own. Basically, if a class has no methods of its own, there is not a "functions" struct in the metadata, so before iterating over it, I first must check for its existence. Otherwise, I skip that class and move on to its super class. Index: SuiteTest.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/org/cfcunit/tests/framework/SuiteTest.cfc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SuiteTest.cfc 12 Feb 2007 10:04:24 -0000 1.7 --- SuiteTest.cfc 3 Mar 2007 16:09:32 -0000 1.8 *************** *** 54,57 **** --- 54,58 ---- <cfset testSuite.addTest(newObject("org.cfcunit.tests.framework.SuiteTest").init("testNoTestCaseClass"))> <cfset testSuite.addTest(newObject("org.cfcunit.tests.framework.SuiteTest").init("testNoTestCases"))> + <cfset testSuite.addTest(newObject("org.cfcunit.tests.framework.SuiteTest").init("testSubClassWithoutMethods"))> <cfset testSuite.addTest(newObject("org.cfcunit.tests.framework.SuiteTest").init("testOneTestCase"))> <cfset testSuite.addTest(newObject("org.cfcunit.tests.framework.SuiteTest").init("testNotPublicTestCase"))> *************** *** 77,81 **** <cfset testSuite.run(variables.fResult)> ! <cfset assertEqualsNumber(2, variables.fResult.runCount())> </cffunction> --- 78,83 ---- <cfset testSuite.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 2, "runCount should be 2, but was #variables.fResult.runCount()#.")> ! <cfset assertTrue(variables.fResult.wasSuccessful(), "The test run should have been successful.")> </cffunction> *************** *** 88,93 **** <cfset testSuite.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.wasSuccessful())> ! <cfset assertEqualsNumber(2, variables.fResult.runCount(), "runCount should be 2, but was #variables.fResult.runCount()#.")> </cffunction> --- 90,95 ---- <cfset testSuite.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 2, "runCount should be 2, but was #variables.fResult.runCount()#.")> ! <cfset assertTrue(variables.fResult.wasSuccessful(), "The test run should have been successful.")> </cffunction> *************** *** 100,105 **** <cfset testSuite.run(variables.fResult)> ! <cfset assertEqualsNumber(1, variables.fResult.runCount())> <!--- warning test ---> ! <cfset assertTrue(NOT variables.fResult.wasSuccessful())> </cffunction> --- 102,108 ---- <cfset testSuite.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 1, "runCount should be 1, but was #variables.fResult.runCount()#.")> <!--- warning test ---> ! <cfset assertTrue(variables.fResult.failureCount() IS 1, "There should be 1 failure, but there was #variables.fResult.failureCount()#")> <!--- This is the warning ---> ! <cfset assertFalse(variables.fResult.wasSuccessful(), "The test run should have failed.")> </cffunction> *************** *** 112,118 **** <cfset test.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 1)> <!--- warning test ---> ! <cfset assertTrue(variables.fResult.failureCount() IS 1)> ! <cfset assertTrue(NOT variables.fResult.wasSuccessful())> </cffunction> --- 115,134 ---- <cfset test.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 1, "runCount should be 1, but was #variables.fResult.runCount()#.")> <!--- warning test ---> ! <cfset assertTrue(variables.fResult.failureCount() IS 1, "There should be 1 failure, but there was #variables.fResult.failureCount()#")> <!--- This is the warning ---> ! <cfset assertFalse(variables.fResult.wasSuccessful(), "The test run should have failed.")> ! </cffunction> ! ! <!--------------------------------------------------------------------> ! ! <cffunction name="testSubClassWithoutMethods" returntype="void" access="public" output="false"> ! <cfset var testSuite = newObject("org.cfcunit.framework.TestSuite")> ! ! <cfset testSuite.init(testClass=newObject("org.cfcunit.tests.framework.NoMethodsClass"))> ! <cfset testSuite.run(variables.fResult)> ! ! <cfset assertTrue(variables.fResult.runCount() IS 1, "runCount should be 1, but was #variables.fResult.runCount()#.")> <!--- warning test ---> ! <cfset assertTrue(variables.fResult.failureCount() IS 1, "There should be 1 failure, but there was #variables.fResult.failureCount()#")> <!--- This is the warning ---> ! <cfset assertFalse(variables.fResult.wasSuccessful(), "The test run should have failed.")> </cffunction> *************** *** 124,130 **** <cfset test.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 1)> ! <cfset assertTrue(variables.fResult.failureCount() IS 1)> ! <cfset assertTrue(variables.fResult.errorCount() IS 0)> </cffunction> --- 140,147 ---- <cfset test.run(variables.fResult)> ! <cfset assertTrue(variables.fResult.runCount() IS 1, "runCount should be 1, but was #variables.fResult.runCount()#.")> ! <cfset assertTrue(variables.fResult.failureCount() IS 1, "There should be 1 failure, but there was #variables.fResult.failureCount()#")> ! <cfset assertTrue(variables.fResult.errorCount() IS 0, "There should be 0 errors, but there was #variables.fResult.errorCount()#")> ! <cfset assertFalse(variables.fResult.wasSuccessful(), "The test run should have failed.")> </cffunction> --- NEW FILE: NoMethodsClass.cfc --- <!--- Copyright (c) 2006, Paul Kenney All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> <cfcomponent name="NoMethodsClass" extends="org.cfcunit.framework.TestCase" output="false" hint="Test class used in SuiteTest"> </cfcomponent> |
|
From: Paul K. <pau...@us...> - 2007-02-20 14:27:44
|
Update of /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3807/cfcunit/app/machii/views/tests/htmlui Modified Files: tests.cfm Log Message: If two adjacent test suites had the same simple name, their results would be merged under the first one instead of in two (or more) distinct groups. Changed display algorithm to examine the fqn of the test suite and not just the simple name. Index: tests.cfm =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/cfcunit/app/machii/views/tests/htmlui/tests.cfm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tests.cfm 21 Nov 2006 20:49:41 -0000 1.3 --- tests.cfm 20 Feb 2007 14:27:44 -0000 1.4 *************** *** 62,65 **** --- 62,66 ---- <cfset currentTestName = ""> + <cfset currentTestSuiteName = ""> <cfloop index="i" from="1" to="#ArrayLen(allTests)#"> *************** *** 77,86 **** </cfif> <cfset currentTestCase = ListLast(currentTest.test, "().")> <cfset currentIconPath = "#iconDirectory#/#iconFilename#"> </cfsilent> ! <cfif currentTestName NEQ currentTestCase> ! <cfset currentTestName = currentTestCase> ! <tr class="testSuite"><td colspan="6">#ListChangeDelims(ListRest(currentTest.test, "("), "", ")")#</td></tr> </cfif> --- 78,88 ---- </cfif> <cfset currentTestCase = ListLast(currentTest.test, "().")> + <cfset currentTestSuite = ListChangeDelims(ListRest(currentTest.test, "("), "", ")")> <cfset currentIconPath = "#iconDirectory#/#iconFilename#"> </cfsilent> ! <cfif currentTestSuiteName NEQ currentTestSuite> ! <cfset currentTestSuiteName = currentTestSuite> ! <tr class="testSuite"><td colspan="6">#currentTestSuite#</td></tr> </cfif> |
|
From: Paul K. <pau...@us...> - 2007-02-20 14:17:08
|
Update of /cvsroot/openxcf/cfcUnit/org/cfcunit/framework In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31806/org/cfcunit/framework Modified Files: TestSuite.cfc Log Message: Removed code that was already commented out. Index: TestSuite.cfc =================================================================== RCS file: /cvsroot/openxcf/cfcUnit/org/cfcunit/framework/TestSuite.cfc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestSuite.cfc 12 Feb 2007 10:04:24 -0000 1.8 --- TestSuite.cfc 20 Feb 2007 14:17:06 -0000 1.9 *************** *** 137,148 **** </cfloop> - <!--- - <cfloop collection="#this#" item="key"> - <cfif IsCustomFunction(this[key])> - <cfset addTestMethod(this[key], names, arguments.testClass)> - </cfif> - </cfloop> - ---> - <cfif ArrayLen(variables.fTests) IS 0> <cfset addTest(warning("No tests found in #testClassName#"))> --- 137,140 ---- *************** *** 215,241 **** <cfreturn TRUE/> - - <!--- - <cfset var param = NULL> - <cfset var i = 0> - - <cfif Left(arguments.method.name, 4) IS "test" - AND StructKeyExists(arguments.method, "returntype") AND arguments.method.returntype IS "void"> - - <cfif NOT ArrayLen(arguments.method.parameters)> - <cfreturn TRUE/> - <cfelse> - <cfloop index="i" from="1" to="#ArrayLen(arguments.method.parameters)#"> - <cfset param = arguments.method.parameters[i]> - <cfif param.required IS TRUE> - <cfreturn FALSE/> - </cfif> - </cfloop> - <cfreturn TRUE/> - </cfif> - </cfif> - - <cfreturn FALSE/> - ---> </cffunction> --- 207,210 ---- *************** *** 245,250 **** <cfargument name="method" type="any" required="true" hint="Method metadata struct"/> - <!---<cfparam name="arguments.method.access" type="string" default="public"/>---> - <cfif isTestMethod(arguments.method) AND ((structKeyExists(arguments.method, "access") AND arguments.method.access IS "public") --- 214,217 ---- |
