mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Fixed a case-comparison problem in String::compareNatural() and added some unit tests for it.

Browse source
This commit is contained in:
jules 2014-07-03 12:24:36 +01:00
parent 56983c8080
commit 371e91c615
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/juce_core/text/juce_String.cpp
View file

@ -683,11 +683,16 @@ static int naturalStringCompare (String::CharPointerType s1, String::CharPointer
return result;
}
const juce_wchar c1 = s1.getAndAdvance();
const juce_wchar c2 = s2.getAndAdvance();
juce_wchar c1 = s1.getAndAdvance();
juce_wchar c2 = s2.getAndAdvance();
if (c1 == c2 || CharacterFunctions::toUpperCase (c1)
== CharacterFunctions::toUpperCase (c2))
if (c1 != c2)
{
c1 = CharacterFunctions::toUpperCase (c1);
c2 = CharacterFunctions::toUpperCase (c2);
}
if (c1 == c2)
{
if (c1 == 0)
return 0;
@ -2268,6 +2273,12 @@ public:
expect (s.compare (String ("012345678")) == 0);
expect (s.compare (String ("012345679")) < 0);
expect (s.compare (String ("012345676")) > 0);
expect (String("a").compareNatural ("A") == 0);
expect (String("A").compareNatural ("B") < 0);
expect (String("a").compareNatural ("B") < 0);
expect (String("10").compareNatural ("2") > 0);
expect (String("Abc 10").compareNatural ("aBC 2") > 0);
expect (String("Abc 1").compareNatural ("aBC 2") < 0);
expect (s.substring (2, 3) == String::charToString (s[2]));
expect (s.substring (0, 1) == String::charToString (s[0]));
expect (s.getLastCharacter() == s [s.length() - 1]);