Kaydet (Commit) 9c19e79f authored tarafından Caolán McNamara's avatar Caolán McNamara

extend unit test to islower

üst 40cddfce
...@@ -593,6 +593,16 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OUString &rString); ...@@ -593,6 +593,16 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OUString &rString);
*/ */
COMPHELPER_DLLPUBLIC bool isalnumAsciiString(const rtl::OString &rString); COMPHELPER_DLLPUBLIC bool isalnumAsciiString(const rtl::OString &rString);
/** Determine if an OUString contains solely ASCII alphanumeric chars/digits
@param rString An OUString
@return false if string contains any characters outside
the ASCII 'a'-'z', 'A'-'Z' and '0'-'9' ranges
true otherwise, including for empty string
*/
COMPHELPER_DLLPUBLIC bool isalnumAsciiString(const rtl::OUString &rString);
/** Determine if an OString contains solely ASCII lower-case chars /** Determine if an OString contains solely ASCII lower-case chars
@param rString An OString @param rString An OString
...@@ -603,6 +613,16 @@ COMPHELPER_DLLPUBLIC bool isalnumAsciiString(const rtl::OString &rString); ...@@ -603,6 +613,16 @@ COMPHELPER_DLLPUBLIC bool isalnumAsciiString(const rtl::OString &rString);
*/ */
COMPHELPER_DLLPUBLIC bool islowerAsciiString(const rtl::OString &rString); COMPHELPER_DLLPUBLIC bool islowerAsciiString(const rtl::OString &rString);
/** Determine if an OUString contains solely ASCII lower-case chars
@param rString An OUString
@return false if string contains any characters outside
the ASCII 'a'-'z' ranges
true otherwise, including for empty string
*/
COMPHELPER_DLLPUBLIC bool islowerAsciiString(const rtl::OUString &rString);
/** Determine if an OString contains solely ASCII upper-case chars /** Determine if an OString contains solely ASCII upper-case chars
@param rString An OString @param rString An OString
...@@ -613,6 +633,16 @@ COMPHELPER_DLLPUBLIC bool islowerAsciiString(const rtl::OString &rString); ...@@ -613,6 +633,16 @@ COMPHELPER_DLLPUBLIC bool islowerAsciiString(const rtl::OString &rString);
*/ */
COMPHELPER_DLLPUBLIC bool isupperAsciiString(const rtl::OString &rString); COMPHELPER_DLLPUBLIC bool isupperAsciiString(const rtl::OString &rString);
/** Determine if an OUString contains solely ASCII upper-case chars
@param rString An OUString
@return false if string contains any characters outside
the ASCII 'A'-'Z' ranges
true otherwise, including for empty string
*/
COMPHELPER_DLLPUBLIC bool isupperAsciiString(const rtl::OUString &rString);
COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c) COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c)
{ {
return ((c >= '0') && (c <= '9')); return ((c >= '0') && (c <= '9'));
......
...@@ -57,6 +57,7 @@ public: ...@@ -57,6 +57,7 @@ public:
void testIsdigitAsciiString(); void testIsdigitAsciiString();
void testIsalnumAsciiString(); void testIsalnumAsciiString();
void testIsupperAsciiString(); void testIsupperAsciiString();
void testIslowerAsciiString();
void testIndexOfL(); void testIndexOfL();
void testMatchIgnoreAsciiCaseL(); void testMatchIgnoreAsciiCaseL();
...@@ -74,6 +75,7 @@ public: ...@@ -74,6 +75,7 @@ public:
CPPUNIT_TEST(testIsdigitAsciiString); CPPUNIT_TEST(testIsdigitAsciiString);
CPPUNIT_TEST(testIsalnumAsciiString); CPPUNIT_TEST(testIsalnumAsciiString);
CPPUNIT_TEST(testIsupperAsciiString); CPPUNIT_TEST(testIsupperAsciiString);
CPPUNIT_TEST(testIslowerAsciiString);
CPPUNIT_TEST(testIndexOfL); CPPUNIT_TEST(testIndexOfL);
CPPUNIT_TEST(testMatchIgnoreAsciiCaseL); CPPUNIT_TEST(testMatchIgnoreAsciiCaseL);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
...@@ -146,6 +148,18 @@ void TestString::testIsalnumAsciiString() ...@@ -146,6 +148,18 @@ void TestString::testIsalnumAsciiString()
rtl::OString s4(RTL_CONSTASCII_STRINGPARAM("1A[4")); rtl::OString s4(RTL_CONSTASCII_STRINGPARAM("1A[4"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s4), false); CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s4), false);
rtl::OUString s5(RTL_CONSTASCII_USTRINGPARAM("1234"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s5), true);
rtl::OUString s6(RTL_CONSTASCII_USTRINGPARAM("1A34"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s6), true);
rtl::OUString s7;
CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s7), true);
rtl::OUString s8(RTL_CONSTASCII_USTRINGPARAM("1A[4"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isalnumAsciiString(s8), false);
} }
void TestString::testIsupperAsciiString() void TestString::testIsupperAsciiString()
...@@ -158,6 +172,36 @@ void TestString::testIsupperAsciiString() ...@@ -158,6 +172,36 @@ void TestString::testIsupperAsciiString()
rtl::OString s3(RTL_CONSTASCII_STRINGPARAM("AABB")); rtl::OString s3(RTL_CONSTASCII_STRINGPARAM("AABB"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isupperAsciiString(s3), true); CPPUNIT_ASSERT_EQUAL(comphelper::string::isupperAsciiString(s3), true);
rtl::OUString s4(RTL_CONSTASCII_USTRINGPARAM("1234"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isupperAsciiString(s4), false);
rtl::OUString s5(RTL_CONSTASCII_USTRINGPARAM("aAbB"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isupperAsciiString(s5), false);
rtl::OUString s6(RTL_CONSTASCII_USTRINGPARAM("AABB"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::isupperAsciiString(s6), true);
}
void TestString::testIslowerAsciiString()
{
rtl::OString s1(RTL_CONSTASCII_STRINGPARAM("1234"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s1), false);
rtl::OString s2(RTL_CONSTASCII_STRINGPARAM("aAbB"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s2), false);
rtl::OString s3(RTL_CONSTASCII_STRINGPARAM("aabb"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s3), true);
rtl::OUString s4(RTL_CONSTASCII_USTRINGPARAM("1234"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s4), false);
rtl::OUString s5(RTL_CONSTASCII_USTRINGPARAM("aAbB"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s5), false);
rtl::OUString s6(RTL_CONSTASCII_USTRINGPARAM("aabb"));
CPPUNIT_ASSERT_EQUAL(comphelper::string::islowerAsciiString(s6), true);
} }
void TestString::testIndexOfL() void TestString::testIndexOfL()
......
...@@ -516,6 +516,11 @@ bool isalnumAsciiString(const rtl::OString &rString) ...@@ -516,6 +516,11 @@ bool isalnumAsciiString(const rtl::OString &rString)
return tmpl_is_OPER_AsciiString<isalnumAscii>(rString); return tmpl_is_OPER_AsciiString<isalnumAscii>(rString);
} }
bool isalnumAsciiString(const rtl::OUString &rString)
{
return tmpl_is_OPER_AsciiString<isalnumAscii>(rString);
}
bool isdigitAsciiString(const rtl::OString &rString) bool isdigitAsciiString(const rtl::OString &rString)
{ {
return tmpl_is_OPER_AsciiString<isdigitAscii>(rString); return tmpl_is_OPER_AsciiString<isdigitAscii>(rString);
...@@ -531,11 +536,21 @@ bool islowerAsciiString(const rtl::OString &rString) ...@@ -531,11 +536,21 @@ bool islowerAsciiString(const rtl::OString &rString)
return tmpl_is_OPER_AsciiString<islowerAscii>(rString); return tmpl_is_OPER_AsciiString<islowerAscii>(rString);
} }
bool islowerAsciiString(const rtl::OUString &rString)
{
return tmpl_is_OPER_AsciiString<islowerAscii>(rString);
}
bool isupperAsciiString(const rtl::OString &rString) bool isupperAsciiString(const rtl::OString &rString)
{ {
return tmpl_is_OPER_AsciiString<isupperAscii>(rString); return tmpl_is_OPER_AsciiString<isupperAscii>(rString);
} }
bool isupperAsciiString(const rtl::OUString &rString)
{
return tmpl_is_OPER_AsciiString<isupperAscii>(rString);
}
} } } }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment