From 82c0af4c30571ea675b256e8d3f2e5fe2c4e4864 Mon Sep 17 00:00:00 2001 From: "erik%netscape.com" Date: Sun, 16 May 1999 22:59:02 +0000 Subject: [PATCH] Fixed the test file name, added registration for event queue and persistent properties. This test program now works again. Groan. git-svn-id: svn://10.0.0.236/trunk@31869 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/tests/PropertiesTest.cpp | 15 ++++++++++++++- mozilla/xpcom/tests/PropertiesTest.cpp | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/mozilla/base/tests/PropertiesTest.cpp b/mozilla/base/tests/PropertiesTest.cpp index c96e56cdc9c..e2da04a1989 100644 --- a/mozilla/base/tests/PropertiesTest.cpp +++ b/mozilla/base/tests/PropertiesTest.cpp @@ -29,7 +29,7 @@ #include "plevent.h" #endif -#define TEST_URL "resource:/res/test.PersistentProperties" +#define TEST_URL "resource:/res/test.properties" #ifdef XP_PC #define NETLIB_DLL "netlib.dll" @@ -46,6 +46,7 @@ #define XPCOM_DLL "libxpcom.so" #endif #endif +static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); @@ -68,12 +69,24 @@ main(int argc, char* argv[]) printf("cannot register net service\n"); return 1; } + ret = nsComponentManager::RegisterComponent(kEventQueueCID, NULL, + NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); + if (NS_FAILED(ret)) { + printf("cannot register event queue\n"); + return 1; + } ret = nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); if (NS_FAILED(ret)) { printf("cannot register event queue service\n"); return 1; } + ret = nsComponentManager::RegisterComponent(kPersistentPropertiesCID, NULL, + NULL, RAPTORBASE_DLL, PR_FALSE, PR_FALSE); + if (NS_FAILED(ret)) { + printf("cannot register persistent properties\n"); + return 1; + } #ifdef XP_MAC // have not build this on PC and UNIX yet so make it #ifdef XP_MAC NS_SetupRegistry(); #endif diff --git a/mozilla/xpcom/tests/PropertiesTest.cpp b/mozilla/xpcom/tests/PropertiesTest.cpp index c96e56cdc9c..e2da04a1989 100644 --- a/mozilla/xpcom/tests/PropertiesTest.cpp +++ b/mozilla/xpcom/tests/PropertiesTest.cpp @@ -29,7 +29,7 @@ #include "plevent.h" #endif -#define TEST_URL "resource:/res/test.PersistentProperties" +#define TEST_URL "resource:/res/test.properties" #ifdef XP_PC #define NETLIB_DLL "netlib.dll" @@ -46,6 +46,7 @@ #define XPCOM_DLL "libxpcom.so" #endif #endif +static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); @@ -68,12 +69,24 @@ main(int argc, char* argv[]) printf("cannot register net service\n"); return 1; } + ret = nsComponentManager::RegisterComponent(kEventQueueCID, NULL, + NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); + if (NS_FAILED(ret)) { + printf("cannot register event queue\n"); + return 1; + } ret = nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); if (NS_FAILED(ret)) { printf("cannot register event queue service\n"); return 1; } + ret = nsComponentManager::RegisterComponent(kPersistentPropertiesCID, NULL, + NULL, RAPTORBASE_DLL, PR_FALSE, PR_FALSE); + if (NS_FAILED(ret)) { + printf("cannot register persistent properties\n"); + return 1; + } #ifdef XP_MAC // have not build this on PC and UNIX yet so make it #ifdef XP_MAC NS_SetupRegistry(); #endif