Changeset 12 for trunk

Timestamp:

06/18/07 22:47:37 (5 years ago)

Author:

mgalloy

Message:

Fixed another typo.

Files:

• trunk/mgunit/mguttestsuite__define.pro (modified) (15 diffs)

trunk/mgunit/mguttestsuite__define.pro

@@ -12 +12 @@
     return
   endif
-  
-  resolve_routine, testName + '__define'
+
+  resolve_routine, classname + '__define'
 end
 
@@ -20 +20 @@
 ; Create a new test case or test suite, but check for errors while creating
 ; it.
-;     
+;
 ; @returns obj
 ; @param testName {in}{required}{type=string}
@@ -31 +31 @@
 function mguttestsuite::_makeTestCase, testName, error=error, _extra=e
   compile_opt strictarr
-  
+
   error = 0L
   catch, error
@@ -38 +38 @@
     return, obj_new()
   endif
-  
+
   self->_recompile, testName
-  
+
   return, obj_new(testName, test_runner=self.testRunner, _strict_extra=e)
 end
 
 
-;     
+;
 ;+
 ; Run the contained test suites or test cases.
@@ -62 +62 @@
     otestcase = self.testcases->get(position=t)
     otestcase->run
-    
+
     ; accumulate results
     otestcase->getProperty, npass=npass, nfail=nfail
@@ -79 +79 @@
 ;
 ; @param tests {in}{required}{type=strarr} classnames of test suites or test
-;        cases 
-; @keyword all {in}{optional}{type=boolean} set to add all the files in the 
-;          current directory that end in "_ut__define.pro" (the current 
-;          directory is defined to be the directory where the method that 
+;        cases
+; @keyword all {in}{optional}{type=boolean} set to add all the files in the
+;          current directory that end in "_ut__define.pro" (the current
+;          directory is defined to be the directory where the method that
 ;          calls this method is located)
 ;-
 pro mguttestsuite::add, tests, all=all
   compile_opt strictarr
-  
+
   if (keyword_set(all)) then begin
     ; first, add all the unit tests in the current directory
-    
+
     ; find matching files
     testFiles = file_search(self.home + '*_ut__define.pro', $
                             /fold_case, count=nTestFiles)
-    
+
     ; extract just classname from each file
     myTests = file_basename(testFiles)
@@ -102 +102 @@
       self->add, myTests[t]
     endfor
-    
+
     ; second, for each directory in the current directory, either:
     ;   1) add the *_uts__define.pro found there, or
@@ -118 +118 @@
         suiteName = strmid(suiteName, 0, strlen(suiteName) - 12L)
         if (suiteName ne self.name) then self->add, suiteName
-        
+
         continue   ; finished with this directory
       endif
-      
-      ; if there isn't a *_uts__define.pro, but there are unit tests here 
+
+      ; if there isn't a *_uts__define.pro, but there are unit tests here
       ; then create a new test suite
       uts = file_search(testDirs[d] + '*_ut__define.pro', $
                         count=nTestCases)
       if (nTestCases eq 0) then continue   ; finished with this directory
-      
+
       otestsuite = obj_new('MGutTestSuite', home=testDirs[d], $
                            name=file_basename(testDirs[d]), $
@@ -138 +138 @@
       ; don't add yourself to yourself
       if (tests[t] eq self.name) then continue
-      
-      ; see if test is valid      
+
+      ; see if test is valid
       otestcase = self->_makeTestCase(tests[t], error=error)
       if (error ne 0L) then begin
@@ -145 +145 @@
         continue
       endif
-      
+
       ; test case is OK so now set it up
       otestcase->setLevel, self.level + 1L
@@ -156 +156 @@
 ;+
 ; Get properties of the object.
-; 
+;
 ; @keyword name {out}{optional}{type=string} name of the object
-; @keyword npass {out}{optional}{type=integer} number of passing tests 
+; @keyword npass {out}{optional}{type=integer} number of passing tests
 ;          contained in the hierarchy below this object
-; @keyword nfail {out}{optional}{type=integer} number of failing tests 
+; @keyword nfail {out}{optional}{type=integer} number of failing tests
 ;          contained in the hierarchy below this object
-; @keyword ntestcases {out}{optional}{type=integer} number of directly 
+; @keyword ntestcases {out}{optional}{type=integer} number of directly
 ;          contained test suites or test cases
-; @keyword ntests {out}{optional}{type=integer} number of tests contained in 
+; @keyword ntests {out}{optional}{type=integer} number of tests contained in
 ;          the hierarchy below this object
 ;-
@@ -219 +219 @@
 ;
 ; @returns 1 for success, 0 for failure
-; @keyword name {in}{optional}{type=string}{default=classname} 
+; @keyword name {in}{optional}{type=string}{default=classname}
 ;          name of the test suite
-; @keyword home {in}{optional}{type=string}{default=''} 
+; @keyword home {in}{optional}{type=string}{default=''}
 ;          location of the root of the test suite
-; @keyword test_runner {in}{required}{type=object} 
+; @keyword test_runner {in}{required}{type=object}
 ;          subclass of MGtestRunner
 ;-
@@ -230 +230 @@
 
   self.name = n_elements(name) eq 0 ? strlowcase(obj_class(self)) : name
-  
+
   if (n_elements(home) eq 0) then begin
     ; get directory of caller's source code (subtract 2L to *caller* dir)
     traceback = scope_traceback(/structure)
-    callingFrame = traceback[n_elements(traceback) - 2L > 0] 
+    callingFrame = traceback[n_elements(traceback) - 2L > 0]
     self.home = file_dirname(callingFrame.filename, /mark_directory)
   endif else begin
@@ -241 +241 @@
       : home + path_sep()
   endelse
-  
-  self.level = 0L 
+
+  self.level = 0L
 
   self.testRunner = testRunner
 
   self.testcases = obj_new('IDL_Container')
-  
+
   self.npass = 0L
   self.nfail = 0L
@@ -257 +257 @@
 ;+
 ; Define member variables.
-; 
+;
 ; @file_comments Test suites are containers for test cases. Either subclass
-;                MGutTestSuite and add test suites/test cases in its init 
-;                method or create a MGutTestSuite and use the add method to 
+;                MGutTestSuite and add test suites/test cases in its init
+;                method or create a MGutTestSuite and use the add method to
 ;                add test suites/cases.
-; 
+;
 ; @field name name of the object
 ; @field level number of layers below the top-most containing test suite
 ; @field testcases IDL_Container holding test suites or test cases
 ; @field testRunner subclass of MGutTestRunner
-; @field npass number of passing tests contained in the hierarchy below this 
+; @field npass number of passing tests contained in the hierarchy below this
 ;        test suite
 ; @field nfail number of failing tests contained in the hierarchy below this