Update for a git problem on two routines
Problem with conflicting routines.
This commit is contained in:
JOEL IVEY
parent
1c363a0e62
commit
7165552a9b
|
|
@ -1,10 +1,6 @@
|
|||
<<<<<<< HEAD
|
||||
%ut1 ;VEN/SMH/JLI - CONTINUATION OF M-UNIT PROCESSING ;12/07/15 15:34
|
||||
=======
|
||||
%ut1 ;VEN/SMH/JLI - CONTINUATION OF M-UNIT PROCESSING ;11/21/15 11:50
|
||||
>>>>>>> origin/master
|
||||
;;0.2;MASH UTILITIES;;Sep 14, 2015;Build 7
|
||||
; Submitted to OSEHRA Sep 14, 2015 by Joel L. Ivey under the Apache 2 license (http://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
;;0.3;MASH UTILITIES;;Dec 7, 2015;Build 1
|
||||
; Submitted to OSEHRA Dec 07, 2015 by Joel L. Ivey under the Apache 2 license (http://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
; Original routine authored by Joel L. Ivey as XTMUNIT1 while working for U.S. Department of Veterans Affairs 2003-2012
|
||||
; Includes addition of original COV entry and code related coverage analysis as well as other substantial additions authored by Sam Habiel 07/2013?04/2014
|
||||
; Additions and modifications made by Joel L. Ivey 05/2014-08/2015
|
||||
|
|
@ -210,11 +206,7 @@ COV(NMSP,COVCODE,VERBOSITY) ; VEN/SMH - PUBLIC ENTRY POINT; Coverage calculation
|
|||
. . S COVERSAV=$NA(^TMP("%utCOVCOHORTSAV",$J)) K @COVERSAV
|
||||
. . S COVER=$NA(^TMP("%utCOVCOHORT",$J)) K @COVER
|
||||
. . D CACHECOV(COVERSAV,COVER)
|
||||
<<<<<<< HEAD
|
||||
. . D TOTAGS(COVERSAV,0),TOTAGS(COVER,1)
|
||||
=======
|
||||
. . D TOTAGS(COVERSAV),TOTAGS(COVER)
|
||||
>>>>>>> origin/master
|
||||
. . D ##class(%Monitor.System.LineByLine).Stop()
|
||||
. . Q
|
||||
. D COVCOV($NA(^TMP("%utCOVCOHORT",$J)),$NA(^TMP("%utCOVRESULT",$J))) ; Venn diagram matching between globals
|
||||
|
|
@ -230,33 +222,20 @@ COV(NMSP,COVCODE,VERBOSITY) ; VEN/SMH - PUBLIC ENTRY POINT; Coverage calculation
|
|||
CACHECOV(GLOBSAV,GLOB) ;
|
||||
; ZEXCEPT: %Monitor,GetMetrics,GetRoutineCount,GetRoutineName,LineByLine,System,class - not variable names, part of classes
|
||||
N DIF,I,METRIC,METRICNT,METRICS,MTRICNUM,ROUNAME,ROUNUM,X,XCNP,XXX
|
||||
<<<<<<< HEAD
|
||||
I $$ISUTEST(),'$D(^TMP("%utt4val",$J)) S ROUNUM=1,METRICS="RtnLine",METRICNT=1,ROUNAME="%ut"
|
||||
I $D(^TMP("%utt4val",$J))!'$$ISUTEST() S ROUNUM=##class(%Monitor.System.LineByLine).GetRoutineCount(),METRICS=##class(%Monitor.System.LineByLine).GetMetrics(),METRICNT=$l(METRICS,",")
|
||||
=======
|
||||
I $$ISUTEST S ROUNUM=1,METRICS="RtnLine",METRICNT=1,ROUNAME="%ut"
|
||||
I '$$ISUTEST S ROUNUM=##class(%Monitor.System.LineByLine).GetRoutineCount(),METRICS=##class(%Monitor.System.LineByLine).GetMetrics(),METRICNT=$l(METRICS,",")
|
||||
>>>>>>> origin/master
|
||||
; if only running to do coverage, should be 1
|
||||
S MTRICNUM=0 F I=1:1:METRICNT S METRIC=$P(METRICS,",",I) I METRIC="RtnLine" S MTRICNUM=I Q
|
||||
;
|
||||
F I=1:1:ROUNUM D
|
||||
<<<<<<< HEAD
|
||||
. I $D(^TMP("%utt4val",$J))!'$$ISUTEST() S ROUNAME=##class(%Monitor.System.LineByLine).GetRoutineName(I)
|
||||
=======
|
||||
. I '$$ISUTEST() S ROUNAME=##class(%Monitor.System.LineByLine).GetRoutineName(I)
|
||||
>>>>>>> origin/master
|
||||
. ; get routine loaded into location
|
||||
. S DIF=$NA(@GLOBSAV@(ROUNAME)),DIF=$E(DIF,1,$L(DIF)-1)_",",XCNP=0,X=ROUNAME
|
||||
. X ^%ZOSF("LOAD")
|
||||
. M @GLOB@(ROUNAME)=@GLOBSAV@(ROUNAME)
|
||||
. Q
|
||||
;
|
||||
<<<<<<< HEAD
|
||||
I $D(^TMP("%utt4val",$J))!'$$ISUTEST() F XXX=1:1:ROUNUM D GETVALS(XXX,GLOB,MTRICNUM)
|
||||
=======
|
||||
I '$$ISUTEST() F XXX=1:1:ROUNUM D GETVALS(XXX,GLOB,MTRICNUM)
|
||||
>>>>>>> origin/master
|
||||
Q
|
||||
;
|
||||
GETVALS(ROUNUM,GLOB,MTRICNUM) ; get data on number of times a line seen (set into VAL)
|
||||
|
|
@ -274,11 +253,7 @@ GETVALS(ROUNUM,GLOB,MTRICNUM) ; get data on number of times a line seen (set int
|
|||
D RSET.Close()
|
||||
Q
|
||||
;
|
||||
<<<<<<< HEAD
|
||||
TOTAGS(GLOBAL,ACTIVE) ; convert to lines from tags and set value only if not seen
|
||||
=======
|
||||
TOTAGS(GLOBAL) ; convert to lines from tags and set value only if not seen
|
||||
>>>>>>> origin/master
|
||||
N ACTIVCOD,LINE,LINENUM,ROU,ROUCODE
|
||||
S ROU="" F S ROU=$O(@GLOBAL@(ROU)) Q:ROU="" D
|
||||
. M ROUCODE(ROU)=@GLOBAL@(ROU) K @GLOBAL@(ROU)
|
||||
|
|
@ -287,12 +262,8 @@ TOTAGS(GLOBAL) ; convert to lines from tags and set value only if not seen
|
|||
. . S LINE=ROUCODE(ROU,LINENUM,0)
|
||||
. . S ACTIVCOD=$$LINEDATA(LINE,.TAG,.OFFSET)
|
||||
. . I TAG'=OLDTAG S @GLOBAL@(ROU,TAG)=TAG
|
||||
<<<<<<< HEAD
|
||||
. . I ACTIVE,ACTIVCOD,(+$G(ROUCODE(ROU,LINENUM,"C"))'>0) S @GLOBAL@(ROU,TAG,OFFSET)=LINE
|
||||
. . I 'ACTIVE,ACTIVCOD S @GLOBAL@(ROU,TAG,OFFSET)=LINE
|
||||
=======
|
||||
. . I ACTIVCOD,(+$G(ROUCODE(ROU,LINENUM,"C"))'>0) S @GLOBAL@(ROU,TAG,OFFSET)=LINE
|
||||
>>>>>>> origin/master
|
||||
. . Q
|
||||
. Q
|
||||
Q
|
||||
|
|
@ -406,15 +377,10 @@ COVRPTLS(C,S,R,V,X) ;
|
|||
. N O S O=$$ACTLINES($NA(@C@(RTN)))
|
||||
. N L S L=$$ACTLINES($NA(@S@(RTN)))
|
||||
. ;W ?3,RTN,?21,$S(O:$J(O-L/O*100,"",2),1:"100.00"),!
|
||||
<<<<<<< HEAD
|
||||
. N XX,XY S XX=" "_RTN_" ",XX=$E(XX,1,12)
|
||||
. S XY=" "_$S(O:$J((O-L)/O*100,"",2)_"%",1:"------"),XY=$E(XY,$L(XY)-11,$L(XY))
|
||||
. ;S LINNUM=LINNUM+1,@X@(LINNUM)=XX_$S(O:$J((O-L)/O*100,"",2)_"%",1:"------")_" "_(O-L)_" out of "_O
|
||||
. S LINNUM=LINNUM+1,@X@(LINNUM)=XX_XY_" "_(O-L)_" out of "_O
|
||||
=======
|
||||
. N XX,XY S XX=" "_RTN_" ",XX=$E(XX,1,20)
|
||||
. S LINNUM=LINNUM+1,@X@(LINNUM)=XX_$S(O:$J((O-L)/O*100,"",2),1:"---- ")
|
||||
>>>>>>> origin/master
|
||||
. I V=1 QUIT ; Just print the routine coverage for V=1
|
||||
. N TAG S TAG=""
|
||||
. F S TAG=$O(@C@(RTN,TAG)) Q:TAG="" D
|
||||
|
|
@ -422,15 +388,9 @@ COVRPTLS(C,S,R,V,X) ;
|
|||
. . N L S L=$$ACTLINES($NA(@S@(RTN,TAG)))
|
||||
. . ;W ?5,TAG,?21,$S(O:$J(O-L/O*100,"",2),1:"100.00"),!
|
||||
. . S XX=" "_TAG_" ",XX=$E(XX,1,20)
|
||||
<<<<<<< HEAD
|
||||
. . ;S XY=" ("_(O-L)_"/"_O_")",XY=$E(XY,$L(XY)-11,$L(XY)),XX=XX_XY
|
||||
. . S XY=" "_$S(O:$J((O-L)/O*100,"",2)_"%",1:"------"),XY=$E(XY,$L(XY)-7,$L(XY))
|
||||
. . S LINNUM=LINNUM+1,@X@(LINNUM)=XX_XY_" "_(O-L)_" out of "_O
|
||||
=======
|
||||
. . S XY=" ("_(O-L)_"/"_O_")",XY=$E(XY,$L(XY)-11,$L(XY)),XX=XX_XY
|
||||
. . S XY=" "_$S(O:$J((O-L)/O*100,"",2)_"%",1:"---- "),XY=$E(XY,$L(XY)-7,$L(XY))
|
||||
. . S LINNUM=LINNUM+1,@X@(LINNUM)=XX_XY
|
||||
>>>>>>> origin/master
|
||||
. . I V=2 QUIT ; Just print routine/tags coverage for V=2; V=3 print uncovered lines
|
||||
. . N LN S LN=""
|
||||
. . ;F S LN=$O(@S@(RTN,TAG,LN)) Q:LN="" W TAG_"+"_LN_": "_^(LN),!
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
<<<<<<< HEAD
|
||||
%uttcovr ;JIVEYSOFT/JLI - runs coverage tests on %ut and %ut1 routines via unit tests ;12/07/15 16:46
|
||||
=======
|
||||
%uttcovr ;JIVEYSOFT/JLI - runs coverage tests on %ut and %ut1 routines via unit tests ;11/21/15 19:35
|
||||
>>>>>>> origin/master
|
||||
;;0.2;MASH UTILITIES;;Sep 14, 2015;Build 7
|
||||
; Submitted to OSEHRA Sep 14, 2015 by Joel L. Ivey under the Apache 2 license (http://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
;;0.3;MASH UTILITIES;;Dec 7, 2015;Build 1
|
||||
; Submitted to OSEHRA Dec 07, 2015 by Joel L. Ivey under the Apache 2 license (http://www.apache.org/licenses/LICENSE-2.0.html)
|
||||
; Original routine authored by Joel L. Ivey
|
||||
;
|
||||
;
|
||||
|
|
@ -64,13 +60,8 @@ RTNANAL ; @TEST - routine analysis
|
|||
S GLB=$NA(^TMP("%uttcovr-rtnanal",$J)) K @GLB
|
||||
D RTNANAL^%ut1(.ROUS,GLB)
|
||||
D CHKTF($D(@GLB@("%utt4","MAIN"))>1,"Not enough 'MAIN' nodes found")
|
||||
<<<<<<< HEAD
|
||||
D CHKTF($G(@GLB@("%utt4","MAIN",3))["D COV^%ut(""%utt3"",""D EN^%ut(""""%utt3"""",1)"",-1)","Incorrect data for line 2 in MAIN")
|
||||
D CHKTF($G(@GLB@("%utt4","MAIN",9))=" QUIT","Final QUIT not on expected line")
|
||||
=======
|
||||
D CHKTF($G(@GLB@("%utt4","MAIN",2))["+$SY=47","Check for GT.M not found in expected line")
|
||||
D CHKTF($G(@GLB@("%utt4","MAIN",8))=" QUIT","Final QUIT not on expected line")
|
||||
>>>>>>> origin/master
|
||||
K @GLB
|
||||
Q
|
||||
;
|
||||
|
|
@ -101,24 +92,6 @@ COVCOV ; @TEST - check COVCOV - remove seen lines
|
|||
K @C,@R
|
||||
Q
|
||||
;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
COVRPTGL ; @TEST - coverage report returning global
|
||||
N GL1,GL2,GL3,GL4
|
||||
S GL1=$NA(^TMP("%utCOVCOHORTSAVx",$J)) K @GL1
|
||||
S GL2=$NA(^TMP("%utCOVCOHORTx",$J)) K @GL2
|
||||
S GL3=$NA(^TMP("%utCOVRESULTx",$J)) K @GL3
|
||||
S GL4=$NA(^TMP("%utCOVREPORTx",$J)) K @GL4
|
||||
D SETGLOBS(GL1,GL2)
|
||||
D COVRPTGL^%ut1(GL1,GL2,GL3,GL4)
|
||||
D CHKEQ($G(@GL4@("%ut1","ACTLINES")),"0/9","Wrong number of lines covered f>>or ACTLINES")
|
||||
D CHKEQ($G(@GL4@("%ut1","ACTLINES",9))," QUIT CNT","Wrong result for last l>>ine not covered for ACTLINES")
|
||||
D CHKEQ($G(@GL4@("%ut1","CHEKTEST")),"8/10","Wrong number of lines covered >>for CHEKTEST")
|
||||
D CHKEQ($G(@GL4@("%ut1","CHEKTEST",39))," . Q","Wrong result for last line >>not covered for CHEKTEST")
|
||||
K @GL1,@GL2,@GL3,@GL4
|
||||
Q
|
||||
;
|
||||
>>>>>>> origin/master
|
||||
COVRPT ; @TEST
|
||||
N GL1,GL2,GL3,GL4,VRBOSITY,GL5
|
||||
S GL1=$NA(^TMP("%utCOVCOHORTSAVx",$J)) K @GL1
|
||||
|
|
@ -130,40 +103,22 @@ COVRPT ; @TEST
|
|||
S VRBOSITY=1
|
||||
D COVRPT^%ut1(GL1,GL2,GL3,VRBOSITY)
|
||||
D CHKEQ("COVERAGE PERCENTAGE: 42.11",$G(@GL5@(5)),"Verbosity 1 - not expected percentage value")
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" %ut1 42.11% 8 out of 19",$G(@GL5@(9)),"Verbosity 1 - not expected value for line 9")
|
||||
=======
|
||||
D CHKEQ(" %ut1 42.11",$G(@GL5@(9)),"Verbosity 1 - not expected value for line 9")
|
||||
>>>>>>> origin/master
|
||||
D CHKTF('$D(@GL5@(10)),"Verbosity 1 - unexpected data in 10th line")
|
||||
;
|
||||
S VRBOSITY=2
|
||||
D COVRPT^%ut1(GL1,GL2,GL3,VRBOSITY)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" ACTLINES 0.00% 0 out of 9",$G(@GL5@(10)),"Verbosity 2 - not expected value for 10th line")
|
||||
D CHKEQ(" CHEKTEST 80.00% 8 out of 10",$G(@GL5@(11)),"Verbosity 2 - not expected value for 11th line")
|
||||
=======
|
||||
D CHKEQ(" ACTLINES (0/9) 0.00%",$G(@GL5@(10)),"Verbosity 2 - not expected value for 10th line")
|
||||
D CHKEQ(" CHEKTEST (8/10) 80.00%",$G(@GL5@(11)),"Verbosity 2 - not expected value for 11th line")
|
||||
>>>>>>> origin/master
|
||||
D CHKTF('$D(@GL5@(12)),"Verbosity 2 - unexpected data for 12th line")
|
||||
;
|
||||
S VRBOSITY=3
|
||||
D COVRPT^%ut1(GL1,GL2,GL3,VRBOSITY)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" ACTLINES 0.00% 0 out of 9",$G(@GL5@(10)),"Verbosity 3 - unexpected value for line 10")
|
||||
D CHKEQ("ACTLINES+9: QUIT CNT",$G(@GL5@(19)),"Verbosity 3 - unexpected value for line 19")
|
||||
D CHKEQ(" CHEKTEST 80.00% 8 out of 10",$G(@GL5@(20)),"Verbosity 3 - unexpected value for line 20")
|
||||
D CHKEQ("CHEKTEST+39: . Q",$G(@GL5@(22)),"Verbosity 3 - unexpected value for line 22")
|
||||
D CHKTF('$D(@GL5@(23)),"Verbosity 3 - unexpected line 23")
|
||||
=======
|
||||
D CHKEQ(" ACTLINES (0/9) 0.00%",$G(@GL5@(10)),"Verbosity 3 - unexpected value for line 10")
|
||||
D CHKEQ("ACTLINES+9: QUIT CNT",$G(@GL5@(19)),"Verbosity 3 - unexpected value for line 19")
|
||||
D CHKEQ(" CHEKTEST (8/10) 80.00%",$G(@GL5@(20)),"Verbosity 3 - unexpected value for line 20")
|
||||
D CHKEQ("CHEKTEST+39: . Q",$G(@GL5@(22)),"Verbosity 3 - unexpected value for line 22")
|
||||
D CHKTF('$D(@GL5@(23)),"Verbosity 3 - unexpected line 23")
|
||||
;
|
||||
>>>>>>> origin/master
|
||||
K @GL1,@GL2,@GL3,@GL4,@GL5
|
||||
Q
|
||||
;
|
||||
|
|
@ -177,37 +132,22 @@ COVRPTLS ; @TEST - coverage report returning text in global
|
|||
S VRBOSITY=1
|
||||
D COVRPTLS^%ut1(GL1,GL2,GL3,VRBOSITY,GL4)
|
||||
D CHKEQ("COVERAGE PERCENTAGE: 42.11",$G(@GL4@(5)),"Verbosity 1 - not expected percentage value")
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" %ut1 42.11% 8 out of 19",$G(@GL4@(9)),"Verbosity 1 - not expected value for line 9")
|
||||
=======
|
||||
D CHKEQ(" %ut1 42.11",$G(@GL4@(9)),"Verbosity 1 - not expected value for line 9")
|
||||
>>>>>>> origin/master
|
||||
D CHKTF('$D(@GL4@(10)),"Verbosity 1 - unexpected data in 10th line")
|
||||
K @GL4
|
||||
;
|
||||
S VRBOSITY=2
|
||||
D COVRPTLS^%ut1(GL1,GL2,GL3,VRBOSITY,GL4)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" ACTLINES 0.00% 0 out of 9",$G(@GL4@(10)),"Verbosity 2 - not expected value for 10th line")
|
||||
D CHKEQ(" CHEKTEST 80.00% 8 out of 10",$G(@GL4@(11)),"Verbosity 2 - not expected value for 11th line")
|
||||
=======
|
||||
D CHKEQ(" ACTLINES (0/9) 0.00%",$G(@GL4@(10)),"Verbosity 2 - not expected value for 10th line")
|
||||
D CHKEQ(" CHEKTEST (8/10) 80.00%",$G(@GL4@(11)),"Verbosity 2 - not expected value for 11th line")
|
||||
>>>>>>> origin/master
|
||||
D CHKTF('$D(@GL4@(12)),"Verbosity 2 - unexpected data for 12th line")
|
||||
K @GL4
|
||||
;
|
||||
S VRBOSITY=3
|
||||
D COVRPTLS^%ut1(GL1,GL2,GL3,VRBOSITY,GL4)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" ACTLINES 0.00% 0 out of 9",$G(@GL4@(10)),"Verbosity 3 - unexpected value for line 10")
|
||||
D CHKEQ("ACTLINES+9: QUIT CNT",$G(@GL4@(19)),"Verbosity 3 - unexpected value for line 19")
|
||||
D CHKEQ(" CHEKTEST 80.00% 8 out of 10",$G(@GL4@(20)),"Verbosity 3 - unexpected value for line 20")
|
||||
=======
|
||||
D CHKEQ(" ACTLINES (0/9) 0.00%",$G(@GL4@(10)),"Verbosity 3 - unexpected value for line 10")
|
||||
D CHKEQ("ACTLINES+9: QUIT CNT",$G(@GL4@(19)),"Verbosity 3 - unexpected value for line 19")
|
||||
D CHKEQ(" CHEKTEST (8/10) 80.00%",$G(@GL4@(20)),"Verbosity 3 - unexpected value for line 20")
|
||||
>>>>>>> origin/master
|
||||
D CHKEQ("CHEKTEST+39: . Q",$G(@GL4@(22)),"Verbosity 3 - unexpected value for line 22")
|
||||
D CHKTF('$D(@GL4@(23)),"Verbosity 3 - unexpected line 23")
|
||||
;
|
||||
|
|
@ -243,34 +183,21 @@ LIST ; @TEST - LIST in %utcover
|
|||
S @GL1@("%ut1","CHEKTEST")="10/10"
|
||||
N XCLUD S XCLUD("%utt1")=""
|
||||
D LIST^%utcover(.XCLUD,1,GLT,GL1)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ("Routine %ut1 (55.63%) 89 out of 160 lines covered",$G(@GLT@(3)),"Verbosity 1 - Unexpected text for line 3")
|
||||
=======
|
||||
D CHKEQ("Routine %ut1 89 out of 160 lines covered (55%)",$G(@GLT@(3)),"Verbosity 1 - Unexpected text for line 3")
|
||||
>>>>>>> origin/master
|
||||
D CHKEQ("Overall Analysis 89 out of 160 lines covered (55% coverage)",$G(@GLT@(6)),"Verbosity 1 - unexpected text for line 6")
|
||||
D CHKTF('$D(@GLT@(7)),"Verbosity 1 - Unexpected line 7 present")
|
||||
K @GLT
|
||||
;
|
||||
D LIST^%utcover(.XCLUD,2,GLT,GL1)
|
||||
D CHKEQ(" - Summary",$G(@GLT@(4)),"Verbosity 2 - unexpected text at line 4")
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" Tag ACTLINES^%ut1 (0.00%) 0 out of 8 lines covered",$G(@GLT@(6)),"Verbosity 2 - unexpected text at line 6")
|
||||
D CHKEQ(" Tag CHEKTEST^%ut1 (100.00%) 10 out of 10 lines covered",$G(@GLT@(8)),"Verbosity 2 - unexpected text at line 8")
|
||||
=======
|
||||
D CHKEQ(" Tag ACTLINES^%ut1 0 out of 8 lines covered",$G(@GLT@(6)),"Verbosity 2 - unexpected text at line 6")
|
||||
D CHKEQ(" Tag CHEKTEST^%ut1 10 out of 10 lines covered",$G(@GLT@(8)),"Verbosity 2 - unexpected text at line 8")
|
||||
>>>>>>> origin/master
|
||||
D CHKTF($D(@GLT@(14)),"Verbosity 2 - expected line at line 14")
|
||||
D CHKTF('$D(@GLT@(15)),"Verbosity 2 - unexpected line at line 15")
|
||||
K @GLT
|
||||
;
|
||||
D LIST^%utcover(.XCLUD,3,GLT,GL1)
|
||||
<<<<<<< HEAD
|
||||
D CHKEQ(" Tag %ut1^%ut1 (100.00%) 2 out of 2 lines covered",$G(@GLT@(5)),"Verbosity 3 - Incorrect text at line 5")
|
||||
=======
|
||||
D CHKEQ(" Tag %ut1^%ut1 2 out of 2 lines covered",$G(@GLT@(5)),"Verbosity 3 - Incorrect text at line 5")
|
||||
>>>>>>> origin/master
|
||||
D CHKEQ(" ACTLINES+9 QUIT CNT",$G(@GLT@(15)),"Verbosity 3 - incorrect line 15")
|
||||
D CHKTF($D(@GLT@(31)),"Verbosity 3 - expected data in line 31")
|
||||
D CHKTF('$D(@GLT@(32)),"Verbosity 3 - did not expect a line 32")
|
||||
|
|
@ -357,11 +284,7 @@ LINEDATA ; @TEST - convert code line to based on tags and offset, and identify a
|
|||
Q
|
||||
;
|
||||
TOTAGS ;@TEST - convert from lines of code by line number to lines ordered by tag, line from tag, and only not covered
|
||||
<<<<<<< HEAD
|
||||
N ACTIVE,GLOB,GLOBT,X1,X0
|
||||
=======
|
||||
N GLOB,GLOBT,X1,X0
|
||||
>>>>>>> origin/master
|
||||
S GLOB=$NA(^TMP("%uttcovr",$J)),GLOBT=$NA(@GLOB@("TEST1")) K @GLOB
|
||||
S @GLOBT@(1,0)="LINE1 ; CODE1 LINE1+0 NOT ACTIVE"
|
||||
S @GLOBT@(2,0)=" CODE2 LINE+1 SEEN"
|
||||
|
|
@ -374,12 +297,8 @@ TOTAGS ;@TEST - convert from lines of code by line number to lines ordered by ta
|
|||
S @GLOBT@(6,"C")=2
|
||||
S @GLOBT@(7,0)="LINE7 CODE7 LINE7+0 NOT COVERED"
|
||||
S @GLOBT@(8,0)=" CODE8 LINE7+1 NOT COVERED"
|
||||
<<<<<<< HEAD
|
||||
S ACTIVE=1
|
||||
D TOTAGS^%ut1(GLOB,ACTIVE)
|
||||
=======
|
||||
D TOTAGS^%ut1(GLOB)
|
||||
>>>>>>> origin/master
|
||||
D CHKEQ(1,($D(@GLOBT@("LINE1"))#2),"LINE1 TAG NOT IDENTIFIED")
|
||||
D CHKEQ(1,($D(@GLOBT@("LINE4"))#2),"LINE4 TAG NOT IDENTIFIED")
|
||||
D CHKEQ(1,($D(@GLOBT@("LINE7"))#2),"LINE7 TAG NOT IDENTIFIED")
|
||||
|
|
|
|||
Loading…
Reference in New Issue