22#pragma ModuleName= CodeBrowser_decorateNames
33
44StrConstant module = "ProcGlobal"
5- StrConstant procedureShort = "TestCodeBrowser_input .ipf"
6- StrConstant procedure = "TestCodeBrowser_input .ipf [ProcGlobal]"
5+ StrConstant procedureShort = "test_codebrowser_input .ipf"
6+ StrConstant procedure = "test_codebrowser_input .ipf [ProcGlobal]"
77
88static Function TEST_CASE_BEGIN_OVERRIDE ( name)
99 string name
@@ -65,7 +65,7 @@ static Function retRealVar_wo_args()
6565 CodeBrowserModule#decorateFunctionNames ( module, "funcRetRealVar" , procedure, defWave, lineWave)
6666 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
6767 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
68- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( var) " ,0 ) ,-1 )
68+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> var" ,0 ) ,-1 )
6969End
7070
7171static Function retRealVarComp_wo_args ()
@@ -75,7 +75,7 @@ static Function retRealVarComp_wo_args()
7575 CodeBrowserModule#decorateFunctionNames ( module, "funcRetRealVarComp" , procedure, defWave, lineWave)
7676 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
7777 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
78- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( var) " ,0 ) ,-1 )
78+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> var" ,0 ) ,-1 )
7979End
8080
8181static Function retComplexVar_wo_args ()
@@ -85,7 +85,7 @@ static Function retComplexVar_wo_args()
8585 CodeBrowserModule#decorateFunctionNames ( module, "funcRetComplexVar" , procedure, defWave, lineWave)
8686 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
8787 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
88- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( imag) " ,0 ) ,-1 )
88+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> imag" ,0 ) ,-1 )
8989End
9090
9191static Function retStr_wo_args ()
@@ -95,7 +95,7 @@ static Function retStr_wo_args()
9595 CodeBrowserModule#decorateFunctionNames ( module, "funcRetStr" , procedure, defWave, lineWave)
9696 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
9797 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
98- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( str) " ,0 ) ,-1 )
98+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> str" ,0 ) ,-1 )
9999End
100100
101101static Function retNumericWave_wo_args ()
@@ -105,7 +105,7 @@ static Function retNumericWave_wo_args()
105105 CodeBrowserModule#decorateFunctionNames ( module, "funcRetNumericWave" , procedure, defWave, lineWave)
106106 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
107107 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
108- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( wave) " ,0 ) ,-1 )
108+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> wave" ,0 ) ,-1 )
109109End
110110
111111static Function retTextWave_wo_args ()
@@ -115,7 +115,7 @@ static Function retTextWave_wo_args()
115115 CodeBrowserModule#decorateFunctionNames ( module, "funcRetTextWave" , procedure, defWave, lineWave)
116116 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
117117 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
118- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( wave) " ,0 ) ,-1 )
118+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> wave" ,0 ) ,-1 )
119119End
120120
121121static Function retDF_wo_args ()
@@ -125,7 +125,7 @@ static Function retDF_wo_args()
125125 CodeBrowserModule#decorateFunctionNames ( module, "funcRetDF" , procedure, defWave, lineWave)
126126 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
127127 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
128- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "->( dfref) " ,0 ) ,-1 )
128+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , " -> dfref" ,0 ) ,-1 )
129129End
130130
131131static Function withArgs ()
@@ -136,7 +136,7 @@ static Function withArgs()
136136 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
137137 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
138138 string actual = defWave[ 0 ][ 1 ]
139- string expected = "funcWithArgs(var, str, wave, wave/T, dfref, funcref)->( var) "
139+ string expected = "funcWithArgs(var, str, wave, wave/T, dfref, funcref) -> var"
140140 CHECK_EQUAL_STR ( actual, expected)
141141End
142142
@@ -148,7 +148,7 @@ static Function withComplexArgs()
148148 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
149149 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
150150 string actual = defWave[ 0 ][ 1 ]
151- string expected = "funcWithComplexArgs(imag, wave/C)->( var) "
151+ string expected = "funcWithComplexArgs(imag, wave/C) -> var"
152152 CHECK_EQUAL_STR ( actual, expected)
153153End
154154
@@ -160,7 +160,7 @@ static Function withArgsPassByRef()
160160 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
161161 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
162162 string actual = defWave[ 0 ][ 1 ]
163- string expected = "funcWithArgsPassByRef(struct&, var&, imag&, str&)->( var) "
163+ string expected = "funcWithArgsPassByRef(struct&, var&, imag&, str&) -> var"
164164 CHECK_EQUAL_STR ( actual, expected)
165165End
166166
@@ -172,7 +172,7 @@ static Function withFancyWaves()
172172 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
173173 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
174174 string actual = defWave[ 0 ][ 1 ]
175- string expected = "funcWithFancyWaves(wave/DF, wave/WAVE, wave/W, wave/W/U, wave/I, wave/I/U, wave/B, wave/B/U, wave, wave/D)->( var) "
175+ string expected = "funcWithFancyWaves(wave/DF, wave/WAVE, wave/W, wave/W/U, wave/I, wave/I/U, wave/B, wave/B/U, wave, wave/D) -> var"
176176 CHECK_EQUAL_STR ( actual, expected)
177177End
178178
@@ -183,7 +183,7 @@ static Function withOnlyOptArg()
183183 CodeBrowserModule#decorateFunctionNames ( module, "funcWithOnlyOptArg" , procedure, defWave, lineWave)
184184 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
185185 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
186- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "funcWithOnlyOptArg([var])->( var) " ,0 ) ,-1 )
186+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "funcWithOnlyOptArg([var]) -> var" ,0 ) ,-1 )
187187End
188188
189189static Function withOptArgs ()
@@ -193,7 +193,7 @@ static Function withOptArgs()
193193 CodeBrowserModule#decorateFunctionNames ( module, "funcWithOptArgs" , procedure, defWave, lineWave)
194194 CHECK_EQUAL_VAR ( DimSize ( defWave,0 ) ,1 )
195195 CHECK_EQUAL_VAR ( DimSize ( lineWave,0 ) ,1 )
196- CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "funcWithOptArgs(var, [var, str, var&, str&])->( var) " ,0 ) ,-1 )
196+ CHECK_NEQ_VAR ( strsearch ( defWave[ 0 ][ 1 ] , "funcWithOptArgs(var, [var, str, var&, str&]) -> var" ,0 ) ,-1 )
197197End
198198
199199static Function getDecoratedMacroList_1 ()
0 commit comments