Skip to content

Commit 78ceff4

Browse files
authored
Merge pull request #443 from byte-physics/bugfix/dimlabel-difference-case-sensitive
2 parents 9a83176 + 9ee6214 commit 78ceff4

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

docu/sphinx/source/changelog.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`
5050
and the `original article page 36 <https://web.archive.org/web/20220329072759/http://www.mccabe.com/ppt/SoftwareQualityMetricsToIdentifyRisk.ppt>`__
5151
- Fixed a bug where when running IUTF in an independent module, the ``run`` function was searched in ``ProcGlobal``
5252
instead of the independent module.
53+
- Fixed a bug where generating the detailed message for failed wave equality assertions did not ignore the case for
54+
comparing dimension labels.
5355

5456
Test assertions
5557
~~~~~~~~~~~~~~~

procedures/igortest-basics.ipf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Function GenerateDimLabelDifference(wv1, wv2, msg)
206206

207207
numEntries = DimSize(label1, i)
208208
for(j = 0; j < numEntries; j += 1)
209-
if(!cmpstr(label1[j], label2[j]))
209+
if(!cmpstr(label1[j], label2[j], 1))
210210
continue
211211
endif
212212
str1 = label1[j]

tests/VTTE.ipf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,14 @@ static Function TestIUTF()
459459
Ensure(!IUTF_Checks#AreWavesEqual(wvDP, wvSP, WAVE_LOCK_STATE, DEFAULT_TOLERANCE, detailedMsg))
460460
Ensure(!IUTF_Checks#AreWavesEqual(wvDP, wvSP, DATA_FULL_SCALE, DEFAULT_TOLERANCE, detailedMsg))
461461
Ensure(!IUTF_Checks#AreWavesEqual(wvDP, wvSP, DIMENSION_SIZES, DEFAULT_TOLERANCE, detailedMsg))
462+
463+
Make/FREE dimLabel1, dimLabel2
464+
465+
SetDimLabel 0, 0, abcd, dimLabel1
466+
SetDimLabel 0, 0, abcD, dimLabel2
467+
Ensure(!IUTF_Checks#AreWavesEqual(dimLabel1, dimLabel2, DIMENSION_LABELS, DEFAULT_TOLERANCE, detailedMsg))
468+
Ensure(IUTF_Checks#IsProperString(detailedMsg))
469+
Ensure(strsearch(detailedMsg, "abcD", 0) >= 0)
462470
// @}
463471

464472
// HasWaveMajorType

0 commit comments

Comments
 (0)