Changes in ccr/trunk/p/GPLUNIT.m [28:3]

File:

• ccr/trunk/p/GPLUNIT.m (modified) (4 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,TN ; TEMP FOR ENDING TEST IN BATTERY
+        . N II ; TEMP FOR ENDING TEST IN BATTERY
         . S II=$P(ZARY(BAT),"^",2)
         . S $P(ZARY(BAT),"^",2)=II+1
@@ -23 +23 @@
         . S ZARY(BAT)=CNT_"^"_CNT ; FIRST AND LAST TESTS IN BATTERY
         . 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
@@ -52 +50 @@
        ;
 ZTEST(ZARY,WHICH)   ; try out the tests using a passed array ZTEST
-        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
-        ;
+       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
+       ;
 TEST   ; RUN ALL THE TEST CASES
       N ZTMP
@@ -99 +89 @@
       Q
       ;
-GTSTS(GTZARY,RTN) ; return an array of test names
-        N I,J S I="" S I=$O(GTZARY("TESTS",I))
-        F J=0:0  Q:I=""  D
-        . D PUSH^GPLXPATH(RTN,I)
-        . S I=$O(GTZARY("TESTS",I))
-        Q
-        ;
-TESTALL(RNM) ; RUN ALL THE TESTS
-        N I,J,TZTMP,TSTS,TOTP,TOTF
-        S TOTP=0 S TOTF=0
-        D ZLOAD^GPLUNIT("TZTMP",RNM)
-        D GTSTS(.TZTMP,"TSTS")
-        F I=1:1:TSTS(0) D  ;
-        . S TPASSED=0 S TFAILED=0
-        . D ZTEST^GPLUNIT(.TZTMP,TSTS(I))
-        . S TOTP=TOTP+TPASSED
-        . S TOTF=TOTF+TFAILED
-        . S $P(TSTS(I),"^",2)=TPASSED
-        . S $P(TSTS(I),"^",3)=TFAILED
-        F I=1:1:TSTS(0) D  ;
-        . W "TEST=> ",$P(TSTS(I),"^",1)
-        . W " PASSED=>",$P(TSTS(I),"^",2)
-        . W " FAILED=>",$P(TSTS(I),"^",3),!
-        W "TOTAL=> PASSED:",TOTP," FAILED:",TOTF,!
-        Q
-        ;
 TLIST(ZARY) ; LIST ALL THE TESTS
      ; THEY ARE MARKED AS ;;><TESTNAME> IN THE TEST CASES