ICU-535 Fixed some compiler warnings again.
X-SVN-Rev: 3189
This commit is contained in:
parent
cc62cf111d
commit
74b33770cb
@ -42,11 +42,11 @@ enum E_Where
|
||||
|
||||
//***************************************************************************************
|
||||
|
||||
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of " + (expected)); }
|
||||
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x >= " + (expected)); }
|
||||
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x != " + (expected)); }
|
||||
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of " << (expected) << endl; }
|
||||
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x >= " << (expected) << endl; }
|
||||
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x != " << (expected) << endl; }
|
||||
|
||||
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + u_errorName(actual) + " instead of " + u_errorName(expected)); }
|
||||
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << u_errorName(actual) << " instead of " << u_errorName(expected) << endl; }
|
||||
|
||||
//***************************************************************************************
|
||||
|
||||
@ -339,7 +339,7 @@ ResourceBundleTest::testTag(const char* frag,
|
||||
UBool in_te,
|
||||
UBool in_te_IN)
|
||||
{
|
||||
int32_t passOrig = pass;
|
||||
UBool passOrig = pass;
|
||||
|
||||
// Make array from input params
|
||||
|
||||
@ -621,7 +621,7 @@ ResourceBundleTest::testTag(const char* frag,
|
||||
if (tags[index].startsWith("tag") && items[index].startsWith(base))
|
||||
record_pass();
|
||||
else
|
||||
record_fail("tag = " + tags[index] + ", value = " + items[index]);
|
||||
record_fail();
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -675,9 +675,9 @@ ResourceBundleTest::record_pass()
|
||||
++pass;
|
||||
}
|
||||
void
|
||||
ResourceBundleTest::record_fail(const UnicodeString &message)
|
||||
ResourceBundleTest::record_fail()
|
||||
{
|
||||
err(message);
|
||||
err();
|
||||
++fail;
|
||||
}
|
||||
//eof
|
||||
|
@ -38,7 +38,7 @@ private:
|
||||
UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
|
||||
|
||||
void record_pass(void);
|
||||
void record_fail(const UnicodeString &message);
|
||||
void record_fail(void);
|
||||
|
||||
int32_t pass;
|
||||
int32_t fail;
|
||||
|
@ -42,11 +42,11 @@ enum E_Where
|
||||
|
||||
//***************************************************************************************
|
||||
|
||||
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of " + (expected)); }
|
||||
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x >= " + (expected)); }
|
||||
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x != " + (expected)); }
|
||||
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of " << (expected) << endl; }
|
||||
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x >= " << (expected) << endl; }
|
||||
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x != " << (expected) << endl; }
|
||||
|
||||
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + u_errorName(actual) + " instead of " + u_errorName(expected)); }
|
||||
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << u_errorName(actual) << " instead of " << u_errorName(expected) << endl; }
|
||||
|
||||
//***************************************************************************************
|
||||
|
||||
@ -495,7 +495,7 @@ NewResourceBundleTest::testTag(const char* frag,
|
||||
UBool in_te,
|
||||
UBool in_te_IN)
|
||||
{
|
||||
int32_t passOrig = pass;
|
||||
UBool passOrig = pass;
|
||||
|
||||
// Make array from input params
|
||||
|
||||
@ -786,7 +786,7 @@ NewResourceBundleTest::testTag(const char* frag,
|
||||
if(key.startsWith("tag") && value.startsWith(base)){
|
||||
record_pass();
|
||||
}else{
|
||||
record_fail("tag = " + key + ", value = " + value);
|
||||
record_fail();
|
||||
}
|
||||
|
||||
}
|
||||
@ -853,9 +853,9 @@ NewResourceBundleTest::record_pass()
|
||||
++pass;
|
||||
}
|
||||
void
|
||||
NewResourceBundleTest::record_fail(const UnicodeString &message)
|
||||
NewResourceBundleTest::record_fail()
|
||||
{
|
||||
err(message);
|
||||
err();
|
||||
++fail;
|
||||
}
|
||||
//eof
|
||||
|
@ -42,7 +42,7 @@ private:
|
||||
UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
|
||||
|
||||
void record_pass(void);
|
||||
void record_fail(const UnicodeString &message);
|
||||
void record_fail(void);
|
||||
|
||||
int32_t pass;
|
||||
int32_t fail;
|
||||
|
Loading…
Reference in New Issue
Block a user