-/********************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
+/****************************************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2004, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
* others. All Rights Reserved.
* Modification History:
*
* Date Name Description
* 05/22/2000 Madhu Added tests for testing new API for utf16 support and more
- **********************************************************************/
+ ****************************************************************************************/
#include <string.h>
+#include "utypeinfo.h" // for 'typeid' to work
+
#include "unicode/chariter.h"
#include "unicode/ustring.h"
#include "unicode/unistr.h"
#include "unicode/uchriter.h"
#include "unicode/uiter.h"
#include "unicode/putil.h"
+#include "unicode/utf16.h"
#include "citrtest.h"
+#include "cmemory.h"
class SCharacterIterator : public CharacterIterator {
virtual void getText(UnicodeString& result) {
text.extract(0,text.length(),result);
}
+ static UClassID getStaticClassID(void){
+ return (UClassID)(&fgClassID);
+ }
virtual UClassID getDynamicClassID(void) const{
return getStaticClassID();
}
- static UClassID getStaticClassID(void){
- return (UClassID)(&fgClassID);
- }
virtual UBool operator==(const ForwardCharacterIterator& /*that*/) const{
return TRUE;
}
case kStart:
pos = begin;
if(delta > 0) {
- UTF_FWD_N(text, pos, end, delta);
+ U16_FWD_N(text, pos, end, delta);
}
break;
case kCurrent:
if(delta > 0) {
- UTF_FWD_N(text, pos, end, delta);
+ U16_FWD_N(text, pos, end, delta);
} else {
- UTF_BACK_N(text, begin, pos, -delta);
+ U16_BACK_N(text, begin, pos, -delta);
}
break;
case kEnd:
pos = end;
if(delta < 0) {
- UTF_BACK_N(text, begin, pos, -delta);
+ U16_BACK_N(text, begin, pos, -delta);
}
break;
default:
};
const char SCharacterIterator::fgClassID=0;
-#define LENGTHOF(array) ((int32_t)(sizeof(array)/sizeof((array)[0])))
-
CharIterTest::CharIterTest()
{
}
void CharIterTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
{
- if (exec) logln("TestSuite LocaleTest: ");
+ if (exec) logln("TestSuite CharIterTest: ");
switch (index) {
case 0: name = "TestConstructionAndEquality"; if (exec) TestConstructionAndEquality(); break;
case 1: name = "TestConstructionAndEqualityUChariter"; if (exec) TestConstructionAndEqualityUChariter(); break;
errln("setIndex32() isn't working right");
if (c != CharacterIterator::DONE) {
c = iter.next32();
- i=UTF16_NEED_MULTIPLE_UCHAR(c) ? i+2 : i+1;
+ i += U16_LENGTH(c);
}
} while (c != CharacterIterator::DONE);
if(iter.hasNext() == TRUE)
errln("getIndex() isn't working right");
if (c != CharacterIterator::DONE) {
c = iter.previous32();
- i=UTF16_NEED_MULTIPLE_UCHAR(c) ? i-2 : i-1;
+ i -= U16_LENGTH(c);
}
} while (c != CharacterIterator::DONE);
if(iter.hasPrevious() == TRUE)
c=iter.first32PostInc();
if(c != text.char32At(i))
errln("first32PostInc failed. Expected->%X Got->%X", text.char32At(i), c);
- if(iter.getIndex() != UTF16_CHAR_LENGTH(c) + i)
+ if(iter.getIndex() != U16_LENGTH(c) + i)
errln((UnicodeString)"getIndex() after first32PostInc() failed");
iter.setToStart();
if(c != text.char32At(i))
errln("Character mismatch at position %d, iterator has %X, string has %X", i, c, text.char32At(i));
- i=UTF16_NEED_MULTIPLE_UCHAR(c) ? i+2 : i+1;
+ i += U16_LENGTH(c);
if(iter.getIndex() != i)
errln("getIndex() aftr next32PostInc() isn't working right");
if(iter.current32() != text.char32At(i))
if (c != CharacterIterator::DONE) {
c = iter.next32();
- i=UTF16_NEED_MULTIPLE_UCHAR(c) ? i+2 : i+1;
+ i += U16_LENGTH(c);
}
} while (c != CharacterIterator::DONE);
c=iter.next32();
if (c != CharacterIterator::DONE) {
c = iter.previous32();
- i=UTF16_NEED_MULTIPLE_UCHAR(c) ? i-2 : i-1;
+ i -= U16_LENGTH(c);
}
} while (c != CharacterIterator::DONE);
if(cIter.getIndex(&cIter, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(char iter).getIndex did not return error value");
+ errln("error: UCharIterator(char iter).getIndex did not return error value");
}
if(cIter.move(&cIter, 0, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(char iter).move did not return error value");
+ errln("error: UCharIterator(char iter).move did not return error value");
}
if(rIter.getIndex(&rIter, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(repl iter).getIndex did not return error value");
+ errln("error: UCharIterator(repl iter).getIndex did not return error value");
}
if(rIter.move(&rIter, 0, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(repl iter).move did not return error value");
+ errln("error: UCharIterator(repl iter).move did not return error value");
}
if(sIter.getIndex(&sIter, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(string iter).getIndex did not return error value");
+ errln("error: UCharIterator(string iter).getIndex did not return error value");
}
if(sIter.move(&sIter, 0, (enum UCharIteratorOrigin)-1) != -1)
{
- errln("error: UCharIterator(string iter).move did not return error value");
+ errln("error: UCharIterator(string iter).move did not return error value");
}
+ /* Testing function coverage on bad input */
+ UErrorCode status = U_ZERO_ERROR;
+ uiter_setString(&sIter, NULL, 1);
+ uiter_setState(&sIter, 1, &status);
+ if (status != U_UNSUPPORTED_ERROR) {
+ errln("error: uiter_setState returned %s instead of U_UNSUPPORTED_ERROR", u_errorName(status));
+ }
+ status = U_ZERO_ERROR;
+ uiter_setState(NULL, 1, &status);
+ if (status != U_ILLEGAL_ARGUMENT_ERROR) {
+ errln("error: uiter_setState returned %s instead of U_ILLEGAL_ARGUMENT_ERROR", u_errorName(status));
+ }
+ if (uiter_getState(&sIter) != UITER_NO_STATE) {
+ errln("error: uiter_getState did not return UITER_NO_STATE on bad input");
+ }
}
// subclass test, and completing API coverage -------------------------------
public:
// public default constructor, to get coverage of CharacterIterator()
SubCharIter() : CharacterIterator() {
- textLength=end=LENGTHOF(s);
+ textLength=end=UPRV_LENGTHOF(s);
s[0]=0x61; // 'a'
s[1]=0xd900; // U+50400
s[2]=0xdd00;
// useful stuff, mostly dummy but testing coverage and subclassability
virtual UChar nextPostInc() {
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
return s[pos++];
} else {
return DONE;
}
virtual UChar32 next32PostInc() {
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
UChar32 c;
- U16_NEXT(s, pos, LENGTHOF(s), c);
+ U16_NEXT(s, pos, UPRV_LENGTHOF(s), c);
return c;
} else {
return DONE;
}
virtual UBool hasNext() {
- return pos<LENGTHOF(s);
+ return pos<UPRV_LENGTHOF(s);
}
virtual UChar first() {
virtual UChar32 first32() {
UChar32 c;
pos=0;
- U16_NEXT(s, pos, LENGTHOF(s), c);
+ U16_NEXT(s, pos, UPRV_LENGTHOF(s), c);
pos=0;
return c;
}
virtual UChar setIndex(int32_t position) {
- if(0<=position && position<=LENGTHOF(s)) {
+ if(0<=position && position<=UPRV_LENGTHOF(s)) {
pos=position;
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
return s[pos];
}
}
}
virtual UChar32 setIndex32(int32_t position) {
- if(0<=position && position<=LENGTHOF(s)) {
+ if(0<=position && position<=UPRV_LENGTHOF(s)) {
pos=position;
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
UChar32 c;
- U16_GET(s, 0, pos, LENGTHOF(s), c);
+ U16_GET(s, 0, pos, UPRV_LENGTHOF(s), c);
return c;
}
}
}
virtual UChar current() const {
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
return s[pos];
} else {
return DONE;
}
virtual UChar32 current32() const {
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
UChar32 c;
- U16_GET(s, 0, pos, LENGTHOF(s), c);
+ U16_GET(s, 0, pos, UPRV_LENGTHOF(s), c);
return c;
} else {
return DONE;
}
virtual UChar next() {
- if(pos<LENGTHOF(s) && ++pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s) && ++pos<UPRV_LENGTHOF(s)) {
return s[pos];
} else {
return DONE;
}
virtual UChar32 next32() {
- if(pos<LENGTHOF(s)) {
- U16_FWD_1(s, pos, LENGTHOF(s));
+ if(pos<UPRV_LENGTHOF(s)) {
+ U16_FWD_1(s, pos, UPRV_LENGTHOF(s));
}
- if(pos<LENGTHOF(s)) {
+ if(pos<UPRV_LENGTHOF(s)) {
UChar32 c;
int32_t i=pos;
- U16_NEXT(s, i, LENGTHOF(s), c);
+ U16_NEXT(s, i, UPRV_LENGTHOF(s), c);
return c;
} else {
return DONE;
}
virtual void getText(UnicodeString &result) {
- result.setTo(s, LENGTHOF(s));
+ result.setTo(s, UPRV_LENGTHOF(s));
}
// dummy implementations of other pure virtual base class functions
virtual UBool operator==(const ForwardCharacterIterator &that) const {
return
this==&that ||
- getDynamicClassID()==that.getDynamicClassID() && pos==((SubCharIter &)that).pos;
+ (typeid(*this)==typeid(that) && pos==((SubCharIter &)that).pos);
}
virtual int32_t hashCode() const {
}
// RTTI
- virtual UClassID getDynamicClassID() const {
- return getStaticClassID();
- }
-
static UClassID getStaticClassID() {
return (UClassID)(&fgClassID);
}
+ virtual UClassID getDynamicClassID() const {
+ return getStaticClassID();
+ }
+
private:
// dummy string data
UChar s[4];
projects / apple / icu.git / blobdiff