From 6d99fc526619b2a01eb9c9afcc47548b983b8564 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Fri, 23 Apr 1999 06:32:35 +0000 Subject: [PATCH] Updates to get the test running with preferences again. We need to manually register the file locator. This test app will now read prefs out of the default profile directory. git-svn-id: svn://10.0.0.236/trunk@28803 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/compose/tests/smtp/smtpTest.cpp | 13 +++++-------- mozilla/mailnews/local/tests/pop3/pop3Test.cpp | 14 +++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp b/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp index 7a49118e926..587ff8ee5e1 100644 --- a/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp +++ b/mozilla/mailnews/compose/tests/smtp/smtpTest.cpp @@ -46,12 +46,14 @@ #include "nsIEventQueueService.h" #include "nsXPComCIID.h" #include "nsIPref.h" +#include "nsIFileLocator.h" #include "nsFileSpec.h" #ifdef XP_PC #define NETLIB_DLL "netlib.dll" #define XPCOM_DLL "xpcom32.dll" #define PREF_DLL "xppref32.dll" +#define APPSHELL_DLL "nsappshell.dll" #else #ifdef XP_MAC #include "nsMacRepository.h" @@ -59,6 +61,7 @@ #define NETLIB_DLL "libnetlib.so" #define XPCOM_DLL "libxpcom.so" #define PREF_DLL "libpref.so" +#define APPCORES_DLL "libappcores.so" #endif #endif @@ -70,6 +73,7 @@ static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); +static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); ///////////////////////////////////////////////////////////////////////////////// // Define default values to be used to drive the test @@ -435,16 +439,13 @@ int main() nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kPrefCID, nsnull, nsnull, PREF_DLL, PR_TRUE, PR_TRUE); + nsComponentManager::RegisterComponent(kFileLocatorCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE); // make sure prefs get initialized and loaded.. // mscott - this is just a bad bad bad hack right now until prefs // has the ability to take nsnull as a parameter. Once that happens, // prefs will do the work of figuring out which prefs file to load... NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &result); -// if (NS_SUCCEEDED(result) && prefs) -// { -// prefs->Startup("prefs50.js"); -// } // Create the Event Queue for this thread... nsIEventQueueService* pEventQService; @@ -469,10 +470,6 @@ int main() printf("unable to get event queue.\n"); return 1; } - - // now register a mime converter.... - // NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_NGLAYOUT, NULL, MIME_MessageConverter); - // NET_RegisterContentTypeConverter (MESSAGE_RFC822, FO_CACHE_AND_NGLAYOUT, NULL, MIME_MessageConverter); // okay, everything is set up, now we just need to create a test driver and run it... nsSmtpTestDriver * driver = new nsSmtpTestDriver(pNetService,queue); diff --git a/mozilla/mailnews/local/tests/pop3/pop3Test.cpp b/mozilla/mailnews/local/tests/pop3/pop3Test.cpp index 2928f5efaff..480a22e3767 100644 --- a/mozilla/mailnews/local/tests/pop3/pop3Test.cpp +++ b/mozilla/mailnews/local/tests/pop3/pop3Test.cpp @@ -34,6 +34,7 @@ #include "nsIComponentManager.h" #include "nsString.h" #include "nsIPref.h" +#include "nsIFileLocator.h" #include "nsIPop3Service.h" #include "nsIMsgMailNewsUrl.h" @@ -53,6 +54,7 @@ #define NETLIB_DLL "netlib.dll" #define XPCOM_DLL "xpcom32.dll" #define PREF_DLL "xppref32.dll" +#define APPSHELL_DLL "nsappshell.dll" #else #ifdef XP_MAC #include "nsMacRepository.h" @@ -60,6 +62,7 @@ #define NETLIB_DLL "libnetlib.so" #define XPCOM_DLL "libxpcom.so" #define PREF_DLL "libpref.so" +#define APPCORES_DLL "libappcores.so" #endif #endif @@ -71,6 +74,7 @@ static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kPop3ServiceCID, NS_POP3SERVICE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); +static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); ///////////////////////////////////////////////////////////////////////////////// // Define default values to be used to drive the test @@ -463,18 +467,10 @@ int main() nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kPrefCID, nsnull, nsnull, PREF_DLL, PR_TRUE, PR_TRUE); + nsComponentManager::RegisterComponent(kFileLocatorCID, NULL, NULL, APPSHELL_DLL, PR_FALSE, PR_FALSE); // make sure prefs get initialized and loaded.. - // mscott - this is just a bad bad bad hack right now until prefs - // has the ability to take nsnull as a parameter. Once that happens, - // prefs will do the work of figuring out which prefs file to load... - // jrm - You don't even need to call this now. Just using the service - // should do the trick. NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &result); -// if (NS_SUCCEEDED(result) && prefs) -// { -// prefs->StartUp(); -// } // Create the Event Queue for this thread... nsIEventQueueService* pEventQService;