Changeset 22 for ccr/trunk/p/GPLUNIT.m

Timestamp:

Jun 26, 2008, 1:51:24 PM (16 years ago)

Author:

George Lilly

Message:

Minor code cleanup -- some test case bugs fixed

File:

• ccr/trunk/p/GPLUNIT.m (modified) (2 diffs)

ccr/trunk/p/GPLUNIT.m

@@ -17 +17 @@
         S ZARY(CNT)=TST ; put the test in the array
         I $D(ZARY(BAT))  D  ; NOT THE FIRST TEST IN BATTERY
-        . N II ; TEMP FOR ENDING TEST IN BATTERY
+        . N II,TN ; TEMP FOR ENDING TEST IN BATTERY
         . S II=$P(ZARY(BAT),"^",2)
         . S $P(ZARY(BAT),"^",2)=II+1
         I '$D(ZARY(BAT))  D  ; FIRST TEST IN THIS BATTERY
         . S ZARY(BAT)=CNT_"^"_CNT ; FIRST AND LAST TESTS IN BATTERY
-        . S ZARY("TESTS",BAT)="" ; PUT THE BATTERY IN THE TESTS INDEX
+        . ; S ZARY("TESTS",BAT)="" ; PUT THE BATTERY IN THE TESTS INDEX
+        . S TN=$NA(ZARY("TESTS"))
+        . D PUSH^GPLXPATH(TN,BAT)
         S ZARY(0)=CNT ; update the array counter
         Q
@@ -46 +48 @@
        . . I LINE?." "1";;>>".E  D  ; test case found
        . . . D ZT(.@ZARY,SECTION,$P(LINE,";;>>",2)) ; put the test in the array
-       S @ZARY@("ALL")="1"_"^"_@ZARY@(0) ; MAKE A BATTERY FOR ALL
+       ; S @ZARY@("ALL")="1"_"^"_@ZARY@(0) ; MAKE A BATTERY FOR ALL
        Q
        ;
 ZTEST(ZARY,WHICH)   ; try out the tests using a passed array ZTEST
-       N I,ZX,ZR,ZP
-       S DEBUG=0
-       I '$D(ZARY(WHICH))  D  ; TEST SECTION DOESN'T EXIST
-       . W "ERROR -- TEST SECTION DOESN'T EXIST -> ",WHICH,!
-       . Q ; EXIT
-       N FIRST,LAST
-       S FIRST=$P(ZARY(WHICH),"^",1)
-       S LAST=$P(ZARY(WHICH),"^",2)
-       F I=FIRST:1:LAST  D
-       . I ZARY(I)?1">"1.E  D  ; NOT A TEST, JUST RUN THE STATEMENT
-       . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
-       . . ;  W ZP,!
-       . . S ZX=ZP
-       . . W "RUNNING: "_ZP
-       . . X ZX
-       . . W "..SUCCESS: ",WHICH,!
-       . I ZARY(I)?1"?"1.E  D  ; THIS IS A TEST
-       . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
-       . . S ZX="S ZR="_ZP
-       . . W "TRYING: "_ZP
-       . . X ZX
-       . . W $S(ZR=1:"..PASSED ",1:"..FAILED "),!
-       . . I '$D(TPASSED) D  ; NOT INITIALIZED YET
-       . . . S TPASSED=0 S TFAILED=0
-       . . I ZR S TPASSED=TPASSED+1
-       . . I 'ZR S TFAILED=TFAILED+1
-       Q
-       ;
+        N I,ZX,ZR,ZP
+        S DEBUG=0
+        I WHICH="ALL" D  Q ; RUN ALL THE TESTS
+        . W "DOING ALL",! 
+        . N J,NT
+        . S NT=$NA(ZARY("TESTS"))
+        . W NT,@NT@(0),!
+        . F J=1:1:@NT@(0) D  ;
+        . . W @NT@(J),!
+        . . D ZTEST^GPLUNIT(@ZARY,@NT@(J))
+        I '$D(ZARY(WHICH))  D  ; TEST SECTION DOESN'T EXIST
+        . W "ERROR -- TEST SECTION DOESN'T EXIST -> ",WHICH,!
+        . Q ; EXIT
+        N FIRST,LAST
+        S FIRST=$P(ZARY(WHICH),"^",1)
+        S LAST=$P(ZARY(WHICH),"^",2)
+        F I=FIRST:1:LAST  D
+        . I ZARY(I)?1">"1.E  D  ; NOT A TEST, JUST RUN THE STATEMENT
+        . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
+        . . ;  W ZP,!
+        . . S ZX=ZP
+        . . W "RUNNING: "_ZP
+        . . X ZX
+        . . W "..SUCCESS: ",WHICH,!
+        . I ZARY(I)?1"?"1.E  D  ; THIS IS A TEST
+        . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
+        . . S ZX="S ZR="_ZP
+        . . W "TRYING: "_ZP
+        . . X ZX
+        . . W $S(ZR=1:"..PASSED ",1:"..FAILED "),!
+        . . I '$D(TPASSED) D  ; NOT INITIALIZED YET
+        . . . S TPASSED=0 S TFAILED=0
+        . . I ZR S TPASSED=TPASSED+1
+        . . I 'ZR S TFAILED=TFAILED+1
+        Q
+        ;
 TEST   ; RUN ALL THE TEST CASES
       N ZTMP