Add test for cyrillic; fix funcs with no real chars

CBATeam · Jan 12, 2018 · fa245be · fa245be
1 parent e8488a4
commit fa245be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/addons/strings/fnc_leftTrim.sqf b/addons/strings/fnc_leftTrim.sqf
@@ -43,7 +43,7 @@ if (_trim == "") then {
 };
 
 // We have to process the string in array form because it could differ in length (if there are non-ASCII characters)
-private _trimIndex = 0;
+private _trimIndex = _numChars;
 {
     if !(_x in _trim) exitWith { _trimIndex = _forEachIndex; };
 } forEach _chars;

diff --git a/addons/strings/fnc_rightTrim.sqf b/addons/strings/fnc_rightTrim.sqf
@@ -46,7 +46,7 @@ if (_trim == "") then {
 };
 
 // We have to process the string in array form because it could differ in length (if there are non-ASCII characters)
-private _trimIndex = 0;
+private _trimIndex = _numChars;
 {
     if !(_x in _trim) exitWith { _trimIndex = _forEachIndex; };
 } forEach _chars;

diff --git a/addons/strings/test_strings.sqf b/addons/strings/test_strings.sqf
@@ -184,6 +184,10 @@ TEST_OP(_str,==,"",_fn);
 _str = [" x "] call CBA_fnc_trim;
 TEST_OP(_str,==,"x",_fn);
 
+// Cyrillic letters (count "РґРµР" = 10)
+_str = ["РґРµР", "Р"] call CBA_fnc_trim;
+TEST_OP(_str,==,"ґРµ",_fn);
+
 // ----------------------------------------------------------------------------
 // UNIT TESTS (capitalize)
 _fn = "CBA_fnc_capitalize";