made some minor style changes, added test for deleting default BTranslatorRoster
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1956 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -54,7 +54,7 @@ TranslatorRosterTest::TranslatorRosterTest(std::string name) : BTestCase(name) {
|
|||||||
TranslatorRosterTest::~TranslatorRosterTest() {
|
TranslatorRosterTest::~TranslatorRosterTest() {
|
||||||
}
|
}
|
||||||
|
|
||||||
CppUnit::Test*
|
CppUnit::Test *
|
||||||
TranslatorRosterTest::Suite() {
|
TranslatorRosterTest::Suite() {
|
||||||
/* create our suite */
|
/* create our suite */
|
||||||
CppUnit::TestSuite *suite = new CppUnit::TestSuite("TranslatorRoster");
|
CppUnit::TestSuite *suite = new CppUnit::TestSuite("TranslatorRoster");
|
||||||
@@ -93,7 +93,7 @@ void TranslatorRosterTest::InitializeTest() {
|
|||||||
int32 outCurVersion;
|
int32 outCurVersion;
|
||||||
int32 outMinVersion;
|
int32 outMinVersion;
|
||||||
long inAppVersion;
|
long inAppVersion;
|
||||||
const char* info = proster->Version(&outCurVersion, &outMinVersion, inAppVersion);
|
const char *info = proster->Version(&outCurVersion, &outMinVersion, inAppVersion);
|
||||||
printf("Default TranslatorRoster aquired. Version: %s\n", info);
|
printf("Default TranslatorRoster aquired. Version: %s\n", info);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ void TranslatorRosterTest::InitializeTest() {
|
|||||||
*/
|
*/
|
||||||
void TranslatorRosterTest::ConstructorTest() {
|
void TranslatorRosterTest::ConstructorTest() {
|
||||||
//shared instance of TranslatorRoster
|
//shared instance of TranslatorRoster
|
||||||
BTranslatorRoster* proster;
|
BTranslatorRoster *proster;
|
||||||
|
|
||||||
// Create TranslatorRoster using noargs constructor
|
// Create TranslatorRoster using noargs constructor
|
||||||
// (GetAllTranslatorsTest also tests this constructor)
|
// (GetAllTranslatorsTest also tests this constructor)
|
||||||
@@ -184,10 +184,17 @@ void TranslatorRosterTest::ConstructorTest() {
|
|||||||
* BTranslatorRoster *Default()
|
* BTranslatorRoster *Default()
|
||||||
*/
|
*/
|
||||||
void TranslatorRosterTest::DefaultTest() {
|
void TranslatorRosterTest::DefaultTest() {
|
||||||
//already done in Initialize - added for completeness sake
|
|
||||||
NextSubTest();
|
NextSubTest();
|
||||||
BTranslatorRoster* proster = BTranslatorRoster::Default();
|
BTranslatorRoster *proster = BTranslatorRoster::Default();
|
||||||
CPPUNIT_ASSERT(proster != NULL);
|
CPPUNIT_ASSERT(proster != NULL);
|
||||||
|
|
||||||
|
// delete the default BTranslatorRoster
|
||||||
|
// (may not always be the appropriate thing to do,
|
||||||
|
// but it should work without blowing up)
|
||||||
|
NextSubTest();
|
||||||
|
delete proster;
|
||||||
|
proster = NULL;
|
||||||
|
CPPUNIT_ASSERT(BTranslatorRoster::Default());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -204,8 +211,8 @@ void TranslatorRosterTest::InstantiateTest() {
|
|||||||
//Create our BMessage
|
//Create our BMessage
|
||||||
BMessage translator_message;
|
BMessage translator_message;
|
||||||
|
|
||||||
//create BTranslator using empty message (must return NULL)
|
//create BTranslatorRoster using empty message (must return NULL)
|
||||||
proster = (BTranslatorRoster*) BTranslatorRoster::Instantiate(&translator_message);
|
proster = (BTranslatorRoster *) BTranslatorRoster::Instantiate(&translator_message);
|
||||||
CPPUNIT_ASSERT(proster == NULL);
|
CPPUNIT_ASSERT(proster == NULL);
|
||||||
delete proster;
|
delete proster;
|
||||||
proster = NULL;
|
proster = NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user